hal: Branch 'master'

[Danny Kukawka]

 NEWS         |   10 +++++-----
 configure.in |   11 ++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

New commits:
diff-tree 765979cfd55e28762a9756fcb45ae64816f7f034 (from b44ce6775fc8a8a3c0dbe9ebbee68879777c38ee)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Apr 23 23:17:09 2007 +0200

    fix detection of libusb
    
    Not sure why we check for libusb-config to find out if libusb and the
    needed headers are available, but this fix this issue to the correct
    check (e.g. for distributions where libusb and a libusb-devel
    package exist). Fixed also NEWS file for correct libusb version.
    
    Should also fix fd.o bug #8654

diff --git a/NEWS b/NEWS
index cf6f918..8815c36 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ Requirements for HAL 0.5.10 "":
  - glib             >= 2.6.0
  - expat            >= 1.95.8
  - hal-info         >= 20070402
- - libusb           >= 0 0.1.10a (optional)
+ - libusb           >= 0.1.10a (optional)
  - pciutils         >= 2.2.3     (optional
  - dmidecode        >= 2.7       (optional)
  - parted           == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.86 (optional)
@@ -39,7 +39,7 @@ Requirements for HAL 0.5.9 "Precipice":
  - glib             >= 2.6.0
  - expat            >= 1.95.8
  - hal-info         >= 20070402
- - libusb           >= 0 0.1.10a (optional)
+ - libusb           >= 0.1.10a (optional)
  - pciutils         >= 2.2.3     (optional
  - dmidecode        >= 2.7       (optional)
  - parted           == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.86 (optional)
@@ -842,7 +842,7 @@ Requirements for HAL 0.5.8 "The Skynet F
  - dbus             >= 0.60      (with glib bindings)
  - glib             >= 2.6.0
  - expat            >= 1.95.8
- - libusb           >= 0 0.1.10a (optional)
+ - libusb           >= 0.1.10a (optional)
  - pciutils         >= 2.2.3     (optional
  - dmidecode        >= 2.7       (optional)
  - parted           == 1.7.1     (optional)
@@ -909,7 +909,7 @@ Requirements for HAL 0.5.7 "Dead as Dill
  - dbus             >= 0.60      (with glib bindings)
  - glib             >= 2.6.0
  - expat            >= 1.95.8
- - libusb           >= 0 0.1.10a (optional)
+ - libusb           >= 0.1.10a (optional)
  - dmidecode        >= 2.7       (optional)
  - cryptsetup-luks  => 1.0.1     (optional, needs LUKS patches)
 
@@ -978,7 +978,7 @@ Requirements for HAL 0.5.6 "Leave the gu
  - glib          >= 2.6.0
  - expat         >= 1.95.8
  - popt          >= 1.10.2    (optional)
- - libusb        >= 0 0.1.10a (optional)
+ - libusb        >= 0.1.10a (optional)
  - dmidecode     >= 2.7       (optional)
 
 ==========
diff --git a/configure.in b/configure.in
index 4b4247f..047771b 100644
--- a/configure.in
+++ b/configure.in
@@ -330,14 +330,11 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXP
 AC_SUBST(EXPAT_LIB)
 
 dnl Check libusb
-AC_PATH_PROG(LIBUSB_CONFIG, libusb-config)
-if test -n "${LIBUSB_CONFIG}"; then
-	USE_LIBUSB=yes
-	AM_CONDITIONAL(HAVE_LIBUSB,true)
-else
-	USE_LIBUSB=no
-	AM_CONDITIONAL(HAVE_LIBUSB,false)
+AC_CHECK_HEADERS(usb.h, USE_LIBUSB=yes, USE_LIBUSB=no)
+if test "x$USE_LIBUSB" = "xyes"; then
+	AC_CHECK_LIB(usb,usb_find_devices, , USE_LIBUSB=no)
 fi
+AM_CONDITIONAL([HAVE_LIBUSB],[test "x$USE_LIBUSB" = "xyes"])
 
 dnl Check for libsmbios
 AC_LANG_PUSH([C++])