OpenWrt – Rev 1

Subversion Repositories:
Rev:
--- a/configure
+++ b/configure
@@ -5471,37 +5471,6 @@ $as_echo "Using $pfopen" >&6; }
                    LIBS="$LIBS $pfopen"
            fi
     fi
-       libpcap=FAIL
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local pcap library" >&5
-$as_echo_n "checking for local pcap library... " >&6; }
-
-# Check whether --with-system-libpcap was given.
-if test "${with_system_libpcap+set}" = set; then :
-  withval=$with_system_libpcap;
-fi
-
-       if test "x$with_system_libpcap" != xyes ; then
-               lastdir=FAIL
-       places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
-               egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
-       places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
-               egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
-       for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2 ; do
-               basedir=`echo $dir | sed -e 's/[ab][0-9]*$//' | \
-                       sed -e 's/-PRE-GIT$//' `
-               if test $lastdir = $basedir ; then
-                                               continue;
-               fi
-               lastdir=$dir
-               if test -r $dir/libpcap.a ; then
-                       libpcap=$dir/libpcap.a
-                       d=$dir
-                                       fi
-               done
-       fi
-    if test $libpcap = FAIL ; then
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
 
            #
            # Look for pcap-config.
@@ -5657,51 +5626,6 @@ if test "x$ac_cv_lib_pcap_main" = xyes;
   libpcap="-lpcap"
 fi
 
-               if test $libpcap = FAIL ; then
-                   as_fn_error $? "see the INSTALL doc for more info" "$LINENO" 5
-               fi
-                                                                                                                                                                                                                                                                                                                               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extraneous pcap header directories" >&5
-$as_echo_n "checking for extraneous pcap header directories... " >&6; }
-               if test \( ! -r /usr/local/include/pcap.h \) -a \
-                       \( ! -r /usr/include/pcap.h \); then
-                   if test -r /usr/local/include/pcap/pcap.h; then
-                       d="/usr/local/include/pcap"
-                   elif test -r /usr/include/pcap/pcap.h; then
-                       d="/usr/include/pcap"
-                   fi
-               fi
-               if test -z "$d" ; then
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-               else
-                   V_INCLS="-I$d $V_INCLS"
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found -- -I$d added" >&5
-$as_echo "found -- -I$d added" >&6; }
-               fi
-           fi
-    else
-           V_PCAPDEP=$libpcap
-           places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
-                       egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
-           places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
-                       egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
-            pcapH=FAIL
-           if test -r $d/pcap.h; then
-                    pcapH=$d
-           else
-                for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2 ; do
-                   if test -r $dir/pcap.h ; then
-                       pcapH=$dir
-                   fi
-                done
-            fi
-
-            if test $pcapH = FAIL ; then
-                    as_fn_error $? "cannot find pcap.h: see INSTALL" "$LINENO" 5
-           fi
-            V_INCLS="-I$pcapH $V_INCLS"
-           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libpcap" >&5
-$as_echo "$libpcap" >&6; }
            # Extract the first word of "pcap-config", so it can be a program name with args.
 set dummy pcap-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5