Fix AC_ETHEREAL_PCAP_CHECK so that, if a directory was specified with

[obnox/wireshark/wip.git] / wiretap / acinclude.m4

diff --git a/wiretap/acinclude.m4 b/wiretap/acinclude.m4
index 050ab0d51e0e52500db0c401ff4c95940bb2b92b..9b3ad08a8031fcf819da7593295d65ab827d6f33 100644 (file)
--- 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