aboutsummaryrefslogtreecommitdiffstats
path: root/acinclude.m4
diff options
context:
space:
mode:
authorOlivier Biot <obiot.ethereal@gmail.com>2004-04-22 20:02:58 +0000
committerOlivier Biot <obiot.ethereal@gmail.com>2004-04-22 20:02:58 +0000
commitc05bcd7c28e60505492b151688494f91609096d6 (patch)
tree3cad08a11f27571f7b55d7161cbbce6866139666 /acinclude.m4
parent51f987e04f063251198154e2691a99b6281d7c71 (diff)
More correct implementation of the --disable-usr-local option.
svn path=/trunk/; revision=10661
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m48
1 files changed, 6 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 54b12f8fc6..4f263ac2d7 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.71 2004/03/27 12:07:56 jmayer Exp $
+dnl $Id: acinclude.m4,v 1.72 2004/04/22 20:02:58 obiot 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
@@ -275,7 +275,11 @@ AC_DEFUN([AC_ETHEREAL_PCAP_CHECK],
#
AC_MSG_CHECKING(for extraneous pcap header directories)
found_pcap_dir=""
- for pcap_dir in /usr/include/pcap $prefix/include/pcap $prefix/include /usr/local/include/pcap
+ pcap_dir_list="/usr/include/pcap $prefix/include/pcap $prefix/include"
+ if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ pcap_dir_list="$pcap_dir_list /usr/local/include/pcap"
+ fi
+ for pcap_dir in $pcap_dir_list
do
if test -d $pcap_dir ; then
if test x$pcap_dir != x/usr/include -a x$pcap_dir != x/usr/local/include ; then