X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=cf7e8dc294277c3f96ba8cec38792a97f78ef513;hb=6223feeb8ed6f6e525c85f3023195d99dfa1589f;hp=db6f644e4ddce3cd72d8ec8bcf9c476d6b18c491;hpb=f8158d56554688c9ff38731dbfd234fac46b6d9d;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index db6f644e..cf7e8dc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,20 +156,25 @@ AC_ARG_ENABLE(libusb,
 
 # Language binding '--enable' options
 
-AC_ARG_ENABLE(c++,
+AC_ARG_ENABLE(bindings,
+	AC_HELP_STRING([--enable-bindings],
+	[build language bindings [default=yes]]),
+	[BINDINGS_ALL="$enableval"], [BINDINGS_ALL="yes"])
+
+AC_ARG_ENABLE(cxx,
 	AC_HELP_STRING([--enable-cxx],
 	[build C++ bindings [default=yes]]),
-	[BINDINGS_CXX="$enableval"], [BINDINGS_CXX="yes"])
+	[BINDINGS_CXX="$enableval"], [BINDINGS_CXX=$BINDINGS_ALL])
 
 AC_ARG_ENABLE(python,
 	AC_HELP_STRING([--enable-python],
 	[build Python bindings [default=yes]]),
-	[BINDINGS_PYTHON="$enableval"], [BINDINGS_PYTHON="yes"])
+	[BINDINGS_PYTHON="$enableval"], [BINDINGS_PYTHON=$BINDINGS_ALL])
 
 AC_ARG_ENABLE(java,
 	AC_HELP_STRING([--enable-java],
 	[build Java bindings [default=yes]]),
-	[BINDINGS_PYTHON="$enableval"], [BINDINGS_JAVA="yes"])
+	[BINDINGS_JAVA="$enableval"], [BINDINGS_JAVA=$BINDINGS_ALL])
 
 # Check if the C++ compiler supports the C++11 standard.
 
@@ -180,6 +185,29 @@ if test "x$HAVE_CXX11" != "x1"; then
 	BINDINGS_CXX="no"
 fi
 
+# The C++ bindings use gccxml to parse libsigrok symbols.
+AC_CHECK_PROG([HAVE_GCCXML], [gccxml], [yes])
+if test "x$HAVE_GCCXML" != "xyes"; then
+	BINDINGS_CXX="no"
+fi
+
+# Python is needed for the C++ (and Python) bindings.
+PKG_CHECK_MODULES([python], [python3 >= 2.7],
+        [CXXFLAGS="$CXXFLAGS $python_CFLAGS";
+        CXXLIBS="$CXXLIBS $python_LIBS"],
+		[BINDINGS_CXX="no"])
+
+# The C++ bindings need the pygccxml Python module.
+m4_ifdef([AX_PYTHON_MODULE], [AX_PYTHON_MODULE([pygccxml])],
+	# We'll let it go through even if the macro wasn't found, the python
+	# module may still be there.
+	[HAVE_PYTHON_PYGCCXML="yes";
+		AC_MSG_NOTICE([Missing macro m4_toupper(aX_PYTHON_MODULE), no pygccxml check])]
+)
+if test "x$HAVE_PYMOD_PYGCCXML" != "xyes"; then
+	BINDINGS_CXX="no"
+fi
+
 # Python and Java bindings depend on C++ bindings.
 
 if test "x$BINDINGS_CXX" != "xyes"; then
@@ -341,15 +369,15 @@ PKG_CHECK_MODULES([glibmm], [glibmm-2.4 >= 2.32.0],
 	[CXXFLAGS="$CXXFLAGS $glibmm_CFLAGS";
 	CXXLIBS="$CXXLIBS $glibmm_LIBS"], [BINDINGS_CXX="no"])
 
-# Python is needed for the Python bindings.
-PKG_CHECK_MODULES([python], [python3 >= 2.7],
-        [CXXFLAGS="$CXXFLAGS $python_CFLAGS";
-        CXXLIBS="$CXXLIBS $python_LIBS"], [BINDINGS_PYTHON="no"])
-
 # PyGObject is needed for the Python bindings.
 PKG_CHECK_MODULES([pygobject], [pygobject-3.0],
         [CXXFLAGS="$CXXFLAGS $pygobject_CFLAGS";
-        CXXLIBS="$CXXLIBS $pygobject_LIBS"], [BINDINGS_PYTHON="no"])
+        CXXLIBS="$CXXLIBS $pygobject_LIBS";
+	PKG_CHECK_MODULES([pygobject_3_7_91], [pygobject-3.0 >= 3.7.91],
+		[pyg_flags_signed=0], [pyg_flags_signed=1]);
+	AC_DEFINE_UNQUOTED(PYGOBJECT_FLAGS_SIGNED, [$pyg_flags_signed],
+		[Whether last argument to pyg_flags_get_value() is signed])],
+	[BINDINGS_PYTHON="no"])
 
 # The Check unit testing framework is optional. Disable if not found.
 PKG_CHECK_MODULES([check], [check >= 0.9.4],