X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=317ffa236a62f4872a2b70ffb977203908fe8449;hb=6280b5ad8d12ad8f2c6756f22ec616b26d5acde7;hp=1d1a428ead72dc06ca01787767e27be237c55cf6;hpb=aab317eb8c19f56324b0bf016010edaaecb7712d;p=openjpeg.git

diff --git a/configure.ac b/configure.ac
index 1d1a428e..317ffa23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@
 # 3) if API or ABI is broken (this case should (must) never happen as it's very bad for a library), or a new designed library, increase MAJOR and set MINOR and MICRO to 0
 
 m4_define([OPJ_MAJOR], [1])
-m4_define([OPJ_MINOR], [4])
-m4_define([OPJ_MICRO], [99])
+m4_define([OPJ_MINOR], [5])
+m4_define([OPJ_MICRO], [0])
 
 m4_define([lt_cur], m4_eval(OPJ_MAJOR + OPJ_MINOR))
 m4_define([lt_rev], OPJ_MICRO)
@@ -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
@@ -346,9 +358,9 @@ if test "x${have_lcms2}" = "xno" ; then
 
 fi
 
-# pthread
+# threads
 
-if test "x${want_jpip}" = "xyes" ; then
+if test "x${want_jpip_server}" = "xyes" ; then
 
    if test "x${have_win32}" = "xno" ; then
 
@@ -373,8 +385,8 @@ id = pthread_self();
       AC_MSG_RESULT([${have_pthread}])
 
       if ! test "x${have_pthread}" = "xyes" ; then
-         AC_MSG_WARN([Pthread library not found. OpenJPIP library will not be compiled.])
-         want_jpip="no"
+         AC_MSG_WARN([Pthread library not found. OpenJPIP server will not be compiled.])
+         want_jpip_server="no"
       else
          THREAD_CFLAGS="-pthread"
          THREAD_LIBS="-pthread"