hal: Branch 'master'

[David Zeuthen]

 configure.in |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

New commits:
diff-tree 72e4beb596c2fe3c772af421a53f292df7cb0776 (from 1a0857154bf60a03b355daa9cc8d7127db69a267)
Author: Richard Hughes <hughsient at gmail.com>
Date:   Mon Feb 5 19:09:57 2007 -0500

    fix libusb detection
    
    Patch attached, to better check for libusb. Tested with and without
    libusb-devel installed. Okay to commit?
    
    Richard.

diff --git a/configure.in b/configure.in
index 192c6eb..a731889 100644
--- a/configure.in
+++ b/configure.in
@@ -628,18 +628,15 @@ AM_CONDITIONAL(BUILD_CPUFREQ, test x$BUI
 dnl USB CSR (for reading battery of USB wireless mice)
 AC_ARG_WITH(usb-csr,        [  --with-usb-csr          Whether to build addon for wireless USB mice (auto)])
 BUILD_USBCSR=no
-if test "x$with_usb_csr" = "xyes" ; then
-   BUILD_USBCSR=yes
-elif test "x$with_usb_csr" = "x" ; then
-  if test "$HAVE_LIBUSB" != "false" ; then
-    case "${HALD_BACKEND}" in
-      linux)
-        BUILD_USBCSR=yes
-        ;;
-      *)
-        ;;
-    esac
-  fi
+if test "x${USE_LIBUSB}" == "xyes" ; then
+   if test "x$with_usb_csr" = "xyes" ; then
+      BUILD_USBCSR=yes
+   elif test "x$with_usb_csr" = "x" ; then
+      #only automatically build for Linux
+      if test "${HALD_BACKEND}" = "linux" ; then
+         BUILD_USBCSR=yes
+      fi
+   fi
 fi
 AM_CONDITIONAL(BUILD_USBCSR, test x$BUILD_USBCSR = xyes)