commit d0fd9545c3abfa8ff0a8086b58f4025e651dbdd7
parent 2927b5dd48b7ee82c8a03bf4e9018faae9795914
Author: Jordan Ritter <jpr5@darkridge.com>
Date: Wed, 18 Oct 2006 04:02:46 +0000
updated from new configure.in
Diffstat:
| M | configure | | | 49 | ++++++++++++++++++++++++++++++++++++++++++++++--- |
1 file changed, 46 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
@@ -683,13 +683,13 @@ echo X"$0" |
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$ac_unique_file; then
+if test ! -r "$srcdir/$ac_unique_file"; then
if test "$ac_srcdir_defaulted" = yes; then
{ echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
{ (exit 1); exit 1; }; }
@@ -698,7 +698,7 @@ if test ! -r $srcdir/$ac_unique_file; then
{ (exit 1); exit 1; }; }
fi
fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
{ echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
{ (exit 1); exit 1; }; }
srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
@@ -3314,6 +3314,7 @@ fi
rm -f conftest*
+
present=""
echo "$as_me:$LINENO: checking for DLT_LOOP in bpf.h" >&5
echo $ECHO_N "checking for DLT_LOOP in bpf.h... $ECHO_C" >&6
@@ -3367,6 +3368,32 @@ rm -f conftest*
present=""
+echo "$as_me:$LINENO: checking for DLT_IEEE802_11_RADIO in bpf.h" >&5
+echo $ECHO_N "checking for DLT_IEEE802_11_RADIO in bpf.h... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <$BPF>
+#ifdef DLT_IEEE802_11_RADIO
+yes
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "yes" >/dev/null 2>&1; then
+ HAVE_DLT_IEEE802_11_RADIO="1" && echo yes
+else
+ HAVE_DLT_IEEE802_11_RADIO="0" && echo no
+fi
+rm -f conftest*
+
+
+
+present=""
echo "$as_me:$LINENO: checking for DLT_RAW in bpf.h" >&5
echo $ECHO_N "checking for DLT_RAW in bpf.h... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
@@ -3393,46 +3420,61 @@ rm -f conftest*
+
cat >>confdefs.h <<_ACEOF
#define USE_PCAP_RESTART $USE_PCAP_RESTART
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define USE_PCRE $USE_PCRE
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define USE_IPv6 $USE_IPv6
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define USE_DROPPRIVS $USE_DROPPRIVS
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define DROPPRIVS_USER "$DROPPRIVS_USER"
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define HAVE_DUMB_UDPHDR $HAVE_DUMB_UDPHDR
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define HAVE_DLT_RAW $HAVE_DLT_RAW
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define HAVE_DLT_IEEE802_11 $HAVE_DLT_IEEE802_11
_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DLT_IEEE802_11_RADIO $HAVE_DLT_IEEE802_11_RADIO
+_ACEOF
+
+
cat >>confdefs.h <<_ACEOF
#define HAVE_DLT_LOOP $HAVE_DLT_LOOP
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define HAVE_DLT_LINUX_SLL $HAVE_DLT_LINUX_SLL
_ACEOF
@@ -3736,6 +3778,7 @@ if test -z "$pcap_restart_func"; then
pcap_restart_func="unused"
fi
+
cat >>confdefs.h <<_ACEOF
#define PCAP_RESTART_FUNC $pcap_restart_func
_ACEOF