diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-01-27 20:09:06 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-01-27 20:09:06 +0000 |
| commit | 27e4186a2da9ae8979d982f923c9856d88dab89c (patch) | |
| tree | ff668c95ca4d8c6140605687531449829ffc1846 /acinclude.m4 | |
| parent | cb123a9ed051498830447f9f3c3cbc7456b26263 (diff) | |
| download | wireshark-27e4186a2da9ae8979d982f923c9856d88dab89c.tar.gz wireshark-27e4186a2da9ae8979d982f923c9856d88dab89c.tar.bz2 wireshark-27e4186a2da9ae8979d982f923c9856d88dab89c.zip | |
Check "$prefix/include/pcap" before checking "$prefix/include" for
"pcap.h", in case $prefix is set to "/usr/include" or
"/usr/local/include" on a system with the Red Hat "feature" of burying
pcap.h in a "pcap" subdirectory.
svn path=/trunk/; revision=7007
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 9ec89ec92a..a3d6c3debb 100644 --- a/acinclude.m4 +++ b/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.49 2003/01/21 21:47:07 jmayer Exp $ +dnl $Id: acinclude.m4,v 1.50 2003/01/27 20:09:06 guy Exp $ dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -267,14 +267,16 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK, # but we may have to look for the header in a "pcap" # subdirectory of "/usr/include" or "/usr/local/include", # as some systems apparently put "pcap.h" in a "pcap" - # subdirectory, and we also check "$prefix/include". + # subdirectory, and we also check "$prefix/include" - and + # "$prefix/include/pcap", in case $prefix is set to + # "/usr/include" or "/usr/local/include". # # XXX - should we just add "$prefix/include" to the include # search path and "$prefix/lib" to the library search path? # AC_MSG_CHECKING(for extraneous pcap header directories) found_pcap_dir="" - for pcap_dir in /usr/include/pcap $prefix/include /usr/local/include/pcap + for pcap_dir in /usr/include/pcap $prefix/include/pcap $prefix/include /usr/local/include/pcap do if test -d $pcap_dir ; then if test x$pcap_dir != x/usr/include -a x$pcap_dir != x/usr/local/include ; then |