xberry / rpms / libftdi

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