configure.ac: Drop unneeded AC_CANONICAL_SYSTEM.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d28306149760eabaddcd394f393d3cd2bab5056b..61013ad754ac75918e09a8ec50b1655f26e1b91a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,7 @@ DRIVER([Agilent DMM], [agilent-dmm])
 DRIVER([Appa 55II], [appa-55ii])
 DRIVER([ASIX SIGMA/SIGMA2], [asix-sigma])
 DRIVER([Atten PPS3xxx], [atten-pps3xxx])
+DRIVER([BayLibre ACME], [baylibre-acme])
 DRIVER([BeagleLogic], [beaglelogic])
 DRIVER([Brymen BM86x], [brymen-bm86x])
 DRIVER([Brymen DMM], [brymen-dmm])
@@ -260,8 +261,8 @@ AM_CONDITIONAL(NEED_RPC, test "x$have_rpc" != "x0")
 
 # libglib-2.0 is always needed. Abort if it's not found.
 # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement).
-# We require at least 2.34.0 due to e.g. g_slist_deep_copy().
-AM_PATH_GLIB_2_0([2.34.0],
+# We require at least 2.32.0 due to e.g. g_variant_new_fixed_array().
+AM_PATH_GLIB_2_0([2.32.0],
        [LIB_CFLAGS="$LIB_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libzip is always needed. Abort if it's not found.
@@ -302,7 +303,7 @@ fi
 AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno)
 
 # The VISA SCPI backend is only compiled in if librevisa was found.
-PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812],
+PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130412],
        [have_librevisa="yes"; LIB_CFLAGS="$LIB_CFLAGS $librevisa_CFLAGS";
        LIBS="$LIBS $librevisa_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS librevisa"],
@@ -396,7 +397,7 @@ PKG_CHECK_MODULES([glibmm], [glibmm-2.4 >= 2.32.0],
        [BINDINGS_CXX="no"; cxx_msg="glibmm required"])
 
 # C++ bindings want stoi and stod.
-if test "x$BINDINGS_CXX" == "xyes"; then
+if test "x$BINDINGS_CXX" = "xyes"; then
        AC_LANG_PUSH([C++])
        AC_MSG_CHECKING([for stoi and stod])
        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <string>],
@@ -427,14 +428,20 @@ AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 # build it if these headers aren't available.
 AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"])
 
+# The ACME driver can only be built for Linux.
+case "$host" in
+       *linux*) ;;
+       *) HW_BAYLIBRE_ACME="no" ;;
+esac
+
 AC_SUBST(SR_PKGLIBS)
 
 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"
+CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrokcxx -I${srcdir}/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
+if test "x$HAVE_JAVAC" = "xyes" && test "x$BINDINGS_JAVA" = "xyes"; then
        AX_PROG_JAVAC
        if test "x$JNI_INCLUDE_DIRS" = "xauto"; then
                if test "x$cross_compiling" = "xyes"; then
@@ -470,6 +477,7 @@ DRIVER2([HW_AGILENT_DMM], [$HW_AGILENT_DMM], [HAVE_HW_AGILENT_DMM])
 DRIVER2([HW_APPA_55II], [$HW_APPA_55II], [HAVE_HW_APPA_55II])
 DRIVER2([HW_ASIX_SIGMA], [$HW_ASIX_SIGMA], [HAVE_HW_ASIX_SIGMA])
 DRIVER2([HW_ATTEN_PPS3XXX], [$HW_ATTEN_PPS3XXX], [HAVE_HW_ATTEN_PPS3XXX])
+DRIVER2([HW_BAYLIBRE_ACME], [$HW_BAYLIBRE_ACME], [HAVE_HW_BAYLIBRE_ACME])
 DRIVER2([HW_BEAGLELOGIC], [$HW_BEAGLELOGIC], [HAVE_HW_BEAGLELOGIC])
 DRIVER2([HW_BRYMEN_BM86X], [$HW_BRYMEN_BM86X], [HAVE_HW_BRYMEN_BM86X])
 DRIVER2([HW_BRYMEN_DMM], [$HW_BRYMEN_DMM], [HAVE_HW_BRYMEN_DMM])
@@ -537,7 +545,7 @@ AC_SUBST(SR_PACKAGE_VERSION_MICRO)
 AC_SUBST(SR_PACKAGE_VERSION)
 
 AC_CONFIG_FILES([Makefile include/libsigrok/version.h libsigrok.pc
-       bindings/cxx/libsigrokxx.pc])
+       bindings/cxx/libsigrokcxx.pc])
 
 AC_OUTPUT
 
@@ -554,13 +562,13 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.34.0" "libzip >= 0.10" "libserialport >= 0.2.0" \
-       "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.2.0" \
+       "librevisa >= 0.0.20130412" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \
        "libftdi1 >= 1.0" "libgpib" "glibmm-2.4 >= 2.32.0" \
        "pygobject-3.0 >= 3.0.0" "check >= 0.9.4"
 do
        optional="OPTIONAL"
-       if test "x$lib" = "xglib-2.0 >= 2.34.0"; then optional="REQUIRED"; fi
+       if test "x$lib" = "xglib-2.0 >= 2.32.0"; then optional="REQUIRED"; fi
        if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi
        if `$PKG_CONFIG --exists $lib`; then
                ver=`$PKG_CONFIG --modversion $lib`