diff options
author | Guy Harris <guy@alum.mit.edu> | 2000-02-12 08:54:32 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2000-02-12 08:54:32 +0000 |
commit | 533bc848a4c894fd13fadf90dbcfbfa20c1fc6cf (patch) | |
tree | a70c0c0083301e384374ca8f255eab576550a4ec /wiretap | |
parent | dd3c88c1ff0f439293465af809a0a0ea47ea70fe (diff) | |
download | wireshark-533bc848a4c894fd13fadf90dbcfbfa20c1fc6cf.tar.gz |
Get rid of the check for NetBSD in the Wiretap "configure.in"; we
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".
svn path=/trunk/; revision=1625
Diffstat (limited to 'wiretap')
-rw-r--r-- | wiretap/configure.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/wiretap/configure.in b/wiretap/configure.in index 884f901e14..5b3f986c51 100644 --- a/wiretap/configure.in +++ b/wiretap/configure.in @@ -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) |