| 1 | --- a/configure |
| 2 | +++ b/configure |
| 3 | @@ -7130,28 +7130,6 @@ echo "${ECHO_T}Using $pfopen" >&6; } |
| 4 | LIBS="$LIBS $pfopen" |
| 5 | fi |
| 6 | fi |
| 7 | - { echo "$as_me:$LINENO: checking for local pcap library" >&5 |
| 8 | -echo $ECHO_N "checking for local pcap library... $ECHO_C" >&6; } |
| 9 | - libpcap=FAIL |
| 10 | - lastdir=FAIL |
| 11 | - places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \ |
| 12 | - egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'` |
| 13 | - for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do |
| 14 | - basedir=`echo $dir | sed -e 's/[ab][0-9]*$//' | \ |
| 15 | - sed -e 's/-PRE-GIT$//' ` |
| 16 | - if test $lastdir = $basedir ; then |
| 17 | - continue; |
| 18 | - fi |
| 19 | - lastdir=$dir |
| 20 | - if test -r $dir/libpcap.a ; then |
| 21 | - libpcap=$dir/libpcap.a |
| 22 | - d=$dir |
| 23 | - fi |
| 24 | - done |
| 25 | - if test $libpcap = FAIL ; then |
| 26 | - { echo "$as_me:$LINENO: result: not found" >&5 |
| 27 | -echo "${ECHO_T}not found" >&6; } |
| 28 | - |
| 29 | # |
| 30 | # Look for pcap-config. |
| 31 | # |
| 32 | @@ -7335,45 +7313,6 @@ if test $ac_cv_lib_pcap_main = yes; then |
| 33 | libpcap="-lpcap" |
| 34 | fi |
| 35 | |
| 36 | - if test $libpcap = FAIL ; then |
| 37 | - { { echo "$as_me:$LINENO: error: see the INSTALL doc for more info" >&5 |
| 38 | -echo "$as_me: error: see the INSTALL doc for more info" >&2;} |
| 39 | - { (exit 1); exit 1; }; } |
| 40 | - fi |
| 41 | - { echo "$as_me:$LINENO: checking for extraneous pcap header directories" >&5 |
| 42 | -echo $ECHO_N "checking for extraneous pcap header directories... $ECHO_C" >&6; } |
| 43 | - if test \( ! -r /usr/local/include/pcap.h \) -a \ |
| 44 | - \( ! -r /usr/include/pcap.h \); then |
| 45 | - if test -r /usr/local/include/pcap/pcap.h; then |
| 46 | - d="/usr/local/include/pcap" |
| 47 | - elif test -r /usr/include/pcap/pcap.h; then |
| 48 | - d="/usr/include/pcap" |
| 49 | - fi |
| 50 | - fi |
| 51 | - if test -z "$d" ; then |
| 52 | - { echo "$as_me:$LINENO: result: not found" >&5 |
| 53 | -echo "${ECHO_T}not found" >&6; } |
| 54 | - else |
| 55 | - V_INCLS="-I$d $V_INCLS" |
| 56 | - { echo "$as_me:$LINENO: result: found -- -I$d added" >&5 |
| 57 | -echo "${ECHO_T}found -- -I$d added" >&6; } |
| 58 | - fi |
| 59 | - fi |
| 60 | - else |
| 61 | - V_PCAPDEP=$libpcap |
| 62 | - places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \ |
| 63 | - egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'` |
| 64 | - if test -r $d/pcap.h; then |
| 65 | - V_INCLS="-I$d $V_INCLS" |
| 66 | - elif test -r $places/pcap.h; then |
| 67 | - V_INCLS="-I$places $V_INCLS" |
| 68 | - else |
| 69 | - { { echo "$as_me:$LINENO: error: cannot find pcap.h" >&5 |
| 70 | -echo "$as_me: error: cannot find pcap.h" >&2;} |
| 71 | - { (exit see INSTALL); exit see INSTALL; }; } |
| 72 | - fi |
| 73 | - { echo "$as_me:$LINENO: result: $libpcap" >&5 |
| 74 | -echo "${ECHO_T}$libpcap" >&6; } |
| 75 | # Extract the first word of "pcap-config", so it can be a program name with args. |
| 76 | set dummy pcap-config; ac_word=$2 |
| 77 | { echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 78 | |
