build: We only need python 2.x for generating the bindings.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 971f9a7e91639140600391ab9858fc7d4b3c4fae..c3eb9b51ef4d50d8c1ec8816f0ed67f0b01fe9d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,8 +80,6 @@ AC_SUBST(SR_LIB_VERSION_AGE)
 AC_SUBST(SR_LIB_VERSION)
 AC_SUBST(SR_LIB_LDFLAGS)
 
-# Hardware support '--enable' options.
-
 AC_ARG_ENABLE(all-drivers, AC_HELP_STRING([--enable-all-drivers],
        [enable all drivers by default [default=yes]]),
        [HW_ENABLED_DEFAULT="$enableval"],
@@ -100,14 +98,15 @@ AC_DEFUN([DRIVER], [
        AC_ARG_ENABLE($2, AC_HELP_STRING([--enable-$2], [enable $1 support]),
                [m4_join([], [HW_], upperize([$2]))="$enableval"],
                [m4_join([], [HW_], upperize([$2]))=$default])
-       dots=$(expr substr ".............................." 1 $(expr 32 - length $2))
-       driver_summary="${driver_summary}  - $2${dots} ${m4_join([], [HW_], upperize([$2]))}\n"
+       dots=$(echo -n ".............................." | cut -c 1-$(expr 32 - $(echo -n $2|wc -c)))
+       driver_summary="${driver_summary}  - $2${dots} \${m4_join([], [HW_], upperize([$2]))}@"
 ])
 
 DRIVER([Agilent DMM], [agilent-dmm])
 DRIVER([Appa 55II], [appa-55ii])
 DRIVER([ASIX SIGMA/SIGMA2], [asix-sigma])
 DRIVER([Atten PPS3xxx], [atten-pps3xxx])
+DRIVER([BeagleLogic], [beaglelogic])
 DRIVER([Brymen BM86x], [brymen-bm86x])
 DRIVER([Brymen DMM], [brymen-dmm])
 DRIVER([CEM DT-885x], [cem-dt-885x])
@@ -156,20 +155,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_JAVA="$enableval"], [BINDINGS_JAVA="yes"])
+       [BINDINGS_JAVA="$enableval"], [BINDINGS_JAVA=$BINDINGS_ALL])
 
 # Check if the C++ compiler supports the C++11 standard.
 
@@ -187,7 +191,7 @@ if test "x$HAVE_GCCXML" != "xyes"; then
 fi
 
 # Python is needed for the C++ (and Python) bindings.
-PKG_CHECK_MODULES([python], [python3 >= 2.7],
+PKG_CHECK_MODULES([python], [python >= 2.7],
         [CXXFLAGS="$CXXFLAGS $python_CFLAGS";
         CXXLIBS="$CXXLIBS $python_LIBS"],
                [BINDINGS_CXX="no"])
@@ -365,7 +369,7 @@ PKG_CHECK_MODULES([glibmm], [glibmm-2.4 >= 2.32.0],
        CXXLIBS="$CXXLIBS $glibmm_LIBS"], [BINDINGS_CXX="no"])
 
 # PyGObject is needed for the Python bindings.
-PKG_CHECK_MODULES([pygobject], [pygobject-3.0],
+PKG_CHECK_MODULES([pygobject], [pygobject-3.0 >= 3.0.0],
         [CXXFLAGS="$CXXFLAGS $pygobject_CFLAGS";
         CXXLIBS="$CXXLIBS $pygobject_LIBS";
        PKG_CHECK_MODULES([pygobject_3_7_91], [pygobject-3.0 >= 3.7.91],
@@ -428,6 +432,11 @@ if test "x$HW_ATTEN_PPS3XXX" = "xyes"; then
        AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support])
 fi
 
+AM_CONDITIONAL(HW_BEAGLELOGIC, test x$HW_BEAGLELOGIC = xyes)
+if test "x$HW_BEAGLELOGIC" = "xyes"; then
+       AC_DEFINE(HAVE_HW_BEAGLELOGIC, 1, [BeagleLogic support])
+fi
+
 AM_CONDITIONAL(HW_BRYMEN_BM86X, test x$HW_BRYMEN_BM86X = xyes)
 if test "x$HW_BRYMEN_BM86X" = "xyes"; then
        AC_DEFINE(HAVE_HW_BRYMEN_BM86X, 1, [Brymen BM86X support])
@@ -637,7 +646,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.0" "check >= 0.9.4"; do
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.0" "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.32.0"; then optional="REQUIRED"; fi
        if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi
@@ -650,10 +659,10 @@ for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "libre
        echo "  - ($optional) $lib: $answer"
 done
 
-echo -e "\nEnabled hardware drivers:\n${driver_summary}"
+eval echo -e "@Enabled hardware drivers:@@${driver_summary}" | tr @ \\n
 
-echo -e "\nEnabled language bindings:\n"
-echo "  - C++............................. $BINDINGS_CXX"
-echo "  - Python.......................... $BINDINGS_PYTHON"
-echo "  - Java............................ $BINDINGS_JAVA"
+echo -e "Enabled language bindings:\n"
+echo " - C++............................. $BINDINGS_CXX"
+echo " - Python.......................... $BINDINGS_PYTHON"
+echo " - Java............................ $BINDINGS_JAVA"
 echo