libftdi/libftdi-0.19-libusb.patch
2011-06-18 08:49:23 +03:00

39 lines
1.2 KiB
Diff

diff -Naur libftdi-0.19/configure.in libftdi-0.19-mod/configure.in
--- libftdi-0.19/configure.in 2011-05-20 17:30:40.000000000 +0300
+++ libftdi-0.19-mod/configure.in 2011-06-18 08:38:02.000000000 +0300
@@ -7,30 +7,12 @@
AM_PROG_LIBTOOL
AC_PROG_CXX
-dnl check for libusb-config
-AC_CHECK_TOOL(HAVELIBUSB, libusb-config)
-
-if test ! -z "$HAVELIBUSB"; then
- LIBUSB_CFLAGS=`$HAVELIBUSB --cflags`
- LIBUSB_LIBS=`$HAVELIBUSB --libs`
-
+dnl check for libusb
+PKG_CHECK_MODULES(LIBUSB, libusb,
+[
CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
LIBS="$LIBS $LIBUSB_LIBS"
-else
- AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.])
-fi
-
-dnl check for version of libusb
-AC_MSG_CHECKING([if libusb version is >= 0.1.7])
-libusb_version_needed="1007"
-libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
-
-if test $libusb_version -lt $libusb_version_needed; then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.])
-else
- AC_MSG_RESULT(yes)
-fi
+])
ENABLE_ASYNC_MODE=0
AC_ARG_WITH(async-mode,