Get rid of the check for NetBSD in the Wiretap "configure.in"; we
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 12 Feb 2000 08:54:32 +0000 (08:54 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 12 Feb 2000 08:54:32 +0000 (08:54 +0000)
eliminated the check in the top-level "configure.in", and leaving it in
the Wiretap one means that, on NetBSD, Ethereal gets built with zlib
support if zlib is present, but Wiretap doesn't - now they both get
built with zlib support.  Thanks to Itojun for catching this one.

Put into the Wiretap "configure.in" code to note that, if the test for
"gzgets()" in zlib fails, we're disabling compressed capture file
support, as is done in the top-level "configure.in".

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

wiretap/configure.in

index 884f901e146c29e5ef44eccd27e618becce12d46..5b3f986c51d3dd5e924dc05ef801ac7fa2a7c5a5 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.20 2000/01/13 07:09:15 guy Exp $
+# $Id: configure.in,v 1.21 2000/02/12 08:54:32 guy Exp $
 dnl
 dnl Process this file with autoconf 2.13 or later to produce a
 dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -55,11 +55,7 @@ AC_C_BIGENDIAN
 
 dnl zlib check
 AC_ARG_ENABLE(zlib,
-[  --enable-zlib           use zlib to read compressed data.  [default=yes]],, [dnl
-case "$host_os" in
-netbsd*)       enable_zlib=no;;
-*)             enable_zlib=yes;;
-esac])
+[  --enable-zlib           use zlib to read compressed data.  [default=yes]],,enable_zlib=yes)
 
 AC_MSG_CHECKING(whether to use zlib for reading compressed capture files)
 if test "x$enable_zlib" = "xno" ; then
@@ -67,6 +63,9 @@ if test "x$enable_zlib" = "xno" ; then
 else
         AC_MSG_RESULT(yes)
        AC_WIRETAP_ZLIB_CHECK
+       if test "x$enable_zlib" = "xno" ; then
+               AC_MSG_RESULT(zlib not found - disabling compressed capture file support)
+       fi
 fi
 
 AC_OUTPUT(Makefile)