diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-07-27 07:10:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-07-27 07:10:13 +0000 |
| commit | 5bb08b09703b6a2f33f5b8d205052ed8c3d5def1 (patch) | |
| tree | 6d5aa5edb5aaad7e07f1853e98ac346fe7877faf /configure.in | |
| parent | 8a9917a9a7528d4bdac5e9d3e4aa8a1080d06b4c (diff) | |
Fix AC_ETHEREAL_PCAP_CHECK so that, if a directory was specified with
"--with-pcap", it adds the "include" subdirectory of that directory to
the list of directories to search for include files, rather than adding
the directory itself.
Check whether libpcap defines "pcap_version", and define
HAVE_PCAP_VERSION if it does. Use "pcap_version" iff HAVE_PCAP_VERSION
is defined, rather than special-casing MacOS X.
Don't #define a string for the WinPcap version; just leave
HAVE_PCAP_VERSION undefined on Windows, as WinPcap 2.2beta is out, so we
can no longer assume that the Windows version of Ethereal is using
WinPcap 2.1.
svn path=/trunk/; revision=3792
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 2c436add08..e83763e17c 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.136 2001/07/27 06:10:26 guy Exp $ +# $Id: configure.in,v 1.137 2001/07/27 07:10:09 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 @@ -375,6 +375,7 @@ if test "x$want_pcap" = "xno" ; then else AC_MSG_RESULT(yes) AC_ETHEREAL_PCAP_CHECK + AC_ETHEREAL_PCAP_VERSION_CHECK fi dnl zlib check |