X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=3eccf89dc2071d6817db4c52aeeca011fd7d7549;hb=176c7219bbb509d8e3e149315db7db6bd2fb9655;hp=bc9ce7128aaab2c50e4a3cd3fa98b39cb964ea4a;hpb=8d80146722786dc682ee7fa8cf168ab6f06a8271;p=libsigrok.git diff --git a/configure.ac b/configure.ac index bc9ce712..3eccf89d 100644 --- 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]) @@ -45,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. @@ -127,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]) @@ -428,6 +430,10 @@ 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 BayLibre ACME driver needs sys/timerfd.h. Don't try to build it if +# this header isn't available. +AC_CHECK_HEADERS([sys/timerfd.h], [], [HW_BAYLIBRE_ACME="no"]) + # The ACME driver can only be built for Linux. case "$host" in *linux*) ;; @@ -498,6 +504,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])