Fix building Python bindings with pygobject >= 3.7.91.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 90b9657a93e3d8fdddcd562f9703500bfb4df5de..971f9a7e91639140600391ab9858fc7d4b3c4fae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -166,18 +166,48 @@ AC_ARG_ENABLE(python,
        [build Python bindings [default=yes]]),
        [BINDINGS_PYTHON="$enableval"], [BINDINGS_PYTHON="yes"])
 
+AC_ARG_ENABLE(java,
+       AC_HELP_STRING([--enable-java],
+       [build Java bindings [default=yes]]),
+       [BINDINGS_JAVA="$enableval"], [BINDINGS_JAVA="yes"])
+
 # Check if the C++ compiler supports the C++11 standard.
 
-AX_CXX_COMPILE_STDCXX_11(,[optional])
+m4_ifdef([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX_11(,[optional])],
+       [AC_MSG_NOTICE([Missing macro m4_toupper(aX_CXX_COMPILE_STDCXX_11), no C++11 check])])
 
 if test "x$HAVE_CXX11" != "x1"; then
        BINDINGS_CXX="no"
 fi
 
-# Python bindings depend on C++ bindings.
+# 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
        BINDINGS_PYTHON="no"
+       BINDINGS_JAVA="no"
 fi
 
 # Checks for libraries.
@@ -334,15 +364,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],
@@ -362,6 +392,20 @@ AC_SUBST(SR_PKGLIBS)
 CFLAGS="$CFLAGS -I./include/libsigrok $LIB_CFLAGS"
 CXXFLAGS="$CXXFLAGS -I./include -I./bindings/cxx/include $LIB_CFLAGS"
 
+# Find Java compiler and JNI includes for Java bindings.
+
+AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])
+
+if test "x$HAVE_JAVAC" = "xyes"; then
+       AX_PROG_JAVAC
+       AX_JNI_INCLUDE_DIR
+       for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS; do
+               CXXFLAGS="$CXXFLAGS -I$JNI_INCLUDE_DIR"
+       done
+else
+       BINDINGS_JAVA="no"
+fi
+
 # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers.
 
 AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes)
@@ -553,6 +597,8 @@ AM_CONDITIONAL(BINDINGS_CXX, test x$BINDINGS_CXX = xyes)
 
 AM_CONDITIONAL(BINDINGS_PYTHON, test x$BINDINGS_PYTHON = xyes)
 
+AM_CONDITIONAL(BINDINGS_JAVA, test x$BINDINGS_JAVA = xyes)
+
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
 
@@ -609,4 +655,5 @@ echo -e "\nEnabled hardware drivers:\n${driver_summary}"
 echo -e "\nEnabled language bindings:\n"
 echo "  - C++............................. $BINDINGS_CXX"
 echo "  - Python.......................... $BINDINGS_PYTHON"
+echo "  - Java............................ $BINDINGS_JAVA"
 echo