summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-07-23 08:32:09 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-07-23 08:32:09 +0000
commitfda0cada0eb1e687d24e8204052c3b783848cd22 (patch)
tree02ba997daebc31c48016f771292848fed67e2240
parenta58987d082d6913f43b5fd4e9ce3769b311d8d25 (diff)
Added libpng 1.5 detection. Dropped libpng 1.0.* explicit detection (we are in 2011 !). Patch by Winfried.
-rw-r--r--CHANGES3
-rw-r--r--configure.ac6
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 8e12ab10..2fbf853f 100644
--- 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 acd998c9..d073f753 100644
--- 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],