diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2003-01-21 20:38:32 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2003-01-21 20:38:32 +0000 |
| commit | 8adf7a08fd843c0160a7efd37ec8e1d2c9f678db (patch) | |
| tree | bade7eca14b37bd9d084444805f82822084ea697 /acinclude.m4 | |
| parent | 06369ff33c6c89c60d4a93e1f30ed8c0bb04f494 (diff) | |
| download | wireshark-8adf7a08fd843c0160a7efd37ec8e1d2c9f678db.tar.gz wireshark-8adf7a08fd843c0160a7efd37ec8e1d2c9f678db.tar.bz2 wireshark-8adf7a08fd843c0160a7efd37ec8e1d2c9f678db.zip | |
Check for pcap in before /usr/local and stop on first hit
svn path=/trunk/; revision=6962
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 47bfce350f..24a03bb48e 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.47 2002/12/28 23:15:52 guy Exp $ +dnl $Id: acinclude.m4,v 1.48 2003/01/21 20:38:30 jmayer 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 @@ -257,6 +257,10 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK, [ if test -z "$pcap_dir" then + # Pcap header checks + # XXX need to set a var AC_CHECK_HEADER(net/bpf.h,,) + # XXX need to set a var AC_CHECK_HEADER(pcap.h,,) + # # The user didn't specify a directory in which libpcap resides; # we assume that the current library search path will work, @@ -270,14 +274,15 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK, # AC_MSG_CHECKING(for extraneous pcap header directories) found_pcap_dir="" - for pcap_dir in /usr/include/pcap /usr/local/include/pcap $prefix/include + for pcap_dir in /usr/include/pcap $prefix/include /usr/local/include/pcap do if test -d $pcap_dir ; then - if test x$pcap_dir != x/usr/include; then + if test x$pcap_dir != x/usr/include -a x$pcap_dir != x/usr/local/include ; then CFLAGS="$CFLAGS -I$pcap_dir" CPPFLAGS="$CPPFLAGS -I$pcap_dir" fi found_pcap_dir=" $found_pcap_dir -I$pcap_dir" + break fi done |