From: Uwe Hermann Date: Mon, 16 Jun 2014 11:19:34 +0000 (+0200) Subject: Lower libftdi1 requirement to 1.0 (builds fine too). X-Git-Tag: libsigrok-0.4.0~1283 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=c78bcc6f5d3d5dd93c63e4ef438e41807c127d25;p=libsigrok.git Lower libftdi1 requirement to 1.0 (builds fine too). --- diff --git a/configure.ac b/configure.ac index 51046292..107f03e8 100644 --- a/configure.ac +++ b/configure.ac @@ -406,7 +406,7 @@ if test "x$enable_libftdi" != "xno"; then [have_libftdi="yes"; LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS"; LIBS="$LIBS $libftdi_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libftdi"], - [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.1], + [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.0], [LIB_CFLAGS="$LIB_CFLAGS $libftdi1_CFLAGS"; LIBS="$LIBS $libftdi1_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libftdi1"], @@ -653,7 +653,7 @@ echo "Detected libraries:" echo # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.1" "check >= 0.9.4"; do +for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.0" "check >= 0.9.4"; do optional="OPTIONAL" if test "x$lib" = "xglib-2.0 >= 2.32.0"; then optional="REQUIRED"; fi if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi