From 5bb08b09703b6a2f33f5b8d205052ed8c3d5def1 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 27 Jul 2001 07:10:13 +0000 Subject: 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 --- acconfig.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'acconfig.h') 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 + * By Gerald Combs * 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 -- cgit v1.2.3