From: Uwe Hermann Date: Fri, 22 Nov 2013 14:13:04 +0000 (+0100) Subject: Update to 3-digit libserialport package version format. X-Git-Tag: libsigrok-0.3.0~539 X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=330af0ec899c3b5f0fd6943941d1785faba4dcb1;hp=e2b238210187e40ad434f659e68d604ed5f523d4;p=libsigrok.git Update to 3-digit libserialport package version format. --- diff --git a/README b/README index 867c1b5d..e12f89ed 100644 --- a/README +++ b/README @@ -36,7 +36,7 @@ Requirements - pkg-config >= 0.22 - libglib >= 2.32.0 - libzip >= 0.10 - - libserialport >= 0.1 (optional, used by some drivers) + - libserialport >= 0.1.0 (optional, used by some drivers) - libusb-1.0 >= 1.0.9 (optional, used by some drivers) - libftdi >= 0.16 (optional, used by some drivers) - libudev >= 151 (optional, used by some drivers) diff --git a/configure.ac b/configure.ac index bb3e0476..77f17ddf 100644 --- a/configure.ac +++ b/configure.ac @@ -258,7 +258,7 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.10], # libserialport is only needed for some hardware drivers. Disable the # respective drivers if it is not found. -PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1], +PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], [have_libserialport="yes"; CFLAGS="$CFLAGS $libserialport_CFLAGS"; LIBS="$LIBS $libserialport_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libserialport"], @@ -593,7 +593,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" "libusb-1.0 >= 1.0.9" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do +for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "libusb-1.0 >= 1.0.9" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib` answer="yes ($ver)"