X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d2faf59a42552e12731d4547a77cf5ac0b14ea40;hb=1d67cfb4eaa3884ded5d78d3ac53d19c9ee45ecb;hp=971f9a7e91639140600391ab9858fc7d4b3c4fae;hpb=abc7146d032d41af41e8bd20ea64554021e86656;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 971f9a7e..d2faf59a 100644
--- 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.
 
@@ -177,20 +181,26 @@ 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"
+	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"
+	BINDINGS_CXX="no"; cxx_msg="gccxml required"
+fi
+
+# Python is needed for the C++ bindings.
+AC_CHECK_PROG([HAVE_PYTHON], [python], [yes])
+if test "x$HAVE_PYTHON" != "xyes"; then
+	BINDINGS_CXX="no"; cxx_msg="Python required"
 fi
 
-# Python is needed for the C++ (and Python) bindings.
-PKG_CHECK_MODULES([python], [python3 >= 2.7],
+# The Python bindings need Python development files
+PKG_CHECK_MODULES([python], [python >= 2.7],
         [CXXFLAGS="$CXXFLAGS $python_CFLAGS";
         CXXLIBS="$CXXLIBS $python_LIBS"],
-		[BINDINGS_CXX="no"])
+		[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])],
@@ -200,14 +210,25 @@ m4_ifdef([AX_PYTHON_MODULE], [AX_PYTHON_MODULE([pygccxml])],
 		AC_MSG_NOTICE([Missing macro m4_toupper(aX_PYTHON_MODULE), no pygccxml check])]
 )
 if test "x$HAVE_PYMOD_PYGCCXML" != "xyes"; then
-	BINDINGS_CXX="no"
+	BINDINGS_CXX="no"; cxx_msg="Python pygccxml module required"
 fi
 
-# Python and Java bindings depend on C++ bindings.
+# The Python bindings need the setuptools Python module.
+m4_ifdef([AX_PYTHON_MODULE], [AX_PYTHON_MODULE([setuptools])],
+	# We'll let it go through even if the macro wasn't found, the python
+	# module may still be there.
+	[HAVE_PYTHON_SETUPTOOLS="yes";
+		AC_MSG_NOTICE([Missing macro m4_toupper(aX_PYTHON_MODULE), no setuptools check])]
+)
+if test "x$HAVE_PYMOD_SETUPTOOLS" != "xyes"; then
+	BINDINGS_PYTHON="no"; python_msg="Python setuptools module required"
+fi
 
-if test "x$BINDINGS_CXX" != "xyes"; then
-	BINDINGS_PYTHON="no"
-	BINDINGS_JAVA="no"
+# The Python and Java bindings use swig to generate code.
+AC_CHECK_PROG([HAVE_SWIG], [swig], [yes])
+if test "x$HAVE_SWIG" != "xyes"; then
+	BINDINGS_PYTHON="no"; python_msg="swig required"
+	BINDINGS_JAVA="no"; java_msg="swig required"
 fi
 
 # Checks for libraries.
@@ -362,17 +383,18 @@ fi
 # glibmm-2.4 is needed for the C++ bindings.
 PKG_CHECK_MODULES([glibmm], [glibmm-2.4 >= 2.32.0],
 	[CXXFLAGS="$CXXFLAGS $glibmm_CFLAGS";
-	CXXLIBS="$CXXLIBS $glibmm_LIBS"], [BINDINGS_CXX="no"])
+	CXXLIBS="$CXXLIBS $glibmm_LIBS"],
+	[BINDINGS_CXX="no"; cxx_msg="glibmm required"])
 
 # 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],
 		[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"])
+	[BINDINGS_PYTHON="no"; python_msg="Python pygobject module required"])
 
 # The Check unit testing framework is optional. Disable if not found.
 PKG_CHECK_MODULES([check], [check >= 0.9.4],
@@ -403,7 +425,13 @@ if test "x$HAVE_JAVAC" = "xyes"; then
 		CXXFLAGS="$CXXFLAGS -I$JNI_INCLUDE_DIR"
 	done
 else
-	BINDINGS_JAVA="no"
+	BINDINGS_JAVA="no"; java_msg="Java compiler required"
+fi
+
+# Python and Java bindings depend on C++ bindings.
+if test "x$BINDINGS_CXX" != "xyes"; then
+	BINDINGS_PYTHON="no"; python_msg="C++ bindings required"
+	BINDINGS_JAVA="no"; java_msg="C++ bindings required"
 fi
 
 # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers.
@@ -428,6 +456,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 +670,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 +683,36 @@ 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
+
+# Prepare final bindings report messages
+final_cxx=""
+final_python=""
+final_java=""
+if test "$enable_bindings" = "no"; then
+	final_cxx=" (disabled)"
+	final_python=" (disabled)"
+	final_java=" (disabled)"
+else
+	if test "$enable_cxx" = "no"; then
+		final_cxx=" (disabled)"
+	elif test "$BINDINGS_CXX" = "no"; then
+		final_cxx=" ($cxx_msg)"
+	fi
+	if test "$enable_python" = "no"; then
+		final_python=" (disabled)"
+	elif test "$BINDINGS_PYTHON" = "no"; then
+		final_python=" ($python_msg)"
+	fi
+	if test "$enable_java" = "no"; then
+		final_java=" (disabled)"
+	elif test "$BINDINGS_JAVA" = "no"; then
+		final_java=" ($java_msg)"
+	fi
+fi
 
-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$final_cxx"
+echo " - Python.......................... $BINDINGS_PYTHON$final_python"
+echo " - Java............................ $BINDINGS_JAVA$final_java"
 echo