[mapserver-commits] r9013 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2009-05-13 10:40:50 -0400 (Wed, 13 May 2009)
New Revision: 9013

Modified:
   branches/branch-5-4/mapserver/configure
   branches/branch-5-4/mapserver/configure.in
Log:
Added missing line in libpng detection patch (#3010)

Modified: branches/branch-5-4/mapserver/configure
===================================================================
--- branches/branch-5-4/mapserver/configure	2009-05-13 14:40:31 UTC (rev 9012)
+++ branches/branch-5-4/mapserver/configure	2009-05-13 14:40:50 UTC (rev 9013)
@@ -9348,6 +9348,7 @@
     test -f $PNG_DIR/png.h && PNG_INCLUDE="$PNG_DIR"
     if test -n "$PNG_INCLUDE" ; then
             old_cflags="$CFLAGS"
+      CFLAGS="$ZLIB_INC $CFLAGS"
       # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 
 

Modified: branches/branch-5-4/mapserver/configure.in
===================================================================
--- branches/branch-5-4/mapserver/configure.in	2009-05-13 14:40:31 UTC (rev 9012)
+++ branches/branch-5-4/mapserver/configure.in	2009-05-13 14:40:50 UTC (rev 9013)
@@ -931,6 +931,7 @@
     if test -n "$PNG_INCLUDE" ; then
       dnl make sure we'll be able to find zlib.h
       old_cflags="$CFLAGS"
+      CFLAGS="$ZLIB_INC $CFLAGS"
       AC_CHECK_HEADER([$PNG_INCLUDE/png.h],,
         [AC_MSG_ERROR([cannot find png headers])])
       CFLAGS="$old_cflags"