Added libpng 1.5 detection. Dropped libpng 1.0.* explicit detection (we are in 2011...

diff --git a/CHANGES b/CHANGES
index 8e12ab10acc35b1cf0bdcdf2e7f98c716d2aba87..2fbf853f1952f60a0ba0b30fe0aea2bd972ab5a4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+July 23, 2011
++ [vtorri] Added libpng 1.5 detection. Dropped libpng 1.0.* explicit detection (we are in 2011 !). Patch by Winfried.
+
 July 13, 2011
 + [vtorri] added 'libopenjpeg-jpwl.pc.in'
 * [vtorri] fixed substitution in libopenjpeg1.pc.in

diff --git a/configure.ac b/configure.ac
index acd998c9a5d17f414590f353cf1d84548fe405d9..d073f7538b1bbfbc8930406a3266f72a7cb907b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -222,13 +222,13 @@ AC_MSG_RESULT([${want_png}])
 
 if test "x${want_png}" = "xyes" ; then
 
-   PKG_CHECK_MODULES([PNG], [libpng14],
+   PKG_CHECK_MODULES([PNG], [libpng15],
       [have_libpng="yes"],
       [
-       PKG_CHECK_MODULES([PNG], [libpng12],
+       PKG_CHECK_MODULES([PNG], [libpng14],
           [have_libpng="yes"],
           [
-           PKG_CHECK_MODULES([PNG], [libpng10],
+           PKG_CHECK_MODULES([PNG], [libpng12],
               [have_libpng="yes"],
               [
                PKG_CHECK_MODULES([PNG], [libpng],