libpcap-m4.patch

   1 --- tcpdump-4.1/aclocal.m4~     2010-03-12 03:56:43.000000000 +0200
   2 +++ tcpdump-4.1/aclocal.m4      2010-04-01 14:44:14.199261084 +0300
   3 @@ -284,28 +284,6 @@
   4                     LIBS="$LIBS $pfopen"
   5             fi
   6      fi
   7 -    AC_MSG_CHECKING(for local pcap library)
   8 -    libpcap=FAIL
   9 -    lastdir=FAIL
  10 -    places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
  11 -       egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
  12 -    for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
  13 -           basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//' | \
  14 -               sed -e 's/-PRE-GIT$//' `
  15 -           if test $lastdir = $basedir ; then
  16 -                   dnl skip alphas when an actual release is present
  17 -                   continue;
  18 -           fi
  19 -           lastdir=$dir
  20 -           if test -r $dir/libpcap.a ; then
  21 -                   libpcap=$dir/libpcap.a
  22 -                   d=$dir
  23 -                   dnl continue and select the last one that exists
  24 -           fi
  25 -    done
  26 -    if test $libpcap = FAIL ; then
  27 -           AC_MSG_RESULT(not found)
  28 -
  29             #
  30             # Look for pcap-config.
  31             #
  32 @@ -360,29 +338,6 @@
  33                     AC_MSG_RESULT(found -- -I$d added)
  34                 fi
  35             fi
  36 -    else
  37 -           $1=$libpcap
  38 -           places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
  39 -                       egrep '/libpcap-[[0-9]]*.[[0-9]]*(.[[0-9]]*)?([[ab]][[0-9]]*)?$'`
  40 -           if test -r $d/pcap.h; then
  41 -                   $2="-I$d $$2"
  42 -           elif test -r $places/pcap.h; then
  43 -                   $2="-I$places $$2"
  44 -           else
  45 -                    AC_MSG_ERROR(cannot find pcap.h, see INSTALL)
  46 -           fi
  47 -           AC_MSG_RESULT($libpcap)
  48 -           AC_PATH_PROG(PCAP_CONFIG, pcap-config,, $d)
  49 -           if test -n "$PCAP_CONFIG"; then
  50 -               #
  51 -               # The libpcap directory has a pcap-config script.
  52 -               # Use it to get any additioal libraries needed
  53 -               # to link with the libpcap archive library in
  54 -               # that directory
  55 -               #
  56 -               libpcap="$libpcap `\"$PCAP_CONFIG\" --additional-libs --static`"
  57 -           fi
  58 -    fi
  59      LIBS="$libpcap $LIBS"
  60      if ! test -n "$PCAP_CONFIG" ; then
  61         #