- typo, unnecessary backslash

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

diff --git a/libpcap-m4.patch b/libpcap-m4.patch
index e9159079d797d4709ef83412a32199ed00aeb7ce..e04275d6e877038c77ef7b080caeff830ebce960 100644 (file)
--- a/libpcap-m4.patch
+++ b/libpcap-m4.patch
@@ -1,11 +1,9 @@
---- tcpdump-4.1/aclocal.m4~    2010-03-12 03:56:43.000000000 +0200
-+++ tcpdump-4.1/aclocal.m4     2010-04-01 14:44:14.199261084 +0300
-@@ -284,28 +284,6 @@
-                   LIBS="$LIBS $pfopen"
-           fi
+--- 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
+     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)?$'`
@@ -23,39 +21,6 @@
 -                  dnl continue and select the last one that exists
 -          fi
 -    done
--    if test $libpcap = FAIL ; then
--          AC_MSG_RESULT(not found)
--
-           #
-           # Look for pcap-config.
-           #
-@@ -360,29 +338,6 @@
-                   AC_MSG_RESULT(found -- -I$d added)
-               fi
-           fi
--    else
--          $1=$libpcap
--          places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
--                      egrep '/libpcap-[[0-9]]*.[[0-9]]*(.[[0-9]]*)?([[ab]][[0-9]]*)?$'`
--          if test -r $d/pcap.h; then
--                  $2="-I$d $$2"
--          elif test -r $places/pcap.h; then
--                  $2="-I$places $$2"
--          else
--                    AC_MSG_ERROR(cannot find pcap.h, see INSTALL)
--          fi
--          AC_MSG_RESULT($libpcap)
--          AC_PATH_PROG(PCAP_CONFIG, pcap-config,, $d)
--          if test -n "$PCAP_CONFIG"; then
--              #
--              # The libpcap directory has a pcap-config script.
--              # Use it to get any additioal libraries needed
--              # to link with the libpcap archive library in
--              # that directory
--              #
--              libpcap="$libpcap `\"$PCAP_CONFIG\" --additional-libs --static`"
--          fi
--    fi
-     LIBS="$libpcap $LIBS"
-     if ! test -n "$PCAP_CONFIG" ; then
-       #
+     if test $libpcap = FAIL ; then
+           AC_MSG_RESULT(not found)
+