diff options
| author | Don Ward | 2009-10-12 17:58:32 -0400 |
|---|---|---|
| committer | Thomas Tsou | 2009-10-12 17:58:32 -0400 |
| commit | 77a3e7e8f2940b8a86d80518ebd7d39365f2c5be (patch) | |
| tree | f96fd69ed156f0b4450b8b81b0475caa6303ba4e | |
| parent | 52dcaf0d09f7a0a547dc287dca521ba855369de4 (diff) | |
| download | gnuradio-77a3e7e8f2940b8a86d80518ebd7d39365f2c5be.tar.gz gnuradio-77a3e7e8f2940b8a86d80518ebd7d39365f2c5be.tar.bz2 gnuradio-77a3e7e8f2940b8a86d80518ebd7d39365f2c5be.zip | |
usrp: Applied patch from Don Ward for Cygwin libusb
Moved the case statement after the call to AC_CHECK_LIB
Initialized LIBS="" before calling AC_CHECK_LIB
| -rwxr-xr-x[-rw-r--r--] | config/usrp_libusb.m4 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4 index 4347bfba3..6ed7f5e9f 100644..100755 --- a/config/usrp_libusb.m4 +++ b/config/usrp_libusb.m4 @@ -90,17 +90,20 @@ AC_DEFUN([USRP_LIBUSB], [ AC_LANG_PUSH(C) save_LIBS="$LIBS" + 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 darwin*) USB_LIBS="$USB_LIBS -lIOKit" ;; + cygwin* | mingw*) + USB_LIBS="$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]) - ]) LIBS="$save_LIBS" AC_LANG_POP(C) fi |