The configure script now offers options for JPEG, PNG, and ZLIB

libraries (STR #416)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3454 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 53 insertions, 25 deletions

diff --git a/CHANGES b/CHANGES
index d745f9e07..3e7e4eb8c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,10 @@
 CHANGES IN FLTK 1.1.5rc2
 
-	- first Menu Item in a list would not go invisible 
+	- Documentation updates (STR #365, STR #399, STR #412)
+	- The configure script now offers options for JPEG, PNG,
+	  and ZLIB libraries (STR #416)
+	- The first menu item in a list would not go invisible 
 	  (STR #406)
-	- Documaentation fix (STR #412)
-	- Documentation updates (STR #365, STR #399)
 	- Fl_Text_Buffer::replace() now range checks its input
 	  (STR #385)
 	- FLTK now builds with the current release of MinGW (STR
diff --git a/configure.in b/configure.in
index 9d4f3a711..f7999a6d4 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.109 2004/06/01 14:49:51 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.110 2004/06/09 12:09:39 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -361,26 +361,53 @@ 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)])
+AC_ARG_ENABLE(jpeg, [  --enable-jpeg           enable JPEG image support])
+AC_ARG_WITH(jpeg-libs, [  --with-jpeg-libs        set directory for JPEG library],
+    LDFLAGS="-L$withval $LDFLAGS",)
+AC_ARG_WITH(jpeg-includes, [  --with-jpeg-includes    set directory for JPEG includes],
+    CFLAGS="-I$withval $CFLAGS"
+    CXXFLAGS="-I$withval $CXXFLAGS"
+    CPPFLAGS="-I$withval $CPPFLAGS",)
+
+if test "x$ac_enable_jpeg" != xno; then
+    AC_CHECK_HEADER(jpeglib.h,
+	AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+	    AC_DEFINE(HAVE_LIBJPEG)
+	    IMAGELIBS="$IMAGELIBS -ljpeg"))
+fi
+
+AC_ARG_ENABLE(png, [  --enable-png            enable PNG image support])
+AC_ARG_WITH(png-libs, [  --with-png-libs         set directory for PNG library],
+    LDFLAGS="-L$withval $LDFLAGS",)
+AC_ARG_WITH(png-includes, [  --with-png-includes     set directory for PNG includes],
+    CFLAGS="-I$withval $CFLAGS"
+    CXXFLAGS="-I$withval $CXXFLAGS"
+    CPPFLAGS="-I$withval $CPPFLAGS",)
+
+AC_ARG_WITH(zlib-libs, [  --with-zlib-libs        set directory for ZLIB library],
+    LDFLAGS="-L$withval $LDFLAGS",)
+AC_ARG_WITH(zlib-includes, [  --with-zlib-includes    set directory for ZLIB includes],
+    CFLAGS="-I$withval $CFLAGS"
+    CXXFLAGS="-I$withval $CXXFLAGS"
+    CPPFLAGS="-I$withval $CPPFLAGS",)
+
+if test "x$ac_enable_png" != xno; then
+    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
 fi
 
 dnl Restore original LIBS settings...
@@ -863,5 +890,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.109 2004/06/01 14:49:51 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.110 2004/06/09 12:09:39 easysw Exp $".
 dnl