1 files changed, 13 insertions, 10 deletions

diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch
index 06ca275b18..e077a29ecd 100644
--- a/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/0001-The-leading-comma-looked-weird-remove-it.patch
@@ -8,14 +8,17 @@ Subject: [PATCH] The leading comma looked weird; remove it.
 That might be how the --disable-canusb bug got in.  Hopefully this will
 make the code look a little clearer and possibly avoid future bugs of
 that sort.
+
+sgw - Cleaned up the patch based on another patch
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
 ---
  configure.in |    9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index d8554ca..ba5b64e 100644
---- a/configure.in
-+++ b/configure.in
+Index: libpcap-1.3.0/configure.in
+===================================================================
+--- libpcap-1.3.0.orig/configure.in
++++ libpcap-1.3.0/configure.in
 @@ -1371,7 +1371,8 @@ AC_SUBST(NETFILTER_SRC)
  
  AC_ARG_ENABLE([bluetooth],
@@ -26,17 +29,20 @@ index d8554ca..ba5b64e 100644
  
  if test "x$enable_bluetooth" != "xno" ; then
         dnl check for Bluetooth sniffing support
-@@ -1396,7 +1397,8 @@ fi
+@@ -1395,8 +1396,10 @@ if test "x$enable_bluetooth" != "xno" ;
+ fi
  
  AC_ARG_ENABLE([canusb],
- [AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])],
+-[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])]
 -,enable_canusb=yes)
++[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])],
 +    [],
 +    [enable_canusb=yes])
++
  
  if test "x$enable_canusb" != "xno" ; then
         dnl check for canusb support
-@@ -1422,7 +1424,8 @@ fi
+@@ -1422,7 +1425,8 @@ fi
  
  AC_ARG_ENABLE([can],
  [AC_HELP_STRING([--enable-can],[enable CAN support @<:@default=yes, if support available@:>@])],
@@ -46,6 +52,3 @@ index d8554ca..ba5b64e 100644
  
  if test "x$enable_can" != "xno" ; then
         dnl check for CAN sniffing support
--- 
-1.7.9.5
-