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 color-tests])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
[pyver=`$PKG_CONFIG --modversion python3`;
CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python3_CFLAGS";
LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python3_LIBS"],
-[PKG_CHECK_MODULES([python33], [python-3.3 >= 3.2],
+[PKG_CHECK_MODULES([python34], [python-3.4 >= 3.4],
+ [pyver=`$PKG_CONFIG --modversion python-3.4`;
+ CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python34_CFLAGS";
+ LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python34_LIBS"],
+[PKG_CHECK_MODULES([python33], [python-3.3 >= 3.3],
[pyver=`$PKG_CONFIG --modversion python-3.3`;
CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python33_CFLAGS";
LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python33_LIBS"],
[pyver=`$PKG_CONFIG --modversion python-3.2`;
CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python32_CFLAGS";
LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python32_LIBS"],
-)])])
+)])])])
AC_SUBST(CPPFLAGS_PYTHON)
AC_SUBST(LDFLAGS_PYTHON)
+# We also need to find the name of the python3 executable (for 'make install').
+# Some OSes call this python3, some call it python3.2, etc. etc.
+AC_CHECK_PROGS([PYTHON3], [python3.4 python3.3 python3.2 python3])
+if test "x$PYTHON3" == "x"; then
+ AC_MSG_ERROR([cannot find python3 executable.])
+fi
+
# Link against libm, this is required (among other things) by Python.
AC_SEARCH_LIBS([pow], [m])
AM_CONDITIONAL(BUILD_RUNTC, test x"$build_runtc" = "xyes")
-AC_CONFIG_FILES([Makefile
- version.h
- libsigrokdecode.pc
- contrib/Makefile
- tests/Makefile
- ])
+AC_CONFIG_FILES([Makefile version.h libsigrokdecode.pc])
AC_OUTPUT