Author: fabien
Date: 2008-11-10 09:22:14 -0800 (Mon, 10 Nov 2008)
New Revision: 6509
Log:
Fixes the configure problem when the png option is not specified.
Modified:
branches/branch-1.3/configure.in
Modified: branches/branch-1.3/configure.in
===================================================================
--- branches/branch-1.3/configure.in 2008-11-09 23:35:19 UTC (rev 6508)
+++ branches/branch-1.3/configure.in 2008-11-10 17:22:14 UTC (rev 6509)
@@ -576,27 +576,34 @@
IMAGELIBS="-lfltk_z $IMAGELIBS"
fi)
-AC_ARG_ENABLE(localpng, [ --enable-localpng use local PNG library,
default=auto],
- [if test x$enable_localpng = xyes; then
- ac_cv_lib_png_png_set_tRNS_to_alpha=yes
- AC_DEFINE(HAVE_LIBPNG)
- AC_DEFINE(HAVE_PNG_H)
- AC_DEFINE(HAVE_PNG_GET_VALID)
- AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA)
- PNGINC="-I../png"
- PNG="png"
- IMAGELIBS="-lfltk_png $IMAGELIBS"
- else
- PNGINC=""
- PNG=""
- IMAGELIBS="-lpng $IMAGELIBS"
- AC_DEFINE(HAVE_LIBPNG)
- AC_DEFINE(HAVE_PNG_GET_VALID)
- AC_CHECK_LIB(png,png_set_tRNS_to_alpha,
- AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
- AC_CHECK_HEADER(png.h,
- AC_DEFINE(HAVE_PNG_H))
- fi])
+# Handle the PNG lib linking mode (use fltk local or system lib)
+# If --enable-(resp. --disable-)localpng parameter is not set by user
+# Then we check the png lib usability with result in syspng_lib variable
+AC_ARG_ENABLE(localpng, [ --enable-localpng use local PNG library,
default=auto])
+# does not work correctly under cygwin ? (header not found )
+#AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, syslib_ok=yes)])
+AC_CHECK_LIB(png, png_read_info,[syspnglib_ok=yes], [syspnglib_ok=no])
+#AC_MSG_WARN("*** USING LIB OK : $syspnglib_ok")
+# The following is executed if the lib was not found or if local lib is
required explicitly
+if test x$enable_localpng = xyes -o x$syspnglib_ok = xno ; then
+ ac_cv_lib_png_png_set_tRNS_to_alpha=yes
+ AC_DEFINE(HAVE_LIBPNG)
+ AC_DEFINE(HAVE_PNG_H)
+ AC_DEFINE(HAVE_PNG_GET_VALID)
+ AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA)
+ PNGINC="-I../png"
+ PNG="png"
+ IMAGELIBS="-lfltk_png $IMAGELIBS"
+# AC_MSG_WARN("*** USING PNG LOCAL SETUP")
+else
+ PNGINC=""
+ PNG=""
+ IMAGELIBS="-lpng $IMAGELIBS"
+ AC_DEFINE(HAVE_LIBPNG)
+ AC_DEFINE(HAVE_PNG_GET_VALID)
+ AC_CHECK_LIB(png,png_set_tRNS_to_alpha,
AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
+# AC_MSG_WARN("*** USING PNG LIB SETUP")
+fi
AC_SUBST(JPEG)
AC_SUBST(JPEGINC)
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
