tcpdump: update to current upstream version 4.5.1
[openwrt/openwrt.git] / package / network / utils / tcpdump / patches / 002-remove_static_libpcap_check.patch
1 --- a/configure
2 +++ b/configure
3 @@ -5813,28 +5813,6 @@ $as_echo "Using $pfopen" >&6; }
4 LIBS="$LIBS $pfopen"
5 fi
6 fi
7 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for local pcap library" >&5
8 -$as_echo_n "checking for local pcap library... " >&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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
27 -$as_echo "not found" >&6; }
28 -
29 #
30 # Look for pcap-config.
31 #
32 @@ -5989,41 +5967,6 @@ if test "x$ac_cv_lib_pcap_main" = xyes;
33 libpcap="-lpcap"
34 fi
35
36 - if test $libpcap = FAIL ; then
37 - as_fn_error $? "see the INSTALL doc for more info" "$LINENO" 5
38 - fi
39 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extraneous pcap header directories" >&5
40 -$as_echo_n "checking for extraneous pcap header directories... " >&6; }
41 - if test \( ! -r /usr/local/include/pcap.h \) -a \
42 - \( ! -r /usr/include/pcap.h \); then
43 - if test -r /usr/local/include/pcap/pcap.h; then
44 - d="/usr/local/include/pcap"
45 - elif test -r /usr/include/pcap/pcap.h; then
46 - d="/usr/include/pcap"
47 - fi
48 - fi
49 - if test -z "$d" ; then
50 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
51 -$as_echo "not found" >&6; }
52 - else
53 - V_INCLS="-I$d $V_INCLS"
54 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found -- -I$d added" >&5
55 -$as_echo "found -- -I$d added" >&6; }
56 - fi
57 - fi
58 - else
59 - V_PCAPDEP=$libpcap
60 - places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
61 - egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
62 - if test -r $d/pcap.h; then
63 - V_INCLS="-I$d $V_INCLS"
64 - elif test -r $places/pcap.h; then
65 - V_INCLS="-I$places $V_INCLS"
66 - else
67 - as_fn_error see INSTALL "cannot find pcap.h" "$LINENO" 5
68 - fi
69 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libpcap" >&5
70 -$as_echo "$libpcap" >&6; }
71 # Extract the first word of "pcap-config", so it can be a program name with args.
72 set dummy pcap-config; ac_word=$2
73 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5