osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

We have our own internal versions of "gzgets()" and "gzgetc()", so we 

don't need to check whether zlib has them.  We *do*, however, have to
check for "gzseek()", as we don't have our own version of that.

svn path=/trunk/; revision=3963
This commit is contained in:
Guy Harris 2001-09-28 05:41:45 +00:00
parent ad0e1385e3
commit 61568581bd
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
acinclude.m4
View File

@ -2,7 +2,7 @@ dnl Macros that test for specific features.
dnl This file is part of the Autoconf packaging for Ethereal.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
dnl $Id: acinclude.m4,v 1.34 2001/09/20 16:36:44 ashokn Exp $
dnl $Id: acinclude.m4,v 1.35 2001/09/28 05:41:44 guy Exp $
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@ -364,15 +364,14 @@ AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
#
# Well, we at least have the zlib header file.
#
# Check for "gzgets()" in zlib, because we need it, but
# Check for "gzseek()" in zlib, because we need it, but
# some older versions of zlib don't have it. It appears
# from the zlib ChangeLog that any released version of zlib
# with "gzgets()" should have the other routines we
# depend on, such as "gzseek()", "gztell()", and "zError()".
# with "gzseek()" should have the other routines we
# depend on, such as "gztell()" and "zError()".
#
AC_CHECK_LIB(z, gzgets,,enable_zlib=no)
AC_CHECK_LIB(z, gzseek,,enable_zlib=no)
fi
])
#

12
wiretap/acinclude.m4
View File

@ -2,7 +2,7 @@ dnl Macros that test for specific features.
dnl This file is part of the Autoconf packaging for Ethereal.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
dnl $Id: acinclude.m4,v 1.11 2001/08/20 15:23:34 gram Exp $
dnl $Id: acinclude.m4,v 1.12 2001/09/28 05:41:45 guy Exp $
dnl
#
@ -71,12 +71,12 @@ AC_DEFUN(AC_WIRETAP_ZLIB_CHECK,
#
# Well, we at least have the zlib header file.
#
# Check for "gzgets()" in zlib, because we need it, but
# Check for "gzseek()" in zlib, because we need it, but
# some older versions of zlib don't have it. It appears
# from the ChangeLog that any released version of zlib
# with "gzgets()" should have the other routines we
# depend on, such as "gzseek()", "gztell()", and "zError()".
# from the zlib ChangeLog that any released version of zlib
# with "gzseek()" should have the other routines we
# depend on, such as "gztell()" and "zError()".
#
AC_CHECK_LIB(z, gzgets,,enable_zlib=no)
AC_CHECK_LIB(z, gzseek,,enable_zlib=no)
fi
])

4
wiretap/configure.in
View File

@ -1,4 +1,4 @@
# $Id: configure.in,v 1.29 2001/07/26 07:25:49 guy Exp $
# $Id: configure.in,v 1.30 2001/09/28 05:41:45 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
@ -95,7 +95,7 @@ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
#
# Arrange that we search for libraries in "/usr/local/lib", as we'll
# be testing whether zlib has gzgets, and we need to be able to find
# be testing whether zlib has gzseek, and we need to be able to find
# zlib even if it's in "/usr/local/lib".
#
# We do this after checking for GLib; see above.