Bump version to 0.4.0 (the upcoming next major release).

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 595dafe25623ed48b822b095bbc281b59e6f21e3..15b98d4de1123a407cfa5e4b1fb0c3a26dc0602c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,9 +23,10 @@ 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], [3])
+m4_define([sr_package_version_minor], [4])
 m4_define([sr_package_version_micro], [0])
-m4_define([sr_package_version], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro])
+m4_define([sr_package_version_suffix], [-git])
+m4_define([sr_package_version], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro[]sr_package_version_suffix])
 
 AC_INIT([libsigrok], [sr_package_version], [sigrok-devel@lists.sourceforge.net],
        [libsigrok], [http://www.sigrok.org])
@@ -33,9 +34,6 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
-# We require this to know the target settings if we're cross-compiling.
-AC_CANONICAL_SYSTEM
-
 # We require at least automake 1.11 (needed for 'silent rules').
 AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -48,7 +46,7 @@ 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.
 COMMON_FLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden"
-CFLAGS="$COMMON_FLAGS -Wmissing-prototypes"
+CFLAGS="$COMMON_FLAGS -std=c11 -D_POSIX_C_SOURCE=200112L -Wmissing-prototypes"
 CXXFLAGS="-std=c++11 $COMMON_FLAGS"
 
 # Checks for programs.
@@ -109,6 +107,7 @@ DRIVER([Agilent DMM], [agilent-dmm])
 DRIVER([Appa 55II], [appa-55ii])
 DRIVER([ASIX SIGMA/SIGMA2], [asix-sigma])
 DRIVER([Atten PPS3xxx], [atten-pps3xxx])
+DRIVER([BayLibre ACME], [baylibre-acme])
 DRIVER([BeagleLogic], [beaglelogic])
 DRIVER([Brymen BM86x], [brymen-bm86x])
 DRIVER([Brymen DMM], [brymen-dmm])
@@ -129,6 +128,7 @@ DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus])
 DRIVER([Kecheng KC-330B], [kecheng-kc-330b])
 DRIVER([Lascar EL-USB], [lascar-el-usb])
 DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx])
+DRIVER([maynuo-m97], [maynuo-m97])
 DRIVER([MIC 985xx], [mic-985xx])
 DRIVER([Motech LPS 30x], [motech-lps-30x])
 DRIVER([Norma DMM], [norma-dmm])
@@ -275,7 +275,7 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
 # libserialport is only needed for some hardware drivers. Disable the
 # respective drivers if it is not found.
 if test "x$enable_libserialport" != "xno"; then
-       PKG_CHECK_MODULES([libserialport], [libserialport >= 0.2.0],
+       PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.1],
                [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS";
                LIBS="$LIBS $libserialport_LIBS";
                SR_PKGLIBS="$SR_PKGLIBS libserialport"],
@@ -430,6 +430,12 @@ AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 # build it if these headers aren't available.
 AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"])
 
+# The ACME driver can only be built for Linux.
+case "$host" in
+       *linux*) ;;
+       *) HW_BAYLIBRE_ACME="no" ;;
+esac
+
 AC_SUBST(SR_PKGLIBS)
 
 CFLAGS="$CFLAGS -Iinclude/libsigrok -I${srcdir}/include/libsigrok $LIB_CFLAGS"
@@ -473,6 +479,7 @@ DRIVER2([HW_AGILENT_DMM], [$HW_AGILENT_DMM], [HAVE_HW_AGILENT_DMM])
 DRIVER2([HW_APPA_55II], [$HW_APPA_55II], [HAVE_HW_APPA_55II])
 DRIVER2([HW_ASIX_SIGMA], [$HW_ASIX_SIGMA], [HAVE_HW_ASIX_SIGMA])
 DRIVER2([HW_ATTEN_PPS3XXX], [$HW_ATTEN_PPS3XXX], [HAVE_HW_ATTEN_PPS3XXX])
+DRIVER2([HW_BAYLIBRE_ACME], [$HW_BAYLIBRE_ACME], [HAVE_HW_BAYLIBRE_ACME])
 DRIVER2([HW_BEAGLELOGIC], [$HW_BEAGLELOGIC], [HAVE_HW_BEAGLELOGIC])
 DRIVER2([HW_BRYMEN_BM86X], [$HW_BRYMEN_BM86X], [HAVE_HW_BRYMEN_BM86X])
 DRIVER2([HW_BRYMEN_DMM], [$HW_BRYMEN_DMM], [HAVE_HW_BRYMEN_DMM])
@@ -493,6 +500,7 @@ DRIVER2([HW_IKALOGIC_SCANAPLUS], [$HW_IKALOGIC_SCANAPLUS], [HAVE_HW_IKALOGIC_SCA
 DRIVER2([HW_KECHENG_KC_330B], [$HW_KECHENG_KC_330B], [HAVE_HW_KECHENG_KC_330B])
 DRIVER2([HW_LASCAR_EL_USB], [$HW_LASCAR_EL_USB], [HAVE_HW_LASCAR_EL_USB])
 DRIVER2([HW_MANSON_HCS_3XXX], [$HW_MANSON_HCS_3XXX], [HAVE_HW_MANSON_HCS_3XXX])
+DRIVER2([HW_MAYNUO_M97], [$HW_MAYNUO_M97], [HAVE_HW_MAYNUO_M97])
 DRIVER2([HW_MIC_985XX], [$HW_MIC_985XX], [HAVE_HW_MIC_985XX])
 DRIVER2([HW_MOTECH_LPS_30X], [$HW_MOTECH_LPS_30X], [HAVE_HW_MOTECH_LPS_30X])
 DRIVER2([HW_NORMA_DMM], [$HW_NORMA_DMM], [HAVE_HW_NORMA_DMM])
@@ -557,7 +565,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.2.0" \
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.1" \
        "librevisa >= 0.0.20130412" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \
        "libftdi1 >= 1.0" "libgpib" "glibmm-2.4 >= 2.32.0" \
        "pygobject-3.0 >= 3.0.0" "check >= 0.9.4"