Set USE_PYTHON3 to yes/no depending on whether --with-python3 enabled
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 8 Oct 2014 18:20:30 +0000 (13:20 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 10 Oct 2014 19:42:16 +0000 (14:42 -0500)
Makefile.in
configure.ac

index 5eb08da4670f6aaef95f3b3322ed9bf888845aca..2ca4101a77596832699ecf7078548c674db1ae99 100644 (file)
@@ -44,6 +44,7 @@ datarootdir = @datarootdir@
 pkgdatadir = $(datadir)/@PACKAGE_NAME@
 pkgincludedir = $(includedir)/@PACKAGE_NAME@
 PYTHONPATH = $(pythondir)$(PATH_SEPARATOR)$(DESTDIR)$(pythondir)
+USE_PYTHON3 = @USE_PYTHON3@
 
 # pkgpythondir = @pkgpythondir@
 # pkgpyexecdir = @pkgpyexecdir@
index e6c5ca91d0ffc1829d098d7ebb6e3b15615aeb43..b998fabdd5c03a9e04a0c3fa6cdbad226776954e 100644 (file)
@@ -80,10 +80,12 @@ AC_ARG_WITH([python3],
        [with_python3=no])
 AS_IF([test "x$with_python3" != xno],
         AC_CHECK_PROGS([PYTHON], [python3.3], [none])
+        AC_SUBST([USE_PYTHON3], [yes])
        AS_IF([test "x$PYTHON" = xnone],
               [AC_MSG_FAILURE(
                [--with-python3 given but no acceptable python3 (3.3) could be found])]),
       AC_CHECK_PROGS([PYTHON], [python2.7 python2.6], [none])
+      AC_SUBST([USE_PYTHON3], [no])
       AS_IF([test "x$PYTHON" = xnone],
               [AC_MSG_FAILURE(
                [No acceptable python (2.7, 2.6) could be found])]))