ongrep

commit 37aa7a2e982233c07baca9bb65c0ba922e02d780
parent e73ccf14ad095a542d1a16659260054140b77ce6
Author: Jordan Ritter <jpr5@darkridge.com>
Date:   Fri,  2 Jan 2004 23:11:33 +0000

fixed the formatting for options (--help) and changed the tcpdump check
to redirect stderr to null when tcpdump isn't found

Diffstat:
M
configure
 | 
14
+++++++-------
M
configure.in
 | 
12
++++++------

2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
@@ -808,16 +808,16 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-pcap-restart             disable libpcap restart in parser
+  --disable-pcap-restart       disable libpcap restart in parser
   --enable-pcre                use PCRE instead of GNU regex
-  --disable-dropprivs       disable privilege dropping logic
-  --enable-dropprivs-onlyroot   drop privileges only from root
+  --disable-dropprivs          disable privilege dropping logic
+  --enable-dropprivs-onlyroot  drop privileges only from root
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-dropprivs-user=user        use different user for dropprivs
-  --with-pcap-includes       specify the pcap include directory
+  --with-dropprivs-user=user  use different user for dropprivs
+  --with-pcap-includes        specify the pcap include directory
 
 Some influential environment variables:
   CC          C compiler command
@@ -2627,7 +2627,7 @@ fi
 
 
 
-if test -n "`which tcpdump`"; then
+if test -n "`which tcpdump 2> /dev/null`"; then
    if test "x$prefix" = xNONE; then
   echo $ECHO_N "checking for prefix by $ECHO_C" >&6
   # Extract the first word of "tcpdump", so it can be a program name with args.
@@ -3028,7 +3028,7 @@ else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-echo "yes"; dump_udphdr="1"
+echo "yes"; dumb_udphdr="1"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
diff --git a/configure.in b/configure.in
@@ -18,7 +18,7 @@ AC_PROG_CC
 AC_HEADER_STDC
 
 AC_PREFIX_DEFAULT(/usr/local) 
-if test -n "`which tcpdump`"; then
+if test -n "`which tcpdump 2> /dev/null`"; then
    AC_PREFIX_PROGRAM(tcpdump)
 fi
 
@@ -45,7 +45,7 @@ dnl was wrong because this is still needed).
 dnl
 
 AC_ARG_ENABLE(pcap-restart,
-[  --disable-pcap-restart             disable libpcap restart in parser],
+[  --disable-pcap-restart       disable libpcap restart in parser],
 [ 
   use_pcap_restart="$enableval"
 ],
@@ -62,7 +62,7 @@ dnl
 dnl Allow user to specify alternate ``nobody'' user.
 dnl
 AC_ARG_WITH(dropprivs-user,
-[  --with-dropprivs-user[=user]        use different user for dropprivs],
+[  --with-dropprivs-user[=user]  use different user for dropprivs],
 [
   DROPPRIVS_USER="$withval"
 ],
@@ -89,7 +89,7 @@ dnl Enable or disable the drop privileges logic.
 dnl
 
 AC_ARG_ENABLE(dropprivs,
-[  --disable-dropprivs       disable privilege dropping logic],
+[  --disable-dropprivs          disable privilege dropping logic],
 [
   use_dropprivs="$enableval"
 ],
@@ -112,7 +112,7 @@ dnl privileges if they're not root, hence this flag.
 dnl
 
 AC_ARG_ENABLE(dropprivs-onlyroot,
-[  --enable-dropprivs-onlyroot   drop privileges only from root],
+[  --enable-dropprivs-onlyroot  drop privileges only from root],
 [
   use_dropprivs_onlyroot="$enableval"
 ],
@@ -329,7 +329,7 @@ possible_dirs="`eval echo -n ${includedir}` \
                /usr/share/include /usr/share/include/pcap"
 
 AC_ARG_WITH(pcap-includes,
-[  --with-pcap-includes       specify the pcap include directory],
+[  --with-pcap-includes        specify the pcap include directory],
 [PCAP_DIR=$withval],
 [PCAP_DIR=$possible_dirs])