X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=f56803b9eccbb1c771fe63c9114206b5d139f8b9;hp=40a3450a78a403e301efc70111762fa80e122014;hb=0169f19c53e195df2f96c4df731ad3214c59e20a;hpb=47198f313a3c3e6431f5896fae3fb556f38746ed

diff --git a/configure.ac b/configure.ac
index 40a3450..f56803b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 ##
-## This file is part of the sigrok project.
+## This file is part of the libsigrokdecode project.
 ##
 ## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
 ##
@@ -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"
@@ -84,7 +87,7 @@ AM_PATH_GLIB_2_0([2.24.0],
 
 # Python support. We require at least Python >= 3.0.
 AC_ARG_VAR([PYTHON3_CONFIG], [path to python3-config utility])
-AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.3-config python3.2-config python3.1-config python3.0-config])
+AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.3-config python-config-3.3 python3.2-config python-config-3.2 python3.1-config python-config-3.1 python3.0-config python-config-3.0])
 CPPFLAGS_PYTHON=""
 LDFLAGS_PYTHON=""
 case "$build" in
@@ -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,7 +157,7 @@ AC_SUBST(SRD_PACKAGE_VERSION_MICRO)
 AC_SUBST(SRD_PACKAGE_VERSION)
 
 AC_CONFIG_FILES([Makefile
-		 sigrokdecode.h
+		 libsigrokdecode.h
 		 libsigrokdecode.pc
 		 contrib/Makefile
 		 decoders/Makefile
@@ -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,8 +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
@@ -192,12 +207,14 @@ echo
 echo "  - Package version (major.minor.micro):    $SRD_PACKAGE_VERSION"
 echo "  - Library version (current:revision:age): $SRD_LIB_VERSION"
 echo "  - Prefix: $prefix"
+echo "  - Building on: $build"
+echo "  - Building for: $host"
 echo
 echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.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)"