Commit 2696738633b6dc13e20280acc25505db47a71f2d

Con Kolivas 2012-11-18T23:40:50

Revert "configure.ac: Don't use pkg-config to search for libusb-1.0 on FreeBSD" This reverts commit d0c10b78beadc677d3079a8393db1f9af3d37195. Rollback breakage.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/configure.ac b/configure.ac
index d36b1ca..8c235d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,15 +346,7 @@ AM_CONDITIONAL([HAVE_LIBUDEV], [test x$libudev != xno])
 PKG_PROG_PKG_CONFIG()
 
 if test "x$ztex" != xno; then
-  case $target in
-    *-*-freebsd*)
-      LIBUSB_LIBS="-lusb"
-      LIBUSB_CFLAGS=""
-      ;;
-    *)
-      PKG_CHECK_MODULES(LIBUSB, libusb-1.0, [AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb-1.0])], [AC_MSG_ERROR([Could not find usb library - please install libusb-1.0])])
-      ;;
-  esac
+  PKG_CHECK_MODULES(LIBUSB, libusb-1.0, [AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb-1.0])], [AC_MSG_ERROR([Could not find usb library - please install libusb-1.0])])
   USB_LIBS="$LIBUSB_LIBS"
   USB_FLAGS="$LIBUSB_CFLAGS"
 fi