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 /wiretap | |
| 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 'wiretap')
| -rw-r--r-- | wiretap/acinclude.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/wiretap/acinclude.m4 b/wiretap/acinclude.m4 index 050ab0d51e..9b3ad08a80 100644 --- a/wiretap/acinclude.m4 +++ b/wiretap/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.8 2001/06/27 07:47:49 guy Exp $ +dnl $Id: acinclude.m4,v 1.9 2001/07/27 07:10:13 guy Exp $ dnl # Configure paths for GLIB @@ -239,7 +239,8 @@ AC_DEFUN(AC_WIRETAP_PCAP_CHECK, else # # The user specified a directory in which libpcap resides, - # so add that directory to the search path. + # so add the "include" subdirectory of that directory to + # the include file search path. # # XXX - if there's also a libpcap in a directory that's # already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't @@ -247,8 +248,8 @@ AC_DEFUN(AC_WIRETAP_PCAP_CHECK, # as the compiler and/or linker will search that other # directory before it searches the specified directory. # - CFLAGS="$CFLAGS -I$pcap_dir" - CPPFLAGS="$CPPFLAGS -I$pcap_dir" + CFLAGS="$CFLAGS -I$pcap_dir/include" + CPPFLAGS="$CPPFLAGS -I$pcap_dir/include" fi # Pcap header check |