Merge branch 'wip/burx_support'

[debian/gnuradio] / config / usrp_libusb.m4

diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4
old mode 100644 (file)
new mode 100755 (executable)
index 6666eae..251f7df
--- a/config/usrp_libusb.m4
+++ b/config/usrp_libusb.m4
@@ -30,6 +30,7 @@ AC_DEFUN([USRP_LIBUSB], [
 
   libusbok=no
   have_libusb1=no
+  LIBUSB_PKG_CONFIG_NAME=''
   if test x$1 = xyes; then
     PKG_CHECK_MODULES(USB, libusb-1.0, [
       libusbok=yes
@@ -37,35 +38,46 @@ AC_DEFUN([USRP_LIBUSB], [
       usb_header='libusb-1.0/libusb.h'
       usb_lib_func='libusb_bulk_transfer'
       usb_lib_name='usb-1.0'
+      LIBUSB_PKG_CONFIG_NAME='libusb-1.0'
     ])
-  fi
-  if test $libusbok = no; then
-    dnl not using libusb1, or PKGCONFIG check for libusb1 failed;
-    dnl see if legacy version is found.
+  else
+    dnl not using libusb1 (for now); see if legacy version is found.
     dnl it might be installed under the name either 'libusb' or
-    dnl 'libusb-legacy'. check them in that order.
+    dnl 'libusb-legacy', or just available via the
+    dnl user's shell environment
 
     dnl see if the pkgconfig module 'libusb' is available
-    PKG_CHECK_MODULES(USB, libusb, [libusbok=yes], [libusbok=no])
+    PKG_CHECK_MODULES(USB, libusb, [
+      libusbok=yes
+      LIBUSB_PKG_CONFIG_NAME='libusb'
+      ], [libusbok=no])
     dnl PKG_CHECK_MODULES does not work correctly when embedded
     if test $libusbok = no; then
       dnl if not, see if the pkgconfig module 'libusb-legacy' is available
-      PKG_CHECK_MODULES(USB, [libusb-legacy], [libusbok=yes], [libusbok=no])
-    fi
-    if test $libusbok = yes; then
-      dnl if PKGCONFIG worked, set variables for further testing
-      usb_header='usb.h'
-      usb_lib_func='usb_bulk_write'
-      usb_lib_name='usb'
+      PKG_CHECK_MODULES(USB, [libusb-legacy], [
+        libusbok=yes
+        LIBUSB_PKG_CONFIG_NAME='libusb-legacy'
+        ], [libusbok=no])
     fi
+    dnl set variables for further testing
+    usb_header='usb.h'
+    usb_lib_func='usb_bulk_write'
+    usb_lib_name='usb'
   fi
-  if test $libusbok = no; then
-    AC_MSG_RESULT([USRP requires libusb, which was not found. See http://www.libusb.org])
-  else
+  AC_SUBST(LIBUSB_PKG_CONFIG_NAME)
+  if test x$1 != xyes || test $have_libusb1 = yes; then
+    dnl Either (1) libusb1 was specified and found; or
+    dnl (2) libusb1 was not specified. Restart checking.
+    libusbok=yes
 
-    dnl either some pkgconfig LIBUSB* variant was found, or USB_*
-    dnl variables were overridden by the user as arguments to configure.
-    dnl either way, check the USB_* variables to make sure they work
+    dnl Verify that $usb_header is a valid header, and if so,
+    dnl then verify that $usb_lib_func can be found in the
+    dnl library $usb_lib_name.
+
+    dnl If PKGCONFIG found variable USB_INCLUDEDIR, and it is
+    dnl not empty, use it for checking for $usb_header.
+    dnl Otherwise, maybe the user's shell environment is already
+    dnl configured to find this header.
 
     AC_LANG_PUSH(C)
     save_CPPFLAGS="$CPPFLAGS"
@@ -83,20 +95,28 @@ AC_DEFUN([USRP_LIBUSB], [
     else
 
       dnl found the header; now make sure the library is OK
+      dnl On Darwin, need to include the IOKit library.     
 
       AC_LANG_PUSH(C)
       save_LIBS="$LIBS"
+      LIBS=""
       case "$host_os" in
         darwin*)
           USB_LIBS="$USB_LIBS -lIOKit"
+          LIBS="$USB_LIBS"
           ;;
         *) ;;
       esac
-      LIBS="$LIBS $USB_LIBS"
       AC_CHECK_LIB([$usb_lib_name], [$usb_lib_func], [], [
         libusbok=no
         AC_MSG_RESULT([USRP requires library '$usb_lib_name' with function '$usb_lib_func', which was either not found or was not usable. See http://www.libusb.org])
       ])
+      case "$host_os" in
+        cygwin* | mingw*)
+          USB_LIBS="$LIBS"
+          ;;
+        *) ;;
+      esac
       LIBS="$save_LIBS"
       AC_LANG_POP(C)
     fi