Of the "zlib" functions we use that aren't in all versions of "zlib",

"gzgets()" is the one most recently added; it was added in 1.0.9.

Check for it, rather than for a list of functions, when checking for
"zlib" support - if you check for N functions, and they're all there,
you get N "-lz"s added to the list of libraries with which to link.

Indicate in the README that "zlib" versions prior to 1.0.9 definitely
won't work.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1144 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/README b/README
index 25cbc50067d40eb4f9f72fb07ad543cc1c53e3d1..000069019caaf0b14933d34f396a8b4fa8a8efaa 100644 (file)
--- a/README
+++ b/README
@@ -81,11 +81,12 @@ and Toshiba's ISDN routers.
 
 In addition, it can read gzipped versions of any of these files,
 automatically, if you have the zlib library available when compiling
-Ethereal. Ethereal needs a modern version of zlib to work; version
-1.1.3 is known to work.  Earlier versions are missing some functions
-that Ethereal needs and won't work. "./configure" should detect if you
-have the proper zlib version available. You can always use
-"./configure --disable-zlib" to explicitly disable zlib support.
+Ethereal. Ethereal needs a modern version of zlib to be able to use
+zlib to read gzipped files; version 1.1.3 is known to work.  Versions
+prior to 1.0.9 are missing some functions that Ethereal needs and won't
+work.  "./configure" should detect if you have the proper zlib version
+available and, if you don't, should disable zlib support. You can always
+use "./configure --disable-zlib" to explicitly disable zlib support.
 
 Although Ethereal can read AIX iptrace files, the documentation on
 AIX's iptrace packet-trace command is sparse.  The 'iptrace' command

diff --git a/acinclude.m4 b/acinclude.m4
index b97e0ed41a370e15c736165bc5ded28b0b90ec4c..59ef086002f72ae8670b989a3cb9df3937c05822 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -197,11 +197,15 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK,
 AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
 [
         AC_CHECK_HEADER(zlib.h,,enable_zlib=no)
-        AC_CHECK_LIB(z, gzopen,,enable_zlib=no)
+
+        dnl
+        dnl Check for "gzgets()" in zlib, because we need it, but
+        dnl some older versions of zlib don't have it.  It appears
+        dnl from the ChangeLog that any released version of zlib
+        dnl with "gzgets()" should have the other routines we
+        dnl depend on, such as "gzseek()", "gztell()", and "zError()".
+        dnl
         AC_CHECK_LIB(z, gzseek,,enable_zlib=no)
-        AC_CHECK_LIB(z, gztell,,enable_zlib=no)
-        AC_CHECK_LIB(z, gzgets,,enable_zlib=no)
-        AC_CHECK_LIB(z, zError,,enable_zlib=no)
 ])
 
 #

diff --git a/wiretap/acinclude.m4 b/wiretap/acinclude.m4
index 44c873857f1d56bd894c2ba094ed95bb5cb9e894..ecd6196963df230926db84754d5884042449e491 100644 (file)
--- a/wiretap/acinclude.m4
+++ b/wiretap/acinclude.m4
@@ -201,9 +201,13 @@ main ()
 AC_DEFUN(AC_WIRETAP_ZLIB_CHECK,
 [
         AC_CHECK_HEADER(zlib.h,,enable_zlib=no)
-        AC_CHECK_LIB(z, gzopen,,enable_zlib=no)
+
+        dnl
+        dnl Check for "gzgets()" in zlib, because we need it, but
+        dnl some older versions of zlib don't have it.  It appears
+        dnl from the ChangeLog that any released version of zlib
+        dnl with "gzgets()" should have the other routines we
+        dnl depend on, such as "gzseek()", "gztell()", and "zError()".
+        dnl
         AC_CHECK_LIB(z, gzseek,,enable_zlib=no)
-        AC_CHECK_LIB(z, gztell,,enable_zlib=no)
-        AC_CHECK_LIB(z, gzgets,,enable_zlib=no)
-        AC_CHECK_LIB(z, zError,,enable_zlib=no)
 ])