diff options
| author | Ashok Narayanan <ashokn@cisco.com> | 2001-09-20 16:36:45 +0000 |
|---|---|---|
| committer | Ashok Narayanan <ashokn@cisco.com> | 2001-09-20 16:36:45 +0000 |
| commit | 29c8fa03b3a2d73b52f4731b06b801d9e28de9a2 (patch) | |
| tree | 3ce1bb901498f45652612641036a013d27a49e32 /acinclude.m4 | |
| parent | d1ec951825b9cee63227ef9347d1d2b082966e4d (diff) | |
| download | wireshark-29c8fa03b3a2d73b52f4731b06b801d9e28de9a2.tar.gz | |
Removed the dependency on gzgetc and gzgets by implementing internal
versions of these commands in file_wrappers.c. This allows us to
compile successfully even on platforms where X has an older zlib built
in.
Removed this restriction from acinclude.m4
svn path=/trunk/; revision=3948
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index b889cd52f1..02b85af48f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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.33 2001/09/17 23:35:22 guy Exp $ +dnl $Id: acinclude.m4,v 1.34 2001/09/20 16:36:44 ashokn 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 @@ -373,37 +373,6 @@ AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK, AC_CHECK_LIB(z, gzgets,,enable_zlib=no) fi - if test x$enable_zlib != xno - then - # - # Well, we at least have the zlib header file and a zlib - # with "gzgets()". - # - # Now check for "gzgets()" in zlib when linking with the - # linker flags for GTK+ applications; people often grab - # XFree86 source and build and install it on their systems, - # and they appear sometimes to misconfigure XFree86 so that, - # even on systems with zlib, it assumes there is no zlib, - # so the XFree86 build process builds and installs its - # own zlib in the X11 library directory. - # - # The XFree86 zlib is an older version that lacks - # "gzgets()", and that's the zlib with which Ethereal - # gets linked, so the build of Ethereal fails. - # - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS -lz $LIBS" - AC_MSG_CHECKING([for gzgets missing when linking with X11]) - AC_TRY_LINK_FUNC(gzgets, AC_MSG_RESULT(no), - [ - AC_MSG_RESULT(yes) - AC_MSG_ERROR(old XFree86 zlib found - rebuild XFree86 using system zlib or configure Ethereal without compressed file support.) - ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi ]) # |