aboutsummaryrefslogtreecommitdiffstats
path: root/acinclude.m4
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-02-11 02:31:22 +0000
committerGuy Harris <guy@alum.mit.edu>2003-02-11 02:31:22 +0000
commiteb3357b6486f47dbfec9576b3e2ba720fd32c53a (patch)
treece093e74032878cbad30d716eab1646456860755 /acinclude.m4
parentaa710fd9cdb07d3cdb4980d6e4fcb1718d35614f (diff)
Future releases of libpcap probably won't install <net/bpf.h>, so we
shouldn't require it to exist. Instead, as we're already checking whether we can find <pcap.h> (which is the only thing we actually include - we rely on it to include whatever BPF headers are necessary), we print the big "are you sure you installed the development package?" message if we don't find "pcap.h". svn path=/trunk/; revision=7120
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m410
1 files changed, 4 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index a3d6c3debb..70327a30a1 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.50 2003/01/27 20:09:06 guy Exp $
+dnl $Id: acinclude.m4,v 1.51 2003/02/11 02:31:22 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
@@ -258,7 +258,6 @@ 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,,)
#
@@ -311,13 +310,12 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK,
AC_ETHEREAL_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
fi
- # Pcap header checks
- AC_CHECK_HEADER(net/bpf.h,,
- AC_MSG_ERROR([[Header file net/bpf.h not found; if you installed libpcap
+ # Pcap header check
+ AC_CHECK_HEADER(pcap.h,,
+ AC_MSG_ERROR([[Header file pcap.h not found; if you installed libpcap
from source, did you also do \"make install-incl\", and if you installed a
binary package of libpcap, is there also a developer's package of libpcap,
and did you also install that package?]]))
- AC_CHECK_HEADER(pcap.h,, AC_MSG_ERROR(Header file pcap.h not found.))
#
# Check to see if we find "pcap_open_live" in "-lpcap".