From 02b906f6ad4d7d321373922b8b32be1f76786c3f Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Sat, 28 Jan 2012 10:46:42 +0000
Subject: [PATCH] [1.5] Add zlib check when checking libpng
---
CHANGES | 3 +++
configure.ac | 28 ++++++++++++++++++++--------
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/CHANGES b/CHANGES
index 656e195d..4bcf51ff 100644
--- 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 706852f0..c0ea8c51 100644
--- 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
--
2.40.0