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

[svn at osgeo.org]

Author: dmorissette
Date: 2009-05-07 16:55:10 -0400 (Thu, 07 May 2009)
New Revision: 9007

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/configure
   branches/branch-5-4/mapserver/configure.in
Log:
Fixed detection of libpng + zlib headers with experimental-png enabled (#3010)

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-05-07 20:50:50 UTC (rev 9006)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-05-07 20:55:10 UTC (rev 9007)
@@ -12,10 +12,13 @@
 Current Version:
 ----------------
 
+- Fixed detection of libpng + zlib headers with experimental-png enabled (#3010)
+
 - Fixed a memory leak when unescaping quotes in logical expressions (#2938)
 
-- Fixed a problem with the iniitialization of tag arguments when multiple item, shpxy or exent
-  tags were in the same block of template text being processed (#2990)
+- Fixed a problem with the iniitialization of tag arguments when multiple
+  item, shpxy or exent tags were in the same block of template text being
+  processed (#2990)
 
 - Fixed a double free problem in shpxy tag processing
 
@@ -28,6 +31,8 @@
 Version 5.4.0 (2009-04-22):
 ---------------------------
 
+- No change since 5.4.0-rc2.
+
 Version 5.4.0-rc2 (2009-04-15):
 -------------------------------
 

Modified: branches/branch-5-4/mapserver/configure
===================================================================
--- branches/branch-5-4/mapserver/configure	2009-05-07 20:50:50 UTC (rev 9006)
+++ branches/branch-5-4/mapserver/configure	2009-05-07 20:55:10 UTC (rev 9007)
@@ -9348,6 +9348,7 @@
     test -f $PNG_DIR/lib/png.h && PNG_INCLUDE="$PNG_DIR/lib"
     test -f $PNG_DIR/png.h && PNG_INCLUDE="$PNG_DIR"
     if test -n "$PNG_INCLUDE" ; then
+            old_cflags="$CFLAGS"
       # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 
 
@@ -9554,6 +9555,7 @@
 fi
 
 
+      CFLAGS="$old_cflags"
     else
         { { echo "$as_me:$LINENO: error: cannot find png headers in $PNG_DIR" >&5
 echo "$as_me: error: cannot find png headers in $PNG_DIR" >&2;}

Modified: branches/branch-5-4/mapserver/configure.in
===================================================================
--- branches/branch-5-4/mapserver/configure.in	2009-05-07 20:50:50 UTC (rev 9006)
+++ branches/branch-5-4/mapserver/configure.in	2009-05-07 20:55:10 UTC (rev 9007)
@@ -929,8 +929,11 @@
     test -f $PNG_DIR/lib/png.h && PNG_INCLUDE="$PNG_DIR/lib"
     test -f $PNG_DIR/png.h && PNG_INCLUDE="$PNG_DIR"
     if test -n "$PNG_INCLUDE" ; then
+      dnl make sure we'll be able to find zlib.h
+      old_cflags="$CFLAGS"
       AC_CHECK_HEADER([$PNG_INCLUDE/png.h],,
         [AC_MSG_ERROR([cannot find png headers])])
+      CFLAGS="$old_cflags"
     else
         AC_MSG_ERROR([cannot find png headers in $PNG_DIR])
     fi