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 6105da23a4f336180426b30a5540043681ec016f..ad5e626c6b9ff246b22cc85fe630f7ce60d2581f 100644 (file)
--- 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 std-options check-news])
+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])
 
@@ -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