X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=f56803b9eccbb1c771fe63c9114206b5d139f8b9;hp=46f854db51c7d133d73371ea0f9018a92466716f;hb=0169f19c53e195df2f96c4df731ad3214c59e20a;hpb=845f0d4031780220451037e87885e1ff79670976 diff --git a/configure.ac b/configure.ac index 46f854d..f56803b 100644 --- a/configure.ac +++ b/configure.ac @@ -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 @@ -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([]) @@ -157,15 +166,18 @@ AC_CONFIG_FILES([Makefile decoders/dcf77/Makefile decoders/ds1307/Makefile decoders/edid/Makefile + decoders/guess_bitrate/Makefile decoders/i2c/Makefile decoders/i2cdemux/Makefile decoders/i2cfilter/Makefile decoders/i2s/Makefile + decoders/i2s_dump/Makefile decoders/jtag/Makefile decoders/jtag_stm32/Makefile decoders/lm75/Makefile decoders/lpc/Makefile decoders/maxim_ds28ea00/Makefile + decoders/midi/Makefile decoders/mlx90614/Makefile decoders/mx25lxx05d/Makefile decoders/mxc6225xu/Makefile @@ -173,6 +185,7 @@ AC_CONFIG_FILES([Makefile decoders/onewire_link/Makefile decoders/onewire_network/Makefile decoders/pan1321/Makefile + decoders/parallel/Makefile decoders/rtc8564/Makefile decoders/sdcard_spi/Makefile decoders/spi/Makefile @@ -180,9 +193,10 @@ AC_CONFIG_FILES([Makefile decoders/transitioncounter/Makefile decoders/uart/Makefile decoders/uart_dump/Makefile - decoders/usb_protocol/Makefile + decoders/usb_packet/Makefile decoders/usb_signalling/Makefile decoders/xfp/Makefile + tests/Makefile ]) AC_OUTPUT @@ -200,7 +214,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)"