BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to 3-digit libserialport package version format.

This commit is contained in:
Uwe Hermann 2013-11-22 15:13:04 +01:00
parent e2b2382101
commit 330af0ec89
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -36,7 +36,7 @@ Requirements
- pkg-config >= 0.22 - pkg-config >= 0.22
- libglib >= 2.32.0 - libglib >= 2.32.0
- libzip >= 0.10 - 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) - libusb-1.0 >= 1.0.9 (optional, used by some drivers)
- libftdi >= 0.16 (optional, used by some drivers) - libftdi >= 0.16 (optional, used by some drivers)
- libudev >= 151 (optional, used by some drivers) - libudev >= 151 (optional, used by some drivers)

4
configure.ac
View File

@ -258,7 +258,7 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
# libserialport is only needed for some hardware drivers. Disable the # libserialport is only needed for some hardware drivers. Disable the
# respective drivers if it is not found. # 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"; [have_libserialport="yes"; CFLAGS="$CFLAGS $libserialport_CFLAGS";
LIBS="$LIBS $libserialport_LIBS"; LIBS="$LIBS $libserialport_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libserialport"], SR_PKGLIBS="$SR_PKGLIBS libserialport"],
@ -593,7 +593,7 @@ echo "Detected libraries:"
echo echo
# Note: This only works for libs with pkg-config integration. # 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 if `$PKG_CONFIG --exists $lib`; then
ver=`$PKG_CONFIG --modversion $lib` ver=`$PKG_CONFIG --modversion $lib`
answer="yes ($ver)" answer="yes ($ver)"