diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-03-06 11:42:30 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-04-09 10:32:47 +0200 |
| commit | aa02205fc46ed53a0af18517c3cd4064d514f85f (patch) | |
| tree | 1ce3aaf0a7eb67bd08a3c0f1c98383bf31ad5c3b /configure.ac | |
| parent | 41f1a38b9e8b5e0567bf642d3e14a549e82ee0d9 (diff) | |
configure,pyuno: require at least Python 2.7
Nobody needs to use 2.6 any more, so reduce the maintenance burden.
https://lists.freedesktop.org/archives/libreoffice/2018-March/079670.html
Change-Id: I101e26fbceffbe6119f4a6484530f27760b03eb4
Reviewed-on: https://gerrit.libreoffice.org/50816
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index aa44107f8e79..e4f2bb53770d 100644 --- a/configure.ac +++ b/configure.ac @@ -8040,14 +8040,14 @@ AC_SUBST(LIBXML_LIBS) AC_SUBST(XMLLINT) # ===================================================================== -# Checking for a Python interpreter with version >= 2.6. -# Build and runtime requires Python 3 compatible version (>= 2.6). +# Checking for a Python interpreter with version >= 2.7. +# Build and runtime requires Python 3 compatible version (>= 2.7). # Optionally user can pass an option to configure, i. e. # ./configure PYTHON=/usr/bin/python # ===================================================================== if test "$build_os" != "cygwin" -a "$enable_python" != fully-internal; then # This allows a lack of system python with no error, we use internal one in that case. - AM_PATH_PYTHON([2.6],, [:]) + AM_PATH_PYTHON([2.7],, [:]) # Clean PYTHON_VERSION checked below if cross-compiling PYTHON_VERSION="" if test "$PYTHON" != ":"; then @@ -8228,11 +8228,11 @@ system) #include <Python.h> int main(int argc, char **argv) { - if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 6) || + if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 7) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3)) return 0; else return 1; } - ]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when building with Python 3, or Python >= 2.6 when building with Python 2])],[AC_MSG_RESULT([skipped; cross-compiling])]) + ]])],[AC_MSG_RESULT([ok])],[AC_MSG_ERROR([Python >= 3.3 is needed when building with Python 3, or Python >= 2.7 when building with Python 2])],[AC_MSG_RESULT([skipped; cross-compiling])]) CFLAGS=$save_CFLAGS AC_LANG_POP(C) |