[packages/tcpdump.git] / libpcap-m4.patch

--- tcpdump-4.2.0/aclocal.m4~	2011-07-24 22:58:55.000000000 +0200
+++ tcpdump-4.2.0/aclocal.m4	2011-11-28 18:41:29.227895655 +0100
@@ -286,23 +286,6 @@
     fi
     AC_MSG_CHECKING(for local pcap library)
     libpcap=FAIL
-    lastdir=FAIL
-    places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
-	egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
-    for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
-	    basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//' | \
-	        sed -e 's/-PRE-GIT$//' `
-	    if test $lastdir = $basedir ; then
-		    dnl skip alphas when an actual release is present
-		    continue;
-	    fi
-	    lastdir=$dir
-	    if test -r $dir/libpcap.a ; then
-		    libpcap=$dir/libpcap.a
-		    d=$dir
-		    dnl continue and select the last one that exists
-	    fi
-    done
     if test $libpcap = FAIL ; then
 	    AC_MSG_RESULT(not found)
Commit	Line	Data
00077d7a AM	1	--- tcpdump-4.2.0/aclocal.m4~ 2011-07-24 22:58:55.000000000 +0200
	2	+++ tcpdump-4.2.0/aclocal.m4 2011-11-28 18:41:29.227895655 +0100
	3	@@ -286,23 +286,6 @@
d0f36d18	4	fi
00077d7a AM	5	AC_MSG_CHECKING(for local pcap library)
00077d7a AM	6	libpcap=FAIL
d0f36d18 ER	7	- lastdir=FAIL
	8	- places=`ls $srcdir/.. \| sed -e 's,/$,,' -e "s,^,$srcdir/../," \| \
	9	- egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]])?([[ab]][[0-9]]\|-PRE-GIT)?$'`
	10	- for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do
	11	- basedir=`echo $dir \| sed -e 's/[[ab]][[0-9]]*$//' \| \
	12	- sed -e 's/-PRE-GIT$//' `
	13	- if test $lastdir = $basedir ; then
	14	- dnl skip alphas when an actual release is present
	15	- continue;
	16	- fi
	17	- lastdir=$dir
	18	- if test -r $dir/libpcap.a ; then
	19	- libpcap=$dir/libpcap.a
	20	- d=$dir
	21	- dnl continue and select the last one that exists
	22	- fi
	23	- done
00077d7a AM	24	if test $libpcap = FAIL ; then
	25	AC_MSG_RESULT(not found)
	26