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

Lower libserialport requirement to 0.1.1.

This commit is contained in:
Uwe Hermann 2015-04-19 18:39:35 +02:00
parent 468665dfa7
commit 8d80146722
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

@ -38,7 +38,7 @@ Requirements for the C library:
- 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.0 (optional, used by some drivers) - libserialport >= 0.1.1 (optional, used by some drivers)
- librevisa >= 0.0.20130412 (optional, used by some drivers) - librevisa >= 0.0.20130412 (optional, used by some drivers)
- libusb-1.0 >= 1.0.16 (optional, used by some drivers) - libusb-1.0 >= 1.0.16 (optional, used by some drivers)
- libftdi >= 0.16 or libftdi1 >= 1.0 (optional, used by some drivers) - libftdi >= 0.16 or libftdi1 >= 1.0 (optional, used by some drivers)

4
configure.ac
View File

@ -273,7 +273,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.
if test "x$enable_libserialport" != "xno"; then if test "x$enable_libserialport" != "xno"; then
PKG_CHECK_MODULES([libserialport], [libserialport >= 0.2.0], PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.1],
[have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS"; [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS";
LIBS="$LIBS $libserialport_LIBS"; LIBS="$LIBS $libserialport_LIBS";
SR_PKGLIBS="$SR_PKGLIBS libserialport"], SR_PKGLIBS="$SR_PKGLIBS libserialport"],
@ -562,7 +562,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.2.0" \ for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.1" \
"librevisa >= 0.0.20130412" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \ "librevisa >= 0.0.20130412" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \
"libftdi1 >= 1.0" "libgpib" "glibmm-2.4 >= 2.32.0" \ "libftdi1 >= 1.0" "libgpib" "glibmm-2.4 >= 2.32.0" \
"pygobject-3.0 >= 3.0.0" "check >= 0.9.4" "pygobject-3.0 >= 3.0.0" "check >= 0.9.4"