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 /acconfig.h | |
| 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 'acconfig.h')
| -rw-r--r-- | acconfig.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/acconfig.h b/acconfig.h index ebb82ac7ef..b7eed15861 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,12 +1,11 @@ /* acconfig.h * #ifdefs to be controlled by "configure" * - * $Id: acconfig.h,v 1.19 2001/06/02 06:21:13 guy Exp $ + * $Id: acconfig.h,v 1.20 2001/07/27 07:10:09 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.org> * Copyright 1998 Gerald Combs - * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -41,4 +40,6 @@ #undef HAVE_LIBPCAP +#undef HAVE_PCAP_VERSION + #undef PLUGIN_DIR |