diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-10-08 13:20:30 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-10-10 14:42:16 -0500 |
| commit | 65686465e71c0ed3a55aa5b60f8d96a0df63ab21 (patch) | |
| tree | f447c10a1c854d6d0f24a62c599f01bc5a0abd56 | |
| parent | f8c1e11f10dfe4fb3169e00de86afaf0fcbd063f (diff) | |
| download | mediagoblin-65686465e71c0ed3a55aa5b60f8d96a0df63ab21.tar.lz mediagoblin-65686465e71c0ed3a55aa5b60f8d96a0df63ab21.tar.xz mediagoblin-65686465e71c0ed3a55aa5b60f8d96a0df63ab21.zip | |
Set USE_PYTHON3 to yes/no depending on whether --with-python3 enabled
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 5eb08da4..2ca4101a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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@ diff --git a/configure.ac b/configure.ac index e6c5ca91..b998fabd 100644 --- a/configure.ac +++ b/configure.ac @@ -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])])) |