Load fltk-1.1.5rc2 into branches/upstream/current.

1 files changed, 60 insertions, 25 deletions

diff --git a/configure.in b/configure.in
index 3d2978a..cccc26d 100644
--- a/configure.in
+++ b/configure.in
@@ -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.108 2004/04/11 04:38:53 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.115 2004/07/26 17:46:36 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -35,7 +35,7 @@ dnl FLTK library versions...
 FL_MAJOR_VERSION=1
 FL_MINOR_VERSION=1
 FL_PATCH_VERSION=5
-FL_RELEASE_VERSION=rc1
+FL_RELEASE_VERSION=rc2
 FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
 
 AC_SUBST(FL_MAJOR_VERSION)
@@ -72,6 +72,7 @@ case $uname in
 	    CFLAGS="$CFLAGS -mno-cygwin"
 	    CPPFLAGS="$CPPFLAGS -mno-cygwin"
 	    CXXFLAGS="$CXXFLAGS -mno-cygwin"
+	    LDFLAGS="$LDFLAGS -mno-cygwin"
 	fi
 	;;
 esac
@@ -82,6 +83,7 @@ LINKFLTKGL="-lfltk_gl"
 LINKFLTKIMG="-lfltk_images"
 GLDEMOS="gldemos"
 
+LIBEXT=".a"
 LIBNAME="../lib/libfltk.a"
 FLLIBNAME="../lib/libfltk_forms.a"
 GLLIBNAME="../lib/libfltk_gl.a"
@@ -91,6 +93,7 @@ AC_SUBST(FLLIBNAME)
 AC_SUBST(GLDEMOS)
 AC_SUBST(GLLIBNAME)
 AC_SUBST(IMGLIBNAME)
+AC_SUBST(LIBEXT)
 AC_SUBST(LIBNAME)
 AC_SUBST(LINKFLTK)
 AC_SUBST(LINKFLTKGL)
@@ -361,27 +364,59 @@ IMAGELIBS=""
 
 AC_SUBST(IMAGELIBS)
 
-AC_CHECK_HEADER(jpeglib.h,
-    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-	AC_DEFINE(HAVE_LIBJPEG)
-	IMAGELIBS="$IMAGELIBS -ljpeg"))
-
-AC_CHECK_HEADER(zlib.h,
-    AC_CHECK_LIB(z, gzopen,
-	AC_DEFINE(HAVE_LIBZ)
-	IMAGELIBS="$IMAGELIBS -lz"
-	LIBS="$LIBS -lz"))
-
-AC_CHECK_HEADER(png.h, AC_DEFINE(HAVE_PNG_H))
-AC_CHECK_HEADER(libpng/png.h, AC_DEFINE(HAVE_LIBPNG_PNG_H))
-
-if test x$ac_cv_header_png_h = xyes -o x$ac_cv_header_libpng_png_h = xyes; then
-    AC_CHECK_LIB(png, png_read_rows,
-	[AC_DEFINE(HAVE_LIBPNG)
-	IMAGELIBS="-lpng $IMAGELIBS"
-	LIBS="-lpng $LIBS"
-	AC_CHECK_FUNCS(png_get_valid png_set_tRNS_to_alpha)])
-fi
+AC_ARG_ENABLE(localjpeg, [  --enable-localjpeg      use local JPEG library, default=auto],
+    [if eval "test x$enable_localjpeg = xyes"; then
+	ac_cv_lib_jpeg_jpeg_CreateCompress=no
+    fi])
+
+AC_CHECK_LIB(jpeg,jpeg_CreateCompress,
+    JPEGINC=""
+    JPEG=""
+    IMAGELIBS="-ljpeg $IMAGELIBS",
+    JPEGINC="-I../jpeg"
+    JPEG="jpeg"
+    IMAGELIBS="../lib/libjpeg.a $IMAGELIBS")
+
+AC_ARG_ENABLE(localzlib, [  --enable-localzlib      use local ZLIB library, default=auto],
+    [if eval "test x$enable_localzlib = xyes"; then
+	ac_cv_lib_z_gzgets=no
+    fi])
+
+AC_CHECK_LIB(z,gzgets,
+    ZLIBINC=""
+    ZLIB=""
+    LIBS="-lz $LIBS"
+    IMAGELIBS="-lz $IMAGELIBS",
+    ZLIBINC="-I../zlib"
+    ZLIB="zlib"
+    LIBS="../lib/libz.a $LIBS"
+    IMAGELIBS="../lib/libz.a $IMAGELIBS")
+
+AC_ARG_ENABLE(localpng, [  --enable-localpng       use local PNG library, default=auto],
+    [if eval "test x$enable_localpng = xyes"; then
+	ac_cv_lib_png_png_set_tRNS_to_alpha=no
+    fi])
+
+AC_CHECK_LIB(png,png_set_tRNS_to_alpha, [
+    PNGINC=""
+    PNG=""
+    IMAGELIBS="-lpng $IMAGELIBS"
+    AC_CHECK_HEADER(png.h, AC_DEFINE(HAVE_PNG_H))],[
+    AC_DEFINE(HAVE_PNG_H)
+    PNGINC="-I../png"
+    PNG="png"
+    IMAGELIBS="../lib/libpng.a $IMAGELIBS"])
+
+AC_SUBST(JPEG)
+AC_SUBST(JPEGINC)
+AC_SUBST(PNG)
+AC_SUBST(PNGINC)
+AC_SUBST(ZLIB)
+AC_SUBST(ZLIBINC)
+
+AC_DEFINE(HAVE_LIBJPEG)
+AC_DEFINE(HAVE_LIBPNG)
+AC_DEFINE(HAVE_LIBZ)
 
 dnl Restore original LIBS settings...
 LIBS="$SAVELIBS"
@@ -685,7 +720,7 @@ if test -n "$GCC"; then
     OPTIM="-Wall -Wunused $OPTIM"
 
     # The following additional warnings are useful for tracking down problems...
-    #OPTIM="-Wshadow -Wconversion -Winline $OPTIM"
+    OPTIM="-Wshadow -Wconversion -Winline $OPTIM"
 
     # Set the default compiler optimizations...
     if test -z "$DEBUGFLAG"; then
@@ -863,5 +898,5 @@ dnl Make sure the fltk-config script is executable...
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.108 2004/04/11 04:38:53 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.115 2004/07/26 17:46:36 easysw Exp $".
 dnl