permit --disable-usb to turn off support for sniffing USB interfaces

diff --git a/configure b/configure
index d4b054d5d58366cdbd621dfe05f63b4c23ef7515..13d1e6a71e1651da13dfbfd71506e7b7437db0d1 100755 (executable)
--- a/configure
+++ b/configure
@@ -745,6 +745,7 @@ with_flex
 with_bison
 enable_universal
 enable_shared
 with_bison
 enable_universal
 enable_shared

+enable_usb

 enable_bluetooth
 enable_canusb
 enable_can
 enable_bluetooth
 enable_canusb
 enable_can


@@ -1380,6 +1381,8 @@ Optional Features:
   --disable-universal     don't build universal on OS X
   --enable-shared         build shared libraries [default=yes, if support
                           available]
   --disable-universal     don't build universal on OS X
   --enable-shared         build shared libraries [default=yes, if support
                           available]

+  --enable-usb            enable nusb support [default=yes, if support
+                          available]

   --enable-bluetooth      enable Bluetooth support [default=yes, if support
                           available]
   --enable-canusb         enable canusb support [default=yes, if support
   --enable-bluetooth      enable Bluetooth support [default=yes, if support
                           available]
   --enable-canusb         enable canusb support [default=yes, if support


@@ -7807,10 +7810,19 @@ ln -s ${srcdir}/bpf/net net
 
 
 
 
 
 

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB sniffing support" >&5
+# Check whether --enable-usb was given.
+if test "${enable_usb+set}" = set; then :
+  enableval=$enable_usb;
+else
+  enable_usb=yes
+fi
+
+
+if test "x$enable_usb" != "xno" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB sniffing support" >&5

 $as_echo_n "checking for USB sniffing support... " >&6; }
 $as_echo_n "checking for USB sniffing support... " >&6; }

-case "$host_os" in
-linux*)
+   case "$host_os" in
+   linux*)

 
 $as_echo "#define PCAP_SUPPORT_USB 1" >>confdefs.h
 
 
 $as_echo "#define PCAP_SUPPORT_USB 1" >>confdefs.h
 


@@ -7923,11 +7935,12 @@ $as_echo "#define HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE 1" >>confdefs.h
            fi
        fi
        ;;
            fi
        fi
        ;;

-*)
+    *)

        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
        ;;
 esac
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
        ;;
 esac

+fi

 
 
 
 
 
 

diff --git a/configure.in b/configure.in
index 670ba26badd0ea223b8d10b1f2069b54308f9f9c..af3c36ab24e4aeb3c8066bba0558036a4f0723f8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1348,10 +1348,16 @@ AC_SUBST(DYEXT)
 AC_SUBST(MAN_FILE_FORMATS)
 AC_SUBST(MAN_MISC_INFO)
 
 AC_SUBST(MAN_FILE_FORMATS)
 AC_SUBST(MAN_MISC_INFO)
 

-dnl check for USB sniffing support
-AC_MSG_CHECKING(for USB sniffing support)
-case "$host_os" in
-linux*)
+AC_ARG_ENABLE([usb],
+[AC_HELP_STRING([--enable-usb],[enable nusb support @<:@default=yes, if support available@:>@])],
+    [],
+    [enable_usb=yes])
+
+if test "x$enable_usb" != "xno" ; then
+   dnl check for USB sniffing support
+   AC_MSG_CHECKING(for USB sniffing support)
+   case "$host_os" in
+   linux*)

        AC_DEFINE(PCAP_SUPPORT_USB, 1, [target host supports USB sniffing])
        USB_SRC=pcap-usb-linux.c
        AC_MSG_RESULT(yes)
        AC_DEFINE(PCAP_SUPPORT_USB, 1, [target host supports USB sniffing])
        USB_SRC=pcap-usb-linux.c
        AC_MSG_RESULT(yes)


@@ -1402,10 +1408,11 @@ AC_INCLUDES_DEFAULT
            fi
        fi
        ;;
            fi
        fi
        ;;

-*)
+    *)

        AC_MSG_RESULT(no)
        ;;
 esac
        AC_MSG_RESULT(no)
        ;;
 esac

+fi

 AC_SUBST(PCAP_SUPPORT_USB)
 AC_SUBST(USB_SRC)
 
 AC_SUBST(PCAP_SUPPORT_USB)
 AC_SUBST(USB_SRC)