--- configure.in.orig	2005-06-30 21:22:15 +0400
+++ configure.in	2005-07-01 13:19:23 +0400
@@ -132,24 +132,19 @@
 
   ( cd pcre-5.0; ./configure && make libtool chartables.c )
 
-  REGEX_TARGET='pcre'
-  REGEX_OBJS='pcre.o study.o'
+  AC_CHECK_LIB(pcre, pcre_compile, , AC_MSG_ERROR(libpcre-devel is required for pcre support))
+  EXTRA_LIBS="$EXTRA_LIBS -lpcre"
   USE_PCRE="1"
 
 else
 
-  echo
-  echo 'Configuring GNU Regular Expression library ...'
-  echo
-
-  ( cd regex-0.12; ./configure )
-
-  REGEX_TARGET='regex'
-  REGEX_OBJS='regex.o'
   USE_PCRE="0"
 
 fi
 
+REGEX_TARGET=
+REGEX_OBJS=
+AC_SUBST(USE_PCRE)
 AC_SUBST(REGEX_TARGET)
 AC_SUBST(REGEX_OBJS)
 
@@ -375,20 +370,20 @@
 dnl modified our USE_* and other defines, define them all now.
 dnl 
 
-AC_DEFINE_UNQUOTED(USE_PCAP_RESTART,    $USE_PCAP_RESTART)
+AC_DEFINE_UNQUOTED(USE_PCAP_RESTART,    $USE_PCAP_RESTART, [whether to restart PCAP])
 
-AC_DEFINE_UNQUOTED(USE_PCRE,            $USE_PCRE)
-AC_DEFINE_UNQUOTED(USE_IPv6,            $USE_IPv6)
+AC_DEFINE_UNQUOTED(USE_PCRE,            $USE_PCRE,         [whether to use PCRE])
+AC_DEFINE_UNQUOTED(USE_IPv6,            $USE_IPv6,         [whether to use IPv6])
 
-AC_DEFINE_UNQUOTED(USE_DROPPRIVS,       $USE_DROPPRIVS)
-AC_DEFINE_UNQUOTED(DROPPRIVS_USER,     "$DROPPRIVS_USER")
+AC_DEFINE_UNQUOTED(USE_DROPPRIVS,       $USE_DROPPRIVS,    [whether to use privileges dropping])
+AC_DEFINE_UNQUOTED(DROPPRIVS_USER,     "$DROPPRIVS_USER",  [pseudo-user for running ngrep])
 
-AC_DEFINE_UNQUOTED(HAVE_DUMB_UDPHDR,    $HAVE_DUMB_UDPHDR)
+AC_DEFINE_UNQUOTED(HAVE_DUMB_UDPHDR,    $HAVE_DUMB_UDPHDR, [whether to update packet header])
 
-AC_DEFINE_UNQUOTED(HAVE_DLT_RAW,        $HAVE_DLT_RAW) 
-AC_DEFINE_UNQUOTED(HAVE_DLT_IEEE802_11, $HAVE_DLT_IEEE802_11) 
-AC_DEFINE_UNQUOTED(HAVE_DLT_LOOP,       $HAVE_DLT_LOOP) 
-AC_DEFINE_UNQUOTED(HAVE_DLT_LINUX_SLL,  $HAVE_DLT_LINUX_SLL) 
+AC_DEFINE_UNQUOTED(HAVE_DLT_RAW,        $HAVE_DLT_RAW,       [DLT_RAW in bpf.h]) 
+AC_DEFINE_UNQUOTED(HAVE_DLT_IEEE802_11, $HAVE_DLT_IEEE802_11,[DLT_IEEE802_11 in bpf.h]) 
+AC_DEFINE_UNQUOTED(HAVE_DLT_LOOP,       $HAVE_DLT_LOOP,      [DLT_LOOP in bpf.h]) 
+AC_DEFINE_UNQUOTED(HAVE_DLT_LINUX_SLL,  $HAVE_DLT_LINUX_SLL, [DLT_LINUX_SLL in bpf.h]) 
 
 
 dnl
@@ -415,7 +410,7 @@
    pcap_restart_func="unused"
 fi
 
-AC_DEFINE_UNQUOTED(PCAP_RESTART_FUNC, $pcap_restart_func)
+AC_DEFINE_UNQUOTED(PCAP_RESTART_FUNC, $pcap_restart_func, [routine used for restarting PCAP])
 
 dnl
 dnl AC_SUBST in the tack-on globals..