| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From a130153ae84d8bb5914879cef94df09f06825c10 Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
| 3 | Date: Sat, 18 Jun 2011 11:25:36 +0200 |
| 4 | Subject: [PATCH] buildsys: don't add /usr/include and /usr/lib to configure tests for libusb |
| 5 | |
| 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
| 7 | --- |
| 8 | config/usrp_libusb.m4 | 13 ------------- |
| 9 | 1 files changed, 0 insertions(+), 13 deletions(-) |
| 10 | |
| 11 | diff --git a/config/usrp_libusb.m4 b/config/usrp_libusb.m4 |
| 12 | index cc3410f..b421820 100644 |
| 13 | --- a/config/usrp_libusb.m4 |
| 14 | +++ b/config/usrp_libusb.m4 |
| 15 | @@ -117,10 +117,6 @@ AC_DEFUN([USRP_LIBUSB], [ |
| 16 | dnl configured to find this header. |
| 17 | AC_LANG_PUSH(C) |
| 18 | save_CPPFLAGS="$CPPFLAGS" |
| 19 | - if test x$USB_INCLUDEDIR != x; then |
| 20 | - USB_INCLUDES="-I$USB_INCLUDEDIR" |
| 21 | - CPPFLAGS="$USB_INCLUDES" |
| 22 | - fi |
| 23 | AC_MSG_CHECKING([$libusb_name for header $usb_header]) |
| 24 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
| 25 | #include "$usb_header" |
| 26 | @@ -172,9 +168,6 @@ AC_DEFUN([USRP_LIBUSB], [ |
| 27 | *) |
| 28 | AC_LANG_PUSH(C) |
| 29 | save_CPPFLAGS="$CPPFLAGS" |
| 30 | - if test x$USB_INCLUDEDIR != x; then |
| 31 | - CPPFLAGS="$USB_INCLUDES" |
| 32 | - fi |
| 33 | save_LIBS="$LIBS" |
| 34 | LIBS="$USB_LIBS" |
| 35 | AC_MSG_CHECKING([$libusb_name for symbol usb_debug in library $usb_lib_name]) |
| 36 | @@ -217,9 +210,6 @@ AC_DEFUN([USRP_LIBUSB], [ |
| 37 | dnl final error checking, mostly to create #define's |
| 38 | AC_LANG_PUSH(C) |
| 39 | save_CPPFLAGS="$CPPFLAGS" |
| 40 | - if test x$USB_INCLUDEDIR != x; then |
| 41 | - CPPFLAGS="$USB_INCLUDES" |
| 42 | - fi |
| 43 | dnl Check for the header. |
| 44 | AC_CHECK_HEADERS([$usb_header], [], [libusbok=no]) |
| 45 | CPPFLAGS="$save_CPPFLAGS" |
| 46 | @@ -231,9 +221,6 @@ AC_DEFUN([USRP_LIBUSB], [ |
| 47 | dnl check for the library (again) |
| 48 | AC_LANG_PUSH(C) |
| 49 | save_CPPFLAGS="$CPPFLAGS" |
| 50 | - if test x$USB_INCLUDEDIR != x; then |
| 51 | - CPPFLAGS="$USB_INCLUDES" |
| 52 | - fi |
| 53 | save_LIBS="$LIBS" |
| 54 | LIBS="$USB_LIBS" |
| 55 | AC_CHECK_LIB([$usb_lib_name], [$usb_lib_func], [], [ |
| 56 | -- |
| 57 | 1.6.6.1 |
| 58 | |