[1.5] Add zlib check when checking libpng

diff --git a/CHANGES b/CHANGES
index 656e195dd2aebaeeb0e84c145a8f01c96b402ec5..4bcf51fff417a5555a8ece3d8dee6f5b8191814b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+January 28, 2012
++ [vincent] Add zlib check when checking libpng
+
 January 25, 2012
 * [vincent] fix libopenjpip link on Windows
 * [vincent] follow latest JPIP changes in the autotools side (pthread dependency, conditional compilation of JPIP server and client)

diff --git a/configure.ac b/configure.ac
index 706852f09a8ceca9f7cf9e8be408ebe5c366190d..c0ea8c51eda31a51cff9ddb8eb5e75f4ab1307e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -197,16 +197,16 @@ AC_MSG_RESULT([${want_png}])
 
 if test "x${want_png}" = "xyes" ; then
 
-   PKG_CHECK_MODULES([PNG], [libpng15],
+   PKG_CHECK_MODULES([PNG], [libpng15 zlib],
       [have_libpng="yes"],
       [
-       PKG_CHECK_MODULES([PNG], [libpng14],
+       PKG_CHECK_MODULES([PNG], [libpng14 zlib],
           [have_libpng="yes"],
           [
-           PKG_CHECK_MODULES([PNG], [libpng12],
+           PKG_CHECK_MODULES([PNG], [libpng12 zlib],
               [have_libpng="yes"],
               [
-               PKG_CHECK_MODULES([PNG], [libpng],
+               PKG_CHECK_MODULES([PNG], [libpng zlib],
                   [have_libpng="yes"],
                   [have_libpng="no"])
               ])
@@ -214,11 +214,23 @@ if test "x${want_png}" = "xyes" ; then
       ])
 
    if ! test "x${have_libpng}" = "xyes" ; then
-      OPJ_CHECK_LIB([png.h],
-         [png],
-         [png_create_write_struct],
-         [have_libpng="yes"],
+
+      OPJ_CHECK_LIB([zlib.h],
+         [z],
+         [zlibVersion],
+         [
+          OPJ_CHECK_LIB([png.h],
+             [png],
+             [png_access_version_number],
+             [
+              have_libpng="yes"
+              PNG_CFLAGS="${PNG_CFLAGS} ${Z_CFLAGS}"
+              PNG_LIBS="${PNG_LIBS} ${Z_LIBS}"
+             ],
+             [have_libpng="no"])
+         ],
          [have_libpng="no"])
+
    fi
 
    if test "x${have_libpng}" = "xno" ; then