Author: fabien
Date: 2008-11-09 13:05:52 -0800 (Sun, 09 Nov 2008)
New Revision: 6505
Log:
Fixed broken png image include.

Modified:
   branches/branch-1.3/configure.in

Modified: branches/branch-1.3/configure.in
===================================================================
--- branches/branch-1.3/configure.in    2008-11-09 13:15:05 UTC (rev 6504)
+++ branches/branch-1.3/configure.in    2008-11-09 21:05:52 UTC (rev 6505)
@@ -579,26 +579,23 @@
 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
-    fi])
-
-AC_CHECK_LIB(png,png_set_tRNS_to_alpha, [
-    PNGINC=""
-    PNG=""
-    IMAGELIBS="-lpng $IMAGELIBS"
-    AC_DEFINE(HAVE_LIBPNG)
-    AC_DEFINE(HAVE_PNG_GET_VALID)
-    AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA)    AC_CHECK_HEADER(png.h, 
AC_DEFINE(HAVE_PNG_H))],[
-    if test x$enable_localpng = xno; then
-        PNGINC=""
-        PNG=""
+       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_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_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])
 
 AC_SUBST(JPEG)

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to