X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=ca387107f8e4e0668ea7ce7f12a59d72e6d89348;hp=1adcdaefcb22374445253b2de6a1c7a29c7a28ef;hb=a6b52878af14944b52ed202478f038b1abcb0d07;hpb=50bd5d259677faf87bb3408e111d0e833d7ba9b4 diff --git a/configure.ac b/configure.ac index 1adcdae..ca38710 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,8 @@ AC_PREREQ([2.63]) # libsigrokdecode package version number (NOT the same as shared lib version!). m4_define([srd_package_version_major], [0]) -m4_define([srd_package_version_minor], [1]) -m4_define([srd_package_version_micro], [1]) +m4_define([srd_package_version_minor], [2]) +m4_define([srd_package_version_micro], [0]) m4_define([srd_package_version], [srd_package_version_major.srd_package_version_minor.srd_package_version_micro]) AC_INIT([libsigrokdecode], [srd_package_version], @@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([autostuff]) AC_CONFIG_AUX_DIR([autostuff]) # We require at least automake 1.11 (needed for 'silent rules'). -AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news]) +AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news color-tests]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -52,6 +52,9 @@ AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S +# Required for per-target flags or subdir-objects with C sources. +AM_PROG_CC_C_O + # Initialize libtool. LT_INIT @@ -63,8 +66,8 @@ PKG_PROG_PKG_CONFIG([0.22]) # 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 -SRD_LIB_VERSION_CURRENT=0 -SRD_LIB_VERSION_REVISION=1 +SRD_LIB_VERSION_CURRENT=1 +SRD_LIB_VERSION_REVISION=0 SRD_LIB_VERSION_AGE=0 SRD_LIB_VERSION="$SRD_LIB_VERSION_CURRENT:$SRD_LIB_VERSION_REVISION:$SRD_LIB_VERSION_AGE" SRD_LIB_LDFLAGS="-version-info $SRD_LIB_VERSION" @@ -114,6 +117,12 @@ esac AC_SUBST(CPPFLAGS_PYTHON) AC_SUBST(LDFLAGS_PYTHON) +# The Check unit testing framework is optional. Disable if not found. +PKG_CHECK_MODULES([check], [check >= 0.9.4], + [have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS"; + LIBS="$LIBS $check_LIBS"], [have_check="no"]) +AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") + # Checks for header files. # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h. # AC_CHECK_HEADERS([]) @@ -148,40 +157,10 @@ AC_SUBST(SRD_PACKAGE_VERSION_MICRO) AC_SUBST(SRD_PACKAGE_VERSION) AC_CONFIG_FILES([Makefile - sigrokdecode.h + version.h libsigrokdecode.pc contrib/Makefile - decoders/Makefile - decoders/avr_isp/Makefile - decoders/can/Makefile - decoders/dcf77/Makefile - decoders/ds1307/Makefile - decoders/edid/Makefile - decoders/i2c/Makefile - decoders/i2cdemux/Makefile - decoders/i2cfilter/Makefile - decoders/i2s/Makefile - decoders/jtag/Makefile - decoders/jtag_stm32/Makefile - decoders/lm75/Makefile - decoders/lpc/Makefile - decoders/maxim_ds28ea00/Makefile - decoders/mlx90614/Makefile - decoders/mx25lxx05d/Makefile - decoders/mxc6225xu/Makefile - decoders/nunchuk/Makefile - decoders/onewire_link/Makefile - decoders/onewire_network/Makefile - decoders/pan1321/Makefile - decoders/rtc8564/Makefile - decoders/sdcard_spi/Makefile - decoders/spi/Makefile - decoders/tlc5620/Makefile - decoders/transitioncounter/Makefile - decoders/uart/Makefile - decoders/uart_dump/Makefile - decoders/usb_protocol/Makefile - decoders/usb_signalling/Makefile + tests/Makefile ]) AC_OUTPUT @@ -199,7 +178,7 @@ echo "Detected libraries:" echo # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0 >= 2.24.0"; do +for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4"; do if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib` answer="yes ($ver)"