Better zlib test.

diff --git a/CHANGES b/CHANGES
index 3f13a496bfc524b9e074ff8e92f60d8c2609ce63..51de2fe03b6926169f0abb1a98d7809dcf5928e7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.323 2011/05/23 08:17:47 stelian Exp $
+$Id: CHANGES,v 1.324 2011/05/23 08:32:23 stelian Exp $
 
 
 Changes between versions 0.4b43 and 0.4b44 (released ?????????????)
@@ -26,9 +26,12 @@ Changes between versions 0.4b43 and 0.4b44 (released ?????????????)
        bug #3303235). Thanks to Adam Tkac <atkac@redhat.com> for
        reporting the bug.
 
-6.     Fix static builds. Thanks Peter Volkov <pva@gentoo.org>
+6.     Fix static builds. Thanks to Peter Volkov <pva@gentoo.org>
        for the patches.
 
+7.     Fix false negatives in configure zlib test. Thanks to
+       Bear Giles <bgiles@coyotesong.com> for the patch.
+
 Changes between versions 0.4b42 and 0.4b43 (released June 11, 2010)
 ===================================================================
 

diff --git a/configure b/configure
index 67a294889e103aaa239e06c9d573bdeadf90eda6..1dbba1bd0193fb5d702540408df0a0ba2240167a 100755 (executable)
--- a/configure
+++ b/configure
@@ -5107,9 +5107,9 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress2 in -lz" >&5
-$as_echo_n "checking for compress2 in -lz... " >&6; }
-if test "${ac_cv_lib_z_compress2+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5
+$as_echo_n "checking for zlibVersion in -lz... " >&6; }
+if test "${ac_cv_lib_z_zlibVersion+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5123,27 +5123,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char compress2 ();
+char zlibVersion ();
 int
 main ()
 {
-return compress2 ();
+return zlibVersion ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_compress2=yes
+  ac_cv_lib_z_zlibVersion=yes
 else
-  ac_cv_lib_z_compress2=no
+  ac_cv_lib_z_zlibVersion=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress2" >&5
-$as_echo "$ac_cv_lib_z_compress2" >&6; }
-if test "x$ac_cv_lib_z_compress2" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_zlibVersion" >&5
+$as_echo "$ac_cv_lib_z_zlibVersion" >&6; }
+if test "x$ac_cv_lib_z_zlibVersion" = x""yes; then :
   zlib_lib=yes
 else
   zlib_lib=no

diff --git a/configure.in b/configure.in
index 62ec978eb144a0650c6d7d0dfc00ac0bdce51c28..2d691572cae369b5b021bdda85843ce683f37bba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -532,7 +532,7 @@ dnl
 dnl Check for zlib headers and libraries
 dnl
 AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no], [-])
-AC_CHECK_LIB(z, compress2, [zlib_lib=yes], [zlib_lib=no])
+AC_CHECK_LIB(z, zlibVersion, [zlib_lib=yes], [zlib_lib=no])
 if test "$zlib_h" = yes -a "$zlib_lib" = yes; then
        if test "$STATICZ" = yes; then
                ZLIB="-Wl,-Bstatic -lz -Wl,-Bdynamic"