build: Remove all checks for USB library support

diff --git a/Makefile.am b/Makefile.am
index 8de174f..5cfdd76 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -293,7 +293,7 @@ pkgconfig_DATA = lib/bluez.pc
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \
-                               --disable-systemd --disable-udev --disable-usb
+                                       --disable-systemd --disable-udev
 
 DISTCLEANFILES = $(pkgconfig_DATA)
 

diff --git a/Makefile.tools b/Makefile.tools
index cd0d20c..2786fc1 100644 (file)
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -161,7 +161,7 @@ udevdir = @UDEV_DIR@
 
 udev_PROGRAMS = tools/hid2hci
 
-tools_hid2hci_LDADD = @USB_LIBS@ @UDEV_LIBS@
+tools_hid2hci_LDADD = @UDEV_LIBS@
 
 dist_man_MANS += tools/hid2hci.1
 else

diff --git a/README b/README
index 0e22850..c991ab0 100644 (file)
--- a/README
+++ b/README
@@ -13,7 +13,6 @@ In order to compile Bluetooth utilities you need following software packages:
        - GCC compiler
        - GLib library
        - D-Bus library
-       - USB library (optional)
        - udev library (optional)
        - readline (command line clients)
 

diff --git a/configure.ac b/configure.ac
index 0814e90..a6a214b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -116,16 +116,6 @@ AC_ARG_ENABLE(monitor, AC_HELP_STRING([--disable-monitor],
                [disable Bluetooth monitor]), [enable_monitor=${enableval}])
 AM_CONDITIONAL(MONITOR, test "${enable_monitor}" != "no")
 
-AC_ARG_ENABLE(usb, AC_HELP_STRING([--disable-usb],
-                       [disable USB support]), [enable_usb=${enableval}])
-if (test "${enable_tools}" != "no" && test "${enable_usb}" != "no"  ); then
-       PKG_CHECK_MODULES(USB, libusb, dummy=yes,
-                       AC_MSG_ERROR(USB library support is required))
-       AC_SUBST(USB_CFLAGS)
-       AC_SUBST(USB_LIBS)
-fi
-AM_CONDITIONAL(USB, test "${enable_usb}" != "no")
-
 AC_ARG_ENABLE(udev, AC_HELP_STRING([--disable-udev],
                [disable udev device support]), [enable_udev=${enableval}])
 if (test "${enable_tools}" != "no" && test "${enable_udev}" != "no"); then
@@ -152,7 +142,7 @@ fi
 AC_SUBST(UDEV_DIR, [${path_udevdir}])
 
 AM_CONDITIONAL(HID2HCI, test "${enable_tools}" != "no" &&
-               test "${enable_udev}" != "no" && test "${enable_usb}" != "no")
+                                               test "${enable_udev}" != "no")
 
 AC_ARG_ENABLE(cups, AC_HELP_STRING([--disable-cups],
                 [disable CUPS printer support]), [enable_cups=${enableval}])