then
#
# Well, we at least have the zlib header file.
+ # We link with zlib to support uncompression of
+ # gzipped network traffic, e.g. in an HTTP request
+ # or response body.
#
- # Check for "gzgets()" 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()".
- #
- # Another reason why we require "gzgets()" is that
- # some versions of zlib that didn't have it, such
- # as 1.0.8, had a bug in "gzseek()" that meant that it
- # doesn't work correctly on uncompressed files; this
- # means we cannot use version 1.0.8. (Unfortunately,
- # that's the version that comes with recent X11 source,
- # and many people who install XFree86 on their Slackware
- # boxes don't realize that they should configure it to
- # use the native zlib rather than building and installing
- # the crappy old version that comes with XFree86.)
- #
- # I.e., we can't just avoid using "gzgets()", as
- # versions of zlib without "gzgets()" are likely to have
- # a broken "gzseek()".
- #
- AC_CHECK_LIB(z, gzgets,
- [
- if test "x$zlib_dir" != "x"
- then
- #
- # Put the "-I" and "-L" flags for zlib at
- # the beginning of CFLAGS, CPPFLAGS, and
- # LIBS.
- #
- LIBS=""
- AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
- LIBS="$LIBS -lz $wireshark_save_LIBS"
- else
- LIBS="-lz $LIBS"
- fi
- AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library])
- ],[
- if test "x$zlib_dir" != "x"
- then
- #
- # Restore the versions of CFLAGS, CPPFLAGS,
- # and LIBS before we added the "-with-zlib="
- # directory, as we didn't actually find
- # zlib there, or didn't find a zlib that
- # contains gzgets there.
- #
- CFLAGS="$wireshark_save_CFLAGS"
- CPPFLAGS="$wireshark_save_CPPFLAGS"
- LIBS="$wireshark_save_LIBS"
- fi
- want_zlib=no
- ])
- fi
-
- if test "x$want_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 Wireshark
- # gets linked, so the build of Wireshark 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 zlib found when linking with X11 - get rid of old zlib.)
- ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
-])
-
-#
-# AC_WIRESHARK_LIBPCRE_CHECK
-#
-AC_DEFUN([AC_WIRESHARK_LIBPCRE_CHECK],
-[
- if test "x$pcre_dir" != "x"
- then
- #
- # The user specified a directory in which libpcre resides,
- # so add the "include" subdirectory of that directory to
- # the include file search path and the "lib" subdirectory
- # of that directory to the library search path.
- #
- # XXX - if there's also a libpcre in a directory that's
- # already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't
- # make us find the version in the specified directory,
- # as the compiler and/or linker will search that other
- # directory before it searches the specified directory.
- #
- wireshark_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$pcre_dir/include"
- wireshark_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I$pcre_dir/include"
- wireshark_save_LIBS="$LIBS"
- LIBS="$LIBS -lpcre"
- wireshark_save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$pcre_dir/lib"
- fi
+ if test "x$zlib_dir" != "x"
+ then
+ #
+ # Put the "-I" and "-L" flags for zlib at
+ # the beginning of CFLAGS, CPPFLAGS, and
+ # LIBS.
+ #
+ LIBS=""
+ AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
+ LIBS="$LIBS -lz $wireshark_save_LIBS"
+ else
+ LIBS="-lz $LIBS"
+ fi
+ AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library])
- #
- # Make sure we have "pcre.h". If we don't, it means we probably
- # don't have libpcre, so don't use it.
- #
- AC_CHECK_HEADER(pcre.h,,
- [
- if test "x$pcre_dir" != "x"
- then
- #
- # The user used "--with-pcre=" to specify a directory
- # containing libpcre, but we didn't find the header file
- # there; that either means they didn't specify the
- # right directory or are confused about whether libpcre
- # is, in fact, installed. Report the error and give up.
- #
- AC_MSG_ERROR([libpcre header not found in directory specified in --with-pcre])
- else
- if test "x$want_pcre" = "xyes"
- then
#
- # The user tried to force us to use the library, but we
- # couldn't find the header file; report an error.
- #
- AC_MSG_ERROR(Header file pcre.h not found.)
- else
+ # Check for "inflatePrime()" in zlib, which we need
+ # in order to read compressed capture files.
#
- # We couldn't find the header file; don't use the
- # library, as it's probably not present.
- #
- want_pcre=no
- fi
- fi
- ])
+ AC_CHECK_FUNCS(inflatePrime)
- if test "x$want_pcre" != "xno"
- then
- #
- # Well, we at least have the pcre header file.
+ if test "x$ac_cv_func_inflatePrime" = "xyes" ; then
+ #
+ # Now check for "inflatePrime()" 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 zlib in at least some versions of XFree86
+ # is an older version that may lack "inflatePrime()",
+ # and that's the zlib with which Wireshark gets
+ # linked, so the build of Wireshark fails.
+ #
+ AC_MSG_CHECKING([for inflatePrime missing when linking with X11])
+ AC_TRY_LINK_FUNC(inflatePrime, AC_MSG_RESULT(no),
+ [
+ AC_MSG_RESULT(yes)
+ AC_MSG_ERROR(old zlib found when linking with X11 - get rid of old zlib.)
+ ])
+ fi
+ else
#
- # We're only using standard functions from libpcre,
- # so we don't need to perform extra checks.
+ # Restore the versions of CFLAGS, CPPFLAGS,
+ # and LIBS before we added the "-with-zlib="
+ # directory, as we didn't actually find
+ # zlib there.
#
- AC_CHECK_LIB(pcre, pcre_compile,
- [
- if test "x$pcre_dir" != "x"
- then
- #
- # Put the "-I" and "-L" flags for pcre at
- # the beginning of CFLAGS, CPPFLAGS,
- # LDFLAGS, and LIBS.
- #
- PCRE_LIBS="-L$pcre_dir/lib -lpcre $wireshark_save_LIBS"
- else
- PCRE_LIBS="-lpcre"
- fi
- AC_DEFINE(HAVE_LIBPCRE, 1, [Define to use libpcre library])
- ],[
- if test "x$pcre_dir" != "x"
- then
- #
- # Restore the versions of CFLAGS, CPPFLAGS,
- # LDFLAGS, and LIBS before we added the
- # "--with-pcre=" directory, as we didn't
- # actually find pcre there.
- #
- CFLAGS="$wireshark_save_CFLAGS"
- CPPFLAGS="$wireshark_save_CPPFLAGS"
- LDFLAGS="$wireshark_save_LDFLAGS"
- LIBS="$wireshark_save_LIBS"
- PCRE_LIBS=""
- fi
- want_pcre=no
- ])
- AC_SUBST(PCRE_LIBS)
+ CFLAGS="$wireshark_save_CFLAGS"
+ CPPFLAGS="$wireshark_save_CPPFLAGS"
+ LIBS="$wireshark_save_LIBS"
+ want_zlib=no
fi
])
[GCC_OPTION="$1"
AC_MSG_CHECKING(whether we can add $GCC_OPTION to LDFLAGS)
if test "x$ac_supports_W_linker_passthrough" = "xyes"; then
- LDFLAGS_saved="$CFLAGS"
+ LDFLAGS_saved="$LDFLAGS"
LDFLAGS="$LDFLAGS $GCC_OPTION"
AC_LINK_IFELSE([
AC_LANG_SOURCE([[
AC_CHECK_PROG([ac_ws_python_config], python-config, "yes", "no")
if test "x$ac_ws_python_config" = "xno"; then
ac_cv_wireshark_python_devel=no
- if test "x$want_python" = "xyes"
- then
- #
- # The user tried to force us to use Python, but we
- # couldn't find the python-config tool; report an error.
- #
- AC_MSG_ERROR("python-config not found")
- fi
+ if test "x$want_python" = "xyes"
+ then
+ #
+ # The user tried to force us to use Python, but we
+ # couldn't find the python-config tool; report an error.
+ #
+ AC_MSG_ERROR("python-config not found")
+ fi
+ #
+ # Set want_python to no, so we report that we aren't using
+ # the Python interpreter.
+ #
+ want_python=no
else
AC_MSG_CHECKING([python devel])
ac_save_ws_cflags=$CFLAGS
ac_cv_wireshark_python_devel=no
CFLAGS=$ac_save_ws_cflags
LIBS=$ac_save_ws_libs
- if test "x$want_python" = "xyes"
- then
- #
- # The user tried to force us to use Python, but we
- # couldn't compile the test program; report an error.
- #
- AC_MSG_ERROR("Python test program failed compilation")
- fi
+ if test "x$want_python" = "xyes"
+ then
+ #
+ # The user tried to force us to use Python, but we
+ # couldn't compile the test program; report an error.
+ #
+ AC_MSG_ERROR("Python test program failed compilation")
+ fi
AC_MSG_RESULT([no])
+ #
+ # Set want_python to no, so we report that we aren't using
+ # the Python interpreter.
+ #
+ want_python=no
])
fi
# ])
git.samba.org / obnox / wireshark / wip.git / blobdiff