X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=3aa73d4849a234432e422c585bf0de82c4b1b2c3;hb=1bb196e4969b299d316bdcff2201a44dd517f240;hp=dc4771e7a9797fbc6ed08337ee214c96b22937ed;hpb=aafcb3fe87809d3e6d12b9a440adccf516fb3eb5;p=libsigrok.git diff --git a/configure.ac b/configure.ac index dc4771e7..3aa73d48 100644 --- a/configure.ac +++ b/configure.ac @@ -21,17 +21,12 @@ # We require at least autoconf 2.63 (AC_INIT format changed there). AC_PREREQ([2.63]) -# libsigrok package version number (NOT the same as shared lib version!). -m4_define([sr_package_version_major], [0]) -m4_define([sr_package_version_minor], [4]) -m4_define([sr_package_version_micro], [0]) - -AC_INIT([libsigrok], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro], +AC_INIT([libsigrok], [0.4.0], [sigrok-devel@lists.sourceforge.net], [libsigrok], [http://www.sigrok.org]) -AC_CONFIG_HEADERS([config.h include/libsigrok/version.h]) -AC_CONFIG_MACRO_DIR([autostuff]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([autostuff]) +AC_CONFIG_HEADERS([config.h include/libsigrok/version.h]) # We require at least automake 1.11 (needed for 'silent rules'). AM_INIT_AUTOMAKE([1.11 -Wall -Werror no-define nostdinc subdir-objects check-news color-tests]) @@ -45,7 +40,6 @@ 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" @@ -62,51 +56,14 @@ AM_PROG_CC_C_O # Initialize libtool. LT_INIT -CONFIG_STATUS_DEPENDENCIES= -SR_PACKAGE_VERSION="AC_PACKAGE_VERSION" - -# Check if we can get revision information from git. -sr_head=`git -C "$srcdir" rev-parse --verify --short HEAD 2>&AS_MESSAGE_LOG_FD` - -AS_IF([test "$?" -eq 0 && test -n "$sr_head"], [ - sr_git_deps= - test ! -f "$srcdir/.git/HEAD" || sr_git_deps=' $(top_srcdir)/.git/HEAD' - - sr_head_name=`git -C "$srcdir" rev-parse --symbolic-full-name HEAD 2>&AS_MESSAGE_LOG_FD` - AS_IF([test "$?" -eq 0 && test -f "$srcdir/.git/$sr_head_name"], - [sr_git_deps="$sr_git_deps \$(top_srcdir)/.git/$sr_head_name"]) - - # Use $(wildcard) so that things do not break if for whatever - # reason these files do not exist anymore at make time. - test -z "$sr_git_deps" || CONFIG_STATUS_DEPENDENCIES="\$(wildcard$sr_git_deps)" - - # Append the revision hash unless we are exactly on a tagged release. - git -C "$srcdir" describe --match 'AC_PACKAGE_NAME-AC_PACKAGE_VERSION' \ - --exact-match >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD \ - || SR_PACKAGE_VERSION="$SR_PACKAGE_VERSION-git-$sr_head" -]) -AC_SUBST([CONFIG_STATUS_DEPENDENCIES]) -AC_SUBST([SR_PACKAGE_VERSION]) - -AC_DEFINE([SR_PACKAGE_VERSION_MAJOR], [sr_package_version_major], [.]) -AC_DEFINE([SR_PACKAGE_VERSION_MINOR], [sr_package_version_minor], [.]) -AC_DEFINE([SR_PACKAGE_VERSION_MICRO], [sr_package_version_micro], [.]) -AC_DEFINE_UNQUOTED([SR_PACKAGE_VERSION_STRING], ["$SR_PACKAGE_VERSION"], [.]) +# Set up the libsigrok version defines. +SR_PKG_VERSION_SET([SR_PACKAGE_VERSION], [AC_PACKAGE_VERSION]) # Library version for libsigrok (NOT the same as the package version). # Carefully read the libtool docs before updating these numbers! # The algorithm for determining which number to change (and how) is nontrivial! # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info -SR_LIB_VERSION_CURRENT=2 -SR_LIB_VERSION_REVISION=0 -SR_LIB_VERSION_AGE=0 -AC_SUBST([SR_LIB_VERSION], - ["$SR_LIB_VERSION_CURRENT:$SR_LIB_VERSION_REVISION:$SR_LIB_VERSION_AGE"]) - -AC_DEFINE_UNQUOTED([SR_LIB_VERSION_CURRENT], [$SR_LIB_VERSION_CURRENT], [.]) -AC_DEFINE_UNQUOTED([SR_LIB_VERSION_REVISION], [$SR_LIB_VERSION_REVISION], [.]) -AC_DEFINE_UNQUOTED([SR_LIB_VERSION_AGE], [$SR_LIB_VERSION_AGE], [.]) -AC_DEFINE_UNQUOTED([SR_LIB_VERSION_STRING], ["$SR_LIB_VERSION"], [.]) +SR_LIB_VERSION_SET([SR_LIB_VERSION], [2:0:0]) ############################# ## Optional dependencies ## @@ -116,54 +73,17 @@ AC_DEFINE_UNQUOTED([SR_LIB_VERSION_STRING], ["$SR_LIB_VERSION"], [.]) # 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_VAR_OPT_PKG([SR_PKGLIBS], [sr_deps_avail]) SR_PKGLIBS_CHECK= 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]) @@ -192,13 +112,14 @@ SR_PKG_CHECK([check], [SR_PKGLIBS_CHECK], [check >= 0.9.4]) AM_CONDITIONAL([HAVE_CHECK], [test "x$sr_have_check" = xyes]) AC_LANG([C]) +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])]) # RPC is only needed for VXI support. AC_CACHE_CHECK([for RPC support], [sr_cv_have_rpc], @@ -216,7 +137,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. @@ -245,8 +166,7 @@ m4_define([_SR_DRIVER], [ AS_IF([test -n "$sr_deps_missing"], [$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.])]) @@ -306,6 +226,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]])], @@ -332,7 +253,7 @@ 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(, [[Missing macro AX_CXX_COMPILE_STDCXX_11: no C++11 check possible]])]) + [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" # The C++ bindings need glibmm. @@ -391,7 +312,7 @@ PKG_CHECK_EXISTS([pygobject-3.0 < 3.7.91], HAVE_PYMOD_SETUPTOOLS=yes m4_ifdef([AX_PYTHON_MODULE], [AX_PYTHON_MODULE([setuptools])], - [m4_warn(, [[Missing macro AX_PYTHON_MODULE: no setuptools check]])]) + [m4_warn([unsupported], [Missing macro AX_PYTHON_MODULE: no setuptools check])]) test "x$HAVE_PYMOD_SETUPTOOLS" = xyes \ || sr_python_missing="$sr_python_missing Setuptools" @@ -508,6 +429,8 @@ libsigrok configuration summary: - Prefix.......................... $prefix - Building on..................... $build - Building for.................... $host + - C compiler warnings............. $SR_WFLAGS + - C++ compiler warnings........... $SR_WXXFLAGS Detected libraries (required): - glib-2.0 >= 2.32.0.............. $sr_glib_version @@ -515,10 +438,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