diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-11-20 03:44:18 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-11-20 03:44:18 +0000 |
| commit | fc8d065cd73f6a9a5477ea5106da6b26c5cf9a29 (patch) | |
| tree | 603bb2ac5525a281dc539eb1682a298e6a68fdf3 /configure.in | |
| parent | 23bb0590651da3f342cddcd3c87aee38a1d067cc (diff) | |
The configure script did not support --disable-localfoo to
completely disable image file support (STR #582)
The Visual C++ 6.0 project files still listed the old JPEG, PNG,
and ZLIB library names (STR #577)
Fixed the scandir() conditional code for HP-UX 11i (STR #585)
Fl_Text_Display didn't support CTRL/CMD-A/C (STR #601)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3898 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/configure.in b/configure.in index dab37a60d..184baf18e 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.121 2004/11/20 03:19:57 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.122 2004/11/20 03:44:17 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -377,35 +377,49 @@ IMAGELIBS="" AC_SUBST(IMAGELIBS) AC_ARG_ENABLE(localjpeg, [ --enable-localjpeg use local JPEG library, default=auto], - [if eval "test x$enable_localjpeg = xyes"; then + [if test x$enable_localjpeg = xyes; then ac_cv_lib_jpeg_jpeg_CreateCompress=no fi]) AC_CHECK_LIB(jpeg,jpeg_CreateCompress, + AC_DEFINE(HAVE_LIBJPEG) JPEGINC="" JPEG="" IMAGELIBS="-ljpeg $IMAGELIBS", - JPEGINC="-I../jpeg" - JPEG="jpeg" - IMAGELIBS="-lfltk_jpeg $IMAGELIBS") + if test x$enable_localjpeg = xno; then + JPEGINC="" + JPEG="" + else + AC_DEFINE(HAVE_LIBJPEG) + JPEGINC="-I../jpeg" + JPEG="jpeg" + IMAGELIBS="-lfltk_jpeg $IMAGELIBS" + fi) AC_ARG_ENABLE(localzlib, [ --enable-localzlib use local ZLIB library, default=auto], - [if eval "test x$enable_localzlib = xyes"; then + [if test x$enable_localzlib = xyes; then ac_cv_lib_z_gzgets=no fi]) AC_CHECK_LIB(z,gzgets, + AC_DEFINE(HAVE_LIBZ) ZLIBINC="" ZLIB="" LIBS="-lz $LIBS" IMAGELIBS="-lz $IMAGELIBS", - ZLIBINC="-I../zlib" - ZLIB="zlib" - LIBS="-lfltk_z $LIBS" - IMAGELIBS="-lfltk_z $IMAGELIBS") + if test x$enable_localzlib = xno; then + ZLIBINC="" + ZLIB="" + else + AC_DEFINE(HAVE_LIBZ) + ZLIBINC="-I../zlib" + ZLIB="zlib" + LIBS="-lfltk_z $LIBS" + IMAGELIBS="-lfltk_z $IMAGELIBS" + fi) AC_ARG_ENABLE(localpng, [ --enable-localpng use local PNG library, default=auto], - [if eval "test x$enable_localpng = xyes"; then + [if test x$enable_localpng = xyes; then ac_cv_lib_png_png_set_tRNS_to_alpha=no fi]) @@ -413,11 +427,18 @@ AC_CHECK_LIB(png,png_set_tRNS_to_alpha, [ PNGINC="" PNG="" IMAGELIBS="-lpng $IMAGELIBS" + AC_DEFINE(HAVE_LIBPNG) AC_CHECK_HEADER(png.h, AC_DEFINE(HAVE_PNG_H))],[ - AC_DEFINE(HAVE_PNG_H) - PNGINC="-I../png" - PNG="png" - IMAGELIBS="-lfltk_png $IMAGELIBS"]) + if test x$enable_localpng = xno; then + PNGINC="" + PNG="" + else + AC_DEFINE(HAVE_LIBPNG) + AC_DEFINE(HAVE_PNG_H) + PNGINC="-I../png" + PNG="png" + IMAGELIBS="-lfltk_png $IMAGELIBS" + fi]) AC_SUBST(JPEG) AC_SUBST(JPEGINC) @@ -426,10 +447,6 @@ 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" @@ -911,5 +928,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.121 2004/11/20 03:19:57 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.122 2004/11/20 03:44:17 easysw Exp $". dnl |