add packages_10.03.2 in preparation for the 10.03.2 interim release
[10.03/packages.git] / net / tcpdump / patches / 002-remove_static_libpcap_check.patch
1 --- a/configure
2 +++ b/configure
3 @@ -9440,28 +9440,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 @@ -9580,40 +9558,6 @@ fi
33  echo "$as_me: error: see the INSTALL doc for more info" >&2;}
34     { (exit 1); exit 1; }; }
35                 fi
36 -                                                                                                                                                                                                                                                                                                                               { echo "$as_me:$LINENO: checking for extraneous pcap header directories" >&5
37 -echo $ECHO_N "checking for extraneous pcap header directories... $ECHO_C" >&6; }
38 -               if test \( ! -r /usr/local/include/pcap.h \) -a \
39 -                       \( ! -r /usr/include/pcap.h \); then
40 -                   if test -r /usr/local/include/pcap/pcap.h; then
41 -                       d="/usr/local/include/pcap"
42 -                   elif test -r /usr/include/pcap/pcap.h; then
43 -                       d="/usr/include/pcap"
44 -                   fi
45 -               fi
46 -               if test -z "$d" ; then
47 -                   { echo "$as_me:$LINENO: result: not found" >&5
48 -echo "${ECHO_T}not found" >&6; }
49 -               else
50 -                   V_INCLS="-I$d $V_INCLS"
51 -                   { echo "$as_me:$LINENO: result: found -- -I$d added" >&5
52 -echo "${ECHO_T}found -- -I$d added" >&6; }
53 -               fi
54 -           fi
55 -    else
56 -           V_PCAPDEP=$libpcap
57 -           places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
58 -                       egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'`
59 -           if test -r $d/pcap.h; then
60 -                   V_INCLS="-I$d $V_INCLS"
61 -           elif test -r $places/pcap.h; then
62 -                   V_INCLS="-I$places $V_INCLS"
63 -           else
64 -                    { { echo "$as_me:$LINENO: error: cannot find pcap.h" >&5
65 -echo "$as_me: error: cannot find pcap.h" >&2;}
66 -   { (exit see INSTALL); exit see INSTALL; }; }
67 -           fi
68 -           { echo "$as_me:$LINENO: result: $libpcap" >&5
69 -echo "${ECHO_T}$libpcap" >&6; }
70             # Extract the first word of "pcap-config", so it can be a program name with args.
71  set dummy pcap-config; ac_word=$2
72  { echo "$as_me:$LINENO: checking for $ac_word" >&5