Clean up .gitignore

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fc76b2a93c2f932470c3ed6c70dedc294d027d86..97337fca97752d2043cccddd1f75e52fb6b91b5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_INIT([libsigrok], [sr_package_version_major.sr_package_version_minor.sr_packa
        [sigrok-devel@lists.sourceforge.net],
        [libsigrok], [http://www.sigrok.org])
 AC_CONFIG_HEADERS([config.h include/libsigrok/version.h])
-AC_CONFIG_MACRO_DIR([autostuff])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([autostuff])
 
 # We require at least automake 1.11 (needed for 'silent rules').
@@ -332,7 +332,7 @@ sr_cxx_missing=
 # Check if the C++ compiler supports the C++11 standard.
 m4_ifdef([AX_CXX_COMPILE_STDCXX_11],
        [AX_CXX_COMPILE_STDCXX_11(, [optional])],
-       [m4_warn(, [[Missing macro AX_CXX_COMPILE_STDCXX_11: no C++11 check possible]])])
+       [m4_warn([unsupported], [Missing macro AX_CXX_COMPILE_STDCXX_11: no C++11 check possible])])
 test "x$HAVE_CXX11" = x1 || sr_cxx_missing="$sr_cxx_missing C++11"
 
 # The C++ bindings need glibmm.
@@ -391,13 +391,13 @@ PKG_CHECK_EXISTS([pygobject-3.0 < 3.7.91],
 HAVE_PYMOD_SETUPTOOLS=yes
 m4_ifdef([AX_PYTHON_MODULE],
        [AX_PYTHON_MODULE([setuptools])],
-       [m4_warn(, [[Missing macro AX_PYTHON_MODULE: no setuptools check]])])
+       [m4_warn([unsupported], [Missing macro AX_PYTHON_MODULE: no setuptools check])])
 test "x$HAVE_PYMOD_SETUPTOOLS" = xyes \
        || sr_python_missing="$sr_python_missing Setuptools"
 
 # The Python bindings use SWIG to generate code.
-AC_CHECK_PROG([HAVE_SWIG], [swig], [yes], [no])
-test "x$HAVE_SWIG" = xyes || sr_python_missing="$sr_python_missing SWIG"
+AC_CHECK_PROGS([SWIG], [swig swig2.0 swig3.0], [no])
+test "x$SWIG" != xno || sr_python_missing="$sr_python_missing SWIG"
 
 AS_IF([test -z "$sr_python_missing"],
        [BINDINGS_PYTHON=$enable_python], [BINDINGS_PYTHON=no])
@@ -411,7 +411,7 @@ sr_java_missing=
 test "x$BINDINGS_CXX" = xyes || sr_java_missing=" C++ bindings"
 
 # The Java bindings use SWIG to generate code.
-test "x$HAVE_SWIG" = xyes || sr_java_missing="$sr_java_missing SWIG"
+test "x$SWIG" != xno || sr_java_missing="$sr_java_missing SWIG"
 
 # Find Java compiler and JNI includes for Java bindings.
 AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])