From: Daniel Elstner <redacted>
Date: Sun, 23 Aug 2015 22:08:01 +0000 (+0200)
Subject: Build: Prefer newer versions of libftdi and SWIG
X-Git-Tag: libsigrok-0.4.0~406
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0ab8386a5c0b6fa58ce2a8c3aa2ca337bcb49005;p=libsigrok.git

Build: Prefer newer versions of libftdi and SWIG
---

diff --git a/configure.ac b/configure.ac
index 3579650f..f7b2e489 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,7 @@ SR_ARG_OPT_PKG([libserialport], [LIBSERIALPORT], [NEED_SERIAL],
 	[libserialport >= 0.1.1])
 
 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.
 # 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])])
 
 # 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],
 	[SR_APPEND([sr_python_missing], [', '], [SWIG])])