From 8884e0d1f117a266f8e746b3da025c659c5d9768 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Wed, 4 Mar 2020 09:41:43 -0600 Subject: [PATCH] Increase version requirement for swig and add swig 3.0 detection Change bindings test scripts to executable --- bindings/luatest.lua | 0 bindings/pytest.py | 0 configure.ac | 2 +- macros/ax_pkg_swig.m4 | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 bindings/luatest.lua mode change 100644 => 100755 bindings/pytest.py diff --git a/bindings/luatest.lua b/bindings/luatest.lua old mode 100644 new mode 100755 diff --git a/bindings/pytest.py b/bindings/pytest.py old mode 100644 new mode 100755 diff --git a/configure.ac b/configure.ac index a5c8c5908..0f8a67a55 100644 --- a/configure.ac +++ b/configure.ac @@ -616,7 +616,7 @@ AM_CONDITIONAL([ENABLE_LUA], [test x"${cf_with_lua_binding}" = "xyes"]) dnl Only search for Swig if one or more bindings are enabled. AS_IF([test "x${BINDING_ALL}" != "x"], [# macros/ax_pkg_swig.m4 - AX_PKG_SWIG([1.3.22], + AX_PKG_SWIG([3.0.12], [BINDINGS="${BINDINGS} bindings" cf_with_bindings="yes"], [AC_MSG_ERROR([SWIG is required to build bindings...]) diff --git a/macros/ax_pkg_swig.m4 b/macros/ax_pkg_swig.m4 index d836eec8f..cbc45764c 100644 --- a/macros/ax_pkg_swig.m4 +++ b/macros/ax_pkg_swig.m4 @@ -66,8 +66,8 @@ #serial 11 AC_DEFUN([AX_PKG_SWIG],[ - # Ubuntu has swig 2.0 as /usr/bin/swig2.0 - AC_PATH_PROGS([SWIG],[swig swig2.0]) + # Ubuntu has swig 3.0 as /usr/bin/swig3.0 + AC_PATH_PROGS([SWIG],[swig swig3.0]) if test -z "$SWIG" ; then m4_ifval([$3],[$3],[:]) elif test -n "$1" ; then