mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use -lm unless required.

Browse Source 
Add --disable-cygwin option.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1709 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2001-11-20 20:10:59 +00:00
parent aeefaca66b
commit 85f3c6a3db
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.in
View File

@ -1,7 +1,7 @@
dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf"
dnl
dnl "$Id: configure.in,v 1.33.2.31.2.24 2001/11/19 21:25:35 easysw Exp $"
dnl "$Id: configure.in,v 1.33.2.31.2.25 2001/11/20 20:10:58 easysw Exp $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
@ -59,6 +59,7 @@ PICFLAG=0
CFLAGS="${CFLAGS:=}"
CXXFLAGS="${CXXFLAGS:=}"
AC_ARG_ENABLE(cygwin, [ --enable-cygwin use the CygWin libraries [default=yes]])
AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
DEBUGFLAG="-g "
fi])
@ -66,7 +67,7 @@ AC_ARG_ENABLE(gl, [ --enable-gl turn on OpenGL support [default=yes
AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [default=no]],[
DSOLINK=""
AC_SUBST(DSOLINK)
if eval "test x$enable_shared = xyes"; then
if test x$enable_shared = xyes; then
PICFLAG=1
case $uname in
SunOS* | UNIX_S*)
@ -178,6 +179,9 @@ AC_CHECK_FUNCS(vsprintf)
AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
AC_CHECK_FUNCS(strcasecmp)
dnl FLTK library uses math library functions...
AC_CHECK_LIB(m, pow)
dnl Check for image libraries...
SAVELIBS="$LIBS"
IMAGELIBS=""
@ -195,14 +199,11 @@ AC_CHECK_HEADER(zlib.h,
IMAGELIBS="$IMAGELIBS -lz"
LIBS="$LIBS -lz"))
dnl PNG library uses math library functions...
AC_CHECK_LIB(m, pow)
AC_CHECK_HEADER(png.h,
AC_CHECK_LIB(png, png_read_rows,
AC_DEFINE(HAVE_LIBPNG)
IMAGELIBS="-lpng -lm$IMAGELIBS"
LIBS="-lpng -lm $LIBS"
IMAGELIBS="-lpng $IMAGELIBS"
LIBS="-lpng $LIBS"
AC_CHECK_FUNCS(png_get_valid png_set_tRNS_to_alpha png_read_destroy)))
dnl Restore original LIBS settings...
@ -219,6 +220,10 @@ case $uname in
CXXFLAGS="$CXXFLAGS -DWIN32"
EXEEXT=".exe"
HLINKS="#"
if test x$enable_cygwin = xno; then
CFLAGS="$CFLAGS -mno-cygwin"
CXXFLAGS="$CXXFLAGS -mno-cygwin"
fi
if test x$enable_gl != xno; then
AC_CHECK_HEADER(GL/gl.h,
AC_DEFINE(HAVE_GL)
@ -525,5 +530,5 @@ AC_OUTPUT(makeinclude fltk-config FL/Makefile)
chmod +x fltk-config
dnl
dnl End of "$Id: configure.in,v 1.33.2.31.2.24 2001/11/19 21:25:35 easysw Exp $".
dnl End of "$Id: configure.in,v 1.33.2.31.2.25 2001/11/20 20:10:58 easysw Exp $".
dnl

8
makeinclude.in
View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.in,v 1.7.2.11.2.7 2001/11/19 01:06:45 easysw Exp $"
# "$Id: makeinclude.in,v 1.7.2.11.2.8 2001/11/20 20:10:59 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
# @configure_input@
@ -58,8 +58,8 @@ GLDSONAME =@DSONAME@
DSOCOMMAND =@DSOCOMMAND@
# libraries to link with:
LDLIBS =@LDFLAGS@ @LIBS@ -lm
GLDLIBS =@LDFLAGS@ @GLLIB@ @LIBS@ -lm
LDLIBS =@LDFLAGS@ @LIBS@
GLDLIBS =@LDFLAGS@ @GLLIB@ @LIBS@
LINKFLTK =-L../lib @LINKFLTK@
LINKFLTKGL =-L../lib @LINKFLTKGL@
IMAGELIBS =@IMAGELIBS@
@ -105,5 +105,5 @@ CAT3EXT =@CAT3EXT@
mv t.z $@
#
# End of "$Id: makeinclude.in,v 1.7.2.11.2.7 2001/11/19 01:06:45 easysw Exp $".
# End of "$Id: makeinclude.in,v 1.7.2.11.2.8 2001/11/20 20:10:59 easysw Exp $".
#