From da89e23a2864a15f0cc548c8f803ff4ecc042cd5 Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Sun, 14 Sep 2014 02:31:10 +0100 Subject: [PATCH] Use AM_PATH_PYTHON macro to find Python binary. A specific interpreter can now be passed to configure e.g: ./configure PYTHON=python3 --- Makefile.am | 10 +++++----- configure.ac | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 26319566..76799c12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -443,7 +443,7 @@ bindings/cxx/include/libsigrok/enums.hpp: bindings/cxx/enums.timestamp bindings/cxx/enums.timestamp: bindings/cxx/enums.py doxy/xml/index.xml \ bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp - $(AM_V_GEN)python $< doxy/xml/index.xml + $(AM_V_GEN)$(PYTHON) $< doxy/xml/index.xml $(AM_V_at)touch $@ bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \ @@ -473,23 +473,23 @@ PDOC = bindings/python/sigrok/core/doc.i $(PDOC): bindings/swig/doc.py $(CPPXMLDOC) $(AM_V_at)test -d $(PDIR)/sigrok/core || mkdir -p $(PDIR)/sigrok/core - $(AM_V_GEN)python $< python $(CPPXMLDOC) > $@ + $(AM_V_GEN)$(PYTHON) $< python $(CPPXMLDOC) > $@ python-build: $(PDIR)/timestamp python-quietclean: - $(AM_V_at)cd $(PDIR) && python $(abs_srcdir)/$(PDIR)/setup.py --quiet clean --all 3>&1 1>&2 2>&3 \ + $(AM_V_at)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet clean --all 3>&1 1>&2 2>&3 \ | grep -v "can.t clean it"; true $(PDIR)/timestamp: bindings/cxx/libsigrokxx.la $(PDIR)/sigrok/core/classes.i \ bindings/swig/classes.i $(PDOC) $(library_include_HEADERS) $(AM_V_at)$(MAKE) python-quietclean - $(AM_V_GEN)cd $(PDIR) && python $(abs_srcdir)/$(PDIR)/setup.py --quiet build 3>&1 1>&2 2>&3 \ + $(AM_V_GEN)cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet build 3>&1 1>&2 2>&3 \ | grep -v "command line option.*Wstrict-prototypes"; true $(AM_V_at)touch $(PDIR)/timestamp python-install: - cd $(PDIR) && python $(abs_srcdir)/$(PDIR)/setup.py --quiet install --prefix $(prefix) + cd $(PDIR) && $(PYTHON) $(abs_srcdir)/$(PDIR)/setup.py --quiet install --prefix $(prefix) python-clean: $(AM_V_at)$(MAKE) python-quietclean diff --git a/configure.ac b/configure.ac index 0d589ee8..e79018f2 100644 --- a/configure.ac +++ b/configure.ac @@ -199,10 +199,8 @@ if test "x$HAVE_DOXYGEN" != "xyes"; then fi # Python is needed for the C++ bindings. -AC_CHECK_PROG([HAVE_PYTHON], [python], [yes]) -if test "x$HAVE_PYTHON" != "xyes"; then - BINDINGS_CXX="no"; cxx_msg="Python required" -fi +AM_PATH_PYTHON([2.7], [HAVE_PYTHON="yes"], + [HAVE_PYTHON="no"; BINDINGS_CXX="no"; cxx_msg="Python required"]) # The Python bindings need Python development files. PKG_CHECK_MODULES([python], [python >= 2.7],