diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2013-08-28 14:15:22 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-08-28 14:15:22 -0700 |
| commit | 6c1dfe9b6d45b0f1b5022896e917b0f8ddb8abba (patch) | |
| tree | af4271954cfd7b2576814368fad6b553a011c67c | |
| parent | e3cc40084ce4c02e6912fae157b0010b24c862db (diff) | |
| download | bluez-6c1dfe9b6d45b0f1b5022896e917b0f8ddb8abba.tar.gz | |
build: Remove all checks for USB library support
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.tools | 2 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | configure.ac | 12 |
4 files changed, 3 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 8de174fb6..5cfdd76a1 100644 --- 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 cd0d20ca3..2786fc1c3 100644 --- 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 @@ -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 0814e9012..a6a214bfe 100644 --- 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}]) |