diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-06-07 15:52:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-06-07 21:29:42 +0200 |
| commit | 74a088d5777fc9976747304681ead2f91c261cbf (patch) | |
| tree | 8c9d704ef698cbcb2fd5559d23e3690bd09be31a | |
| parent | cb0fd00eb3356e5b8cb8aa2c68eceffd63d250bf (diff) | |
Don't reset PYTHON_VERSION if it was explicitly passed in
...along with PYTHON, PYTHON_CFLAGS, and PYTHON_LIBS. (PYTHON_VERSION is
apparently set by AM_PATH_PYTHON. When explicitly passing in PYTHON_CFLAGS and
PYTHON_LIBS under --enable-python=system, AM_PATH_PYTHON does not get called,
but PYTHON_VERSION needs to be set, so needs to be passed in explicitly.)
Change-Id: Ia8c3877fffd8dcc179a56be04627c61a667d8cb0
Reviewed-on: https://gerrit.libreoffice.org/73662
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 7b86e2ed823f..e14d3b4f4d45 100644 --- a/configure.ac +++ b/configure.ac @@ -8365,12 +8365,16 @@ AC_SUBST(XMLLINT) # ./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.7],, [:]) - # Clean PYTHON_VERSION checked below if cross-compiling - PYTHON_VERSION="" - if test "$PYTHON" != ":"; then + if test -n "$PYTHON"; then PYTHON_FOR_BUILD=$PYTHON + else + # This allows a lack of system python with no error, we use internal one in that case. + AM_PATH_PYTHON([2.7],, [:]) + # Clean PYTHON_VERSION checked below if cross-compiling + PYTHON_VERSION="" + if test "$PYTHON" != ":"; then + PYTHON_FOR_BUILD=$PYTHON + fi fi fi AC_SUBST(PYTHON_FOR_BUILD) |