BINDINGS_CXX="no"; cxx_msg="C++11 compiler required"
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"; cxx_msg="gccxml required"
+# The C++ bindings use doxygen to parse libsigrok symbols.
+AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes])
+if test "x$HAVE_DOXYGEN" != "xyes"; then
+ BINDINGS_CXX="no"; cxx_msg="doxygen required"
fi
# Python is needed for the C++ bindings.
PKG_CHECK_MODULES([python], [python >= 2.7],
[CXXFLAGS="$CXXFLAGS $python_CFLAGS";
CXXLIBS="$CXXLIBS $python_LIBS"],
- [BINDINGS_PYTHON="no"; python_msg="Python headers required"])
-
-# 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"; cxx_msg="Python pygccxml module required"
-fi
+[PKG_CHECK_MODULES([python27], [python-2.7 >= 2.7],
+ [CXXFLAGS="$CXXFLAGS $python27_CFLAGS";
+ CXXLIBS="$CXXLIBS $python27_LIBS"],
+ [BINDINGS_PYTHON="no"; python_msg="Python headers required"])])
# The Python bindings need the setuptools Python module.
m4_ifdef([AX_PYTHON_MODULE], [AX_PYTHON_MODULE([setuptools])],
;;
esac
+# The BeagleLogic driver needs sys/mman.h and sys/ioctl.h. Don't try to
+# build it if these headers aren't available.
+AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"])
+
AC_SUBST(SR_PKGLIBS)
-CFLAGS="$CFLAGS -I./include/libsigrok $LIB_CFLAGS"
-CXXFLAGS="$CXXFLAGS -I./include -I./bindings/cxx/include $LIB_CFLAGS"
+CFLAGS="$CFLAGS -Iinclude/libsigrok -I${srcdir}/include/libsigrok $LIB_CFLAGS"
+CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrok -I${srcdir}/bindings/cxx/include $LIB_CFLAGS"
# Find Java compiler and JNI includes for Java bindings.
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.
+# These are already implicitly checked: inttypes.h stdint.h stdlib.h string.h
+# unistd.h memory.h strings.h dlfcn.h sys/types.h sys/stat.h.
# Checks for typedefs, structures, and compiler characteristics.
AC_C_BIGENDIAN