X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=75e6dc6c6d5b2122834d5e8c61a73d9dbac03e1b;hb=4cf2f34f430be5d38a7973c31f811fdb15a58329;hp=86ead343dbe21a8c42476f1c82180532ea3ec25e;hpb=3f03ffaf2f7c9c65d0bf35e611df8fb720ed0e8c;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 86ead343..75e6dc6c 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 ## @@ -192,6 +149,7 @@ 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 @@ -306,6 +264,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 +291,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,12 +350,12 @@ 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" # The Python bindings use SWIG to generate code. -AC_CHECK_PROGS([SWIG], [swig swig2.0], [no]) +AC_CHECK_PROGS([SWIG], [swig swig2.0 swig3.0], [no]) test "x$SWIG" != xno || sr_python_missing="$sr_python_missing SWIG" AS_IF([test -z "$sr_python_missing"], @@ -508,6 +467,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