X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c75de749a058657e0d55b61e038aa8620e0a23ac;hb=8006cdc53d4f52f055559b95986b13c3c3826745;hp=b42d6920ddffebc6e5338f6f8d4f4ebb93c4bfbf;hpb=24138539c1a11dd221443317b4941f151bcbdb12;p=libsigrok.git diff --git a/configure.ac b/configure.ac index b42d6920..c75de749 100644 --- a/configure.ac +++ b/configure.ac @@ -37,16 +37,8 @@ AH_TOP([#ifndef SR_CONFIG_H #define SR_CONFIG_H /* To stop multiple inclusions. */]) AH_BOTTOM([#endif /* SR_CONFIG_H */]) -# Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden -# and enforce use of SR_API to explicitly mark all public API functions. -CFLAGS="$CFLAGS -std=c11" -CFLAGS="$CFLAGS -Wall -Wextra -Wmissing-prototypes" -CFLAGS="$CFLAGS -fvisibility=hidden" -CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200112L" - # Checks for programs. AC_PROG_CC -AC_PROG_CPP AC_PROG_CXX AC_PROG_INSTALL AC_PROG_LN_S @@ -74,59 +66,22 @@ SR_LIB_VERSION_SET([SR_LIB_VERSION], [2:0:0]) # We require at least 0.22, as "Requires.private" behaviour changed there. PKG_PROG_PKG_CONFIG([0.22]) -# This variable collects the pkg-config module names of all dependencies. +# Keep track of all checked modules so we can list them at the end. +SR_PKG_CHECK_SUMMARY([sr_pkglibs_summary]) + +# Collect the pkg-config module names of all dependencies in SR_PKGLIBS. # These are used to derive the compiler flags and for the "Requires.private" # field in the generated libsigrok.pc file. -SR_PKGLIBS= -SR_PKGLIBS_CHECK= +SR_VAR_OPT_PKG([SR_PKGLIBS], [sr_deps_avail]) +SR_PKGLIBS_TESTS= SR_PKGLIBS_CXX= SR_PKGLIBS_PYTHON= -# Keep track of all checked modules so we can list them at the end. -sr_pkglibs_summary= -sr_nl=' -' -## SR_PKG_CHECK(tag, [collect-var], module...) -m4_define([SR_PKG_CHECK], [ - sr_mod_leader=`printf '%.32s' "$3................................"` - PKG_CHECK_EXISTS([$3], [ - sr_have_$1=yes - m4_ifval([$2], [$2="[$]$2[$]{$2:+ }$3"]) - sr_$1_version=`$PKG_CONFIG --modversion "$3" 2>&AS_MESSAGE_LOG_FD` - AS_VAR_APPEND([sr_pkglibs_summary], [" - $sr_mod_leader $sr_$1_version$sr_nl"]) - ], [ - AS_VAR_APPEND([sr_pkglibs_summary], [" - $sr_mod_leader no$sr_nl"]) - m4_ifval([$4], - [SR_PKG_CHECK([$1], [$2], m4_shift3($@))], - [sr_have_$1=no sr_$1_version=]) - ]) -]) - -# List of detected features. -sr_deps_avail= - -## SR_ARG_OPT_PKG(opt-name, [cpp-name], [cond-name], module...) -m4_define([SR_ARG_OPT_PKG], [ - AC_ARG_WITH([$1], [AS_HELP_STRING([--without-$1], - [disable $1 support [default=detect]])]) - AS_IF([test "x$with_$1" = xno], [sr_have_$1=no], - [test "x$sr_have_$1" != xyes], - [SR_PKG_CHECK([$1], [SR_PKGLIBS], m4_shift3($@))]) - AS_IF([test "x$with_$1$sr_have_$1" = xyesno], - [AC_MSG_ERROR([$1 support requested, but it was not found.])]) - AS_IF([test "x$sr_have_$1" = xyes], - [sr_deps_avail="$sr_deps_avail $1"[]m4_ifval([$2], [ - AC_DEFINE([HAVE_$2], [1], [Whether $1 is available.]) - AC_DEFINE_UNQUOTED([CONF_$2_VERSION], ["$sr_$1_version"], [Build-time version of $1.]) - ])]) - m4_ifval([$3], [AM_CONDITIONAL([$3], [test "x$sr_have_$1" = xyes])]) -]) - SR_ARG_OPT_PKG([libserialport], [LIBSERIALPORT], [NEED_SERIAL], [libserialport >= 0.1.1]) SR_ARG_OPT_PKG([libftdi], [LIBFTDI],, - [libftdi >= 0.16], [libftdi1 >= 1.0]) + [libftdi1 >= 1.0], [libftdi >= 0.16]) # FreeBSD comes with an "integrated" libusb-1.0-style USB API. # This means libusb-1.0 is always available; no need to check for it. @@ -146,17 +101,31 @@ SR_ARG_OPT_PKG([libgpib], [LIBGPIB], [NEED_GPIB], ###################### # The Check unit testing framework is optional. Disable if not found. -SR_PKG_CHECK([check], [SR_PKGLIBS_CHECK], [check >= 0.9.4]) +SR_PKG_CHECK([check], [SR_PKGLIBS_TESTS], [check >= 0.9.4]) AM_CONDITIONAL([HAVE_CHECK], [test "x$sr_have_check" = xyes]) AC_LANG([C]) +# Enable the C99 standard if possible, and enforce the use +# of SR_API to explicitly mark all public API functions. +SR_EXTRA_CFLAGS= +SR_CHECK_COMPILE_FLAGS([SR_EXTRA_CFLAGS], [C99], [-std=c99 -c99 -AC99 -qlanglvl=extc99]) +SR_CHECK_COMPILE_FLAGS([SR_EXTRA_CFLAGS], [visibility], [-fvisibility=hidden]) + +SR_ARG_ENABLE_WARNINGS([SR_WFLAGS], [-Wall], [-Wall -Wextra -Wmissing-prototypes]) + # Check host characteristics. AC_C_BIGENDIAN -AC_CHECK_HEADERS([sys/mman.h], [sr_deps_avail="$sr_deps_avail sys_mman_h"]) -AC_CHECK_HEADERS([sys/ioctl.h], [sr_deps_avail="$sr_deps_avail sys_ioctl_h"]) -AC_CHECK_HEADERS([sys/timerfd.h], [sr_deps_avail="$sr_deps_avail sys_timerfd_h"]) +AC_CHECK_HEADERS([sys/mman.h], [SR_APPEND([sr_deps_avail], [sys_mman_h])]) +AC_CHECK_HEADERS([sys/ioctl.h], [SR_APPEND([sr_deps_avail], [sys_ioctl_h])]) +AC_CHECK_HEADERS([sys/timerfd.h], [SR_APPEND([sr_deps_avail], [sys_timerfd_h])]) + +# We need to link against the Winsock2 library for SCPI over TCP. +AS_CASE([$host], [*-mingw*], [SR_EXTRA_LIBS='-lws2_32'], [SR_EXTRA_LIBS=]) + +# libm (the standard math library) is always needed. +SR_SEARCH_LIBS([SR_EXTRA_LIBS], [pow], [m]) # RPC is only needed for VXI support. AC_CACHE_CHECK([for RPC support], [sr_cv_have_rpc], @@ -174,7 +143,7 @@ AM_CONDITIONAL([NEED_RPC], [test "x$sr_cv_have_rpc" = xyes]) ######################## # Keep track of all drivers so we can list them at the end. -sr_driver_summary= +SR_VAR_SUMMARY([sr_driver_summary]) # Check whether the sr_deps_avail list contains all of the arguments. # Unavailable dependencies are collected in sr_deps_missing. @@ -183,8 +152,9 @@ sr_check_driver_deps() { for sr_dep do AS_CASE([" $sr_deps_avail "], [*" $sr_dep "*],, - [sr_deps_missing="$sr_deps_missing $sr_dep"]) + [SR_APPEND([sr_deps_missing], [', '], [$sr_dep])]) done + test -z "$sr_deps_missing" || return 1 } AC_ARG_ENABLE([all-drivers], @@ -199,12 +169,10 @@ m4_define([_SR_DRIVER], [ [$3=$enableval], [$3=$enable_all_drivers]) AS_IF([test "x[$]$3" = xyes], [sr_hw_info=yes[]m4_ifval([$4], [ - sr_check_driver_deps $4 - AS_IF([test -n "$sr_deps_missing"], - [$3=no sr_hw_info="no (missing:$sr_deps_missing)"]) + sr_check_driver_deps $4 \ + || $3=no sr_hw_info="no (missing: $sr_deps_missing)" ])], [sr_hw_info='no (disabled)']) - sr_hw_leader=`printf '%.32s' "$2................................"` - AS_VAR_APPEND([sr_driver_summary], [" - $sr_hw_leader $sr_hw_info$sr_nl"]) + sr_driver_summary_append "$2" "$sr_hw_info" AM_CONDITIONAL([$3], [test "x[$]$3" = xyes]) AM_COND_IF([$3], [AC_DEFINE([HAVE_$3], [1], [Whether to support $1 device.])]) @@ -237,6 +205,7 @@ SR_DRIVER([Hantek DSO], [hantek-dso], [libusb]) SR_DRIVER([Ikalogic Scanalogic-2], [ikalogic-scanalogic2], [libusb]) SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus], [libftdi]) SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb]) +SR_DRIVER([KERN scale], [kern-scale], [libserialport]) SR_DRIVER([Lascar EL-USB], [lascar-el-usb], [libusb]) SR_DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx], [libserialport]) SR_DRIVER([maynuo-m97], [maynuo-m97]) @@ -264,6 +233,7 @@ SR_DRIVER([ZEROPLUS Logic Cube], [zeroplus-logic-cube], [libusb]) ############################### AC_LANG([C++]) +SR_ARG_ENABLE_WARNINGS([SR_WXXFLAGS], [-Wall], [-Wall -Wextra]) AC_ARG_ENABLE([bindings], [AS_HELP_STRING([--enable-bindings], [build language bindings [default=yes]])], @@ -288,23 +258,25 @@ AC_ARG_ENABLE([java], sr_cxx_missing= # Check if the C++ compiler supports the C++11 standard. -m4_ifdef([AX_CXX_COMPILE_STDCXX_11], - [AX_CXX_COMPILE_STDCXX_11(, [optional])], - [m4_warn([unsupported], [Missing macro AX_CXX_COMPILE_STDCXX_11: no C++11 check possible])]) -test "x$HAVE_CXX11" = x1 || sr_cxx_missing="$sr_cxx_missing C++11" +AX_CXX_COMPILE_STDCXX_11([noext], [optional]) +AS_IF([test "x$HAVE_CXX11" != x1], + [SR_APPEND([sr_cxx_missing], [', '], ['C++11'])]) # The C++ bindings need glibmm. SR_PKG_CHECK([glibmm], [SR_PKGLIBS_CXX], [glibmm-2.4 >= 2.32.0]) -test "x$sr_have_glibmm" = xyes || sr_cxx_missing="$sr_cxx_missing glibmm" +AS_IF([test "x$sr_have_glibmm" != xyes], + [SR_APPEND([sr_cxx_missing], [', '], [glibmm])]) # The C++ bindings use Doxygen to parse libsigrok symbols. AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes], [no]) -test "x$HAVE_DOXYGEN" = xyes || sr_cxx_missing="$sr_cxx_missing Doxygen" +AS_IF([test "x$HAVE_DOXYGEN" != xyes], + [SR_APPEND([sr_cxx_missing], [', '], [Doxygen])]) # Python is needed for the C++ bindings. AM_PATH_PYTHON([2.7], [HAVE_PYTHON=yes], - [HAVE_PYTHON=no sr_cxx_missing="$sr_cxx_missing Python"]) + [HAVE_PYTHON=no + SR_APPEND([sr_cxx_missing], [', '], [Python])]) AS_IF([test -z "$sr_cxx_missing"], [BINDINGS_CXX=$enable_cxx], [BINDINGS_CXX=no]) @@ -325,19 +297,20 @@ AM_COND_IF([BINDINGS_CXX], [ ## Python bindings ## ####################### -sr_python_missing= -test "x$BINDINGS_CXX" = xyes || sr_python_missing=" C++ bindings" +AS_IF([test "x$BINDINGS_CXX" = xyes], + [sr_python_missing=], + [sr_python_missing='C++ bindings']) # The Python bindings need Python development files. SR_PKG_CHECK([python_dev], [SR_PKGLIBS_PYTHON], [python >= 2.7], [python2 >= 2.7], [python27 >= 2.7]) -test "x$sr_have_python_dev" = xyes \ - || sr_python_missing="$sr_python_missing Headers" +AS_IF([test "x$sr_have_python_dev" != xyes], + [SR_APPEND([sr_python_missing], [', '], [Headers])]) # PyGObject is needed for the Python bindings. SR_PKG_CHECK([pygobject], [SR_PKGLIBS_PYTHON], [pygobject-3.0 >= 3.0.0]) -test "x$sr_have_python_dev" = xyes \ - || sr_python_missing="$sr_python_missing PyGObject" +AS_IF([test "x$sr_have_pygobject" != xyes], + [SR_APPEND([sr_python_missing], [', '], [PyGObject])]) PKG_CHECK_EXISTS([pygobject-3.0 < 3.7.91], [AC_DEFINE([PYGOBJECT_FLAGS_SIGNED], [1], @@ -350,12 +323,13 @@ HAVE_PYMOD_SETUPTOOLS=yes m4_ifdef([AX_PYTHON_MODULE], [AX_PYTHON_MODULE([setuptools])], [m4_warn([unsupported], [Missing macro AX_PYTHON_MODULE: no setuptools check])]) -test "x$HAVE_PYMOD_SETUPTOOLS" = xyes \ - || sr_python_missing="$sr_python_missing Setuptools" +AS_IF([test "x$HAVE_PYMOD_SETUPTOOLS" != xyes], + [SR_APPEND([sr_python_missing], [', '], [setuptools])]) # The Python bindings use SWIG to generate code. -AC_CHECK_PROGS([SWIG], [swig swig2.0 swig3.0], [no]) -test "x$SWIG" != xno || sr_python_missing="$sr_python_missing SWIG" +AC_CHECK_PROGS([SWIG], [swig swig3.0 swig2.0]) +AS_IF([test "x$SWIG" = x], + [SR_APPEND([sr_python_missing], [', '], [SWIG])]) AS_IF([test -z "$sr_python_missing"], [BINDINGS_PYTHON=$enable_python], [BINDINGS_PYTHON=no]) @@ -365,15 +339,18 @@ AM_CONDITIONAL([BINDINGS_PYTHON], [test "x$BINDINGS_PYTHON" = xyes]) ## Java bindings ## #################### -sr_java_missing= -test "x$BINDINGS_CXX" = xyes || sr_java_missing=" C++ bindings" +AS_IF([test "x$BINDINGS_CXX" = xyes], + [sr_java_missing=], + [sr_java_missing='C++ bindings']) # The Java bindings use SWIG to generate code. -test "x$SWIG" != xno || sr_java_missing="$sr_java_missing SWIG" +AS_IF([test "x$SWIG" = x], + [SR_APPEND([sr_java_missing], [', '], [SWIG])]) # Find Java compiler and JNI includes for Java bindings. AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no]) -test "x$HAVE_JAVAC" = xyes || sr_java_missing="$sr_java_missing JavaC" +AS_IF([test "x$HAVE_JAVAC" = xno], + [SR_APPEND([sr_java_missing], [', '], [JavaC])]) AC_ARG_WITH([jni-include-path], [AS_HELP_STRING([[--with-jni-include-path=DIR-LIST (space-separated)]], @@ -394,13 +371,14 @@ AS_IF([test "x$enable_java$HAVE_JAVAC" = xyesyes], [ ]) for sr_dir in $JNI_INCLUDE_DIRS do - JNI_CPPFLAGS="$JNI_CPPFLAGS -I$sr_dir" + SR_APPEND([JNI_CPPFLAGS], ["-I$sr_dir"]) done AC_SUBST([JNI_CPPFLAGS]) sr_save_cppflags=$CPPFLAGS -CPPFLAGS=$CPPFLAGS$JNI_CPPFLAGS -AC_CHECK_HEADER([jni.h],, [sr_java_missing="$sr_java_missing JNI headers"]) +SR_APPEND([CPPFLAGS], [$JNI_CPPFLAGS]) +AC_CHECK_HEADER([jni.h],, + [SR_APPEND([sr_java_missing], [', '], ['JNI headers'])]) CPPFLAGS=$sr_save_cppflags AS_IF([test -z "$sr_java_missing"], @@ -412,13 +390,13 @@ AM_CONDITIONAL([BINDINGS_JAVA], [test "x$BINDINGS_JAVA" = xyes]) ############################## # Add mandatory dependencies to module list. -SR_PKGLIBS="$SR_PKGLIBS${SR_PKGLIBS:+ }libzip >= 0.10" +SR_APPEND([SR_PKGLIBS], ['libzip >= 0.10']) AC_SUBST([SR_PKGLIBS]) # Retrieve the compile and link flags for all modules combined. # Also, bail out at this point if any module dependency is not met. PKG_CHECK_MODULES([LIBSIGROK], [glib-2.0 >= 2.32.0 $SR_PKGLIBS]) -PKG_CHECK_MODULES([CHECK], [$SR_PKGLIBS_CHECK glib-2.0 $SR_PKGLIBS]) +PKG_CHECK_MODULES([TESTS], [$SR_PKGLIBS_TESTS glib-2.0 $SR_PKGLIBS]) # SR_PKGLIBS_CXX may be empty, so only invoke these checks when # the C++ bindings are enabled. @@ -434,18 +412,6 @@ AC_DEFINE_UNQUOTED([CONF_LIBZIP_VERSION], ["$sr_libzip_version"], AC_DEFINE_UNQUOTED([CONF_HOST], ["$host"], [The canonical host libsigrok will run on.]) -AC_LANG([C]) - -# libm (the standard math library) is always needed. -AC_SEARCH_LIBS([pow], [m]) - -# We need to link against the Winsock2 library for SCPI over TCP. -AS_CASE([$host], [*mingw*], [LIBS="$LIBS -lws2_32"]) - -AC_SUBST([FIRMWARE_DIR], ['$(datadir)/sigrok-firmware']) -AC_SUBST([MAKEFLAGS], ['--no-print-directory']) -AC_SUBST([AM_LIBTOOLFLAGS], ['--silent']) - AC_CONFIG_FILES([Makefile libsigrok.pc bindings/cxx/libsigrokcxx.pc]) AC_OUTPUT @@ -453,7 +419,7 @@ AC_OUTPUT # Prepare bindings report messages. m4_define([SR_PREPARE_BINDING_REPORT], [ sr_report_$1= - test -z "$sr_$1_missing" || sr_report_$1=" (missing:$sr_$1_missing)" + test -z "$sr_$1_missing" || sr_report_$1=" (missing: $sr_$1_missing)" test "x$enable_$1" = xyes || sr_report_$1=' (disabled)' ]) m4_map_args([SR_PREPARE_BINDING_REPORT], [cxx], [python], [java]) @@ -466,6 +432,9 @@ libsigrok configuration summary: - Prefix.......................... $prefix - Building on..................... $build - Building for.................... $host + - Additional C compiler flags..... $SR_EXTRA_CFLAGS + - C compiler warnings............. $SR_WFLAGS + - C++ compiler warnings........... $SR_WXXFLAGS Detected libraries (required): - glib-2.0 >= 2.32.0.............. $sr_glib_version @@ -473,10 +442,8 @@ Detected libraries (required): Detected libraries (optional): $sr_pkglibs_summary - Enabled hardware drivers: $sr_driver_summary - Enabled SCPI backends: - TCP............................. yes - RPC............................. $sr_cv_have_rpc