configure.ac: Look for python-config-3.x besides python3.x-config.

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 854e87f6c867aa121238f48ff7e97036884c16f1..ad5e626c6b9ff246b22cc85fe630f7ce60d2581f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ 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], [0])
+m4_define([srd_package_version_micro], [1])
 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 foreign std-options])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
@@ -64,7 +64,7 @@ PKG_PROG_PKG_CONFIG([0.22])
 # 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=0
+SRD_LIB_VERSION_REVISION=1
 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 +84,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
@@ -150,10 +150,12 @@ AC_SUBST(SRD_PACKAGE_VERSION)
 AC_CONFIG_FILES([Makefile
                 sigrokdecode.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