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

Build: Prefer newer versions of libftdi and SWIG

This commit is contained in:
Daniel Elstner 2015-08-24 00:08:01 +02:00
parent 26b67f1141
commit 0ab8386a5c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -82,7 +82,7 @@ SR_ARG_OPT_PKG([libserialport], [LIBSERIALPORT], [NEED_SERIAL],
[libserialport >= 0.1.1]) [libserialport >= 0.1.1])
SR_ARG_OPT_PKG([libftdi], [LIBFTDI],, SR_ARG_OPT_PKG([libftdi], [LIBFTDI],,
[libftdi >= 0.16], [libftdi1 >= 1.0]) [libftdi1 >= 1.0], [libftdi >= 0.16])
# FreeBSD comes with an "integrated" libusb-1.0-style USB API. # FreeBSD comes with an "integrated" libusb-1.0-style USB API.
# This means libusb-1.0 is always available; no need to check for it. # This means libusb-1.0 is always available; no need to check for it.
@ -323,7 +323,7 @@ AS_IF([test "x$HAVE_PYMOD_SETUPTOOLS" != xyes],
[SR_APPEND([sr_python_missing], [', '], [setuptools])]) [SR_APPEND([sr_python_missing], [', '], [setuptools])])
# The Python bindings use SWIG to generate code. # The Python bindings use SWIG to generate code.
AC_CHECK_PROGS([SWIG], [swig swig2.0 swig3.0]) AC_CHECK_PROGS([SWIG], [swig swig3.0 swig2.0])
AS_IF([test "x$SWIG" = x], AS_IF([test "x$SWIG" = x],
[SR_APPEND([sr_python_missing], [', '], [SWIG])]) [SR_APPEND([sr_python_missing], [', '], [SWIG])])