[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - configure.ac

[Michael Stahl]

 configure.ac |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 6337263829bd36f38467781dce326a38aa115374
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Aug 22 22:26:43 2017 +0200

    configure: try to keep PYTHON_VERSION from going stale
    
    Since it was set to 3.5.0, the bundled python was upgraded twice, but
    the directory is still named python-core-3.5.0 :(
    
    Change-Id: I15eec4148c2436e1f289d9851ce5bd212d4a368a
    Reviewed-on: https://gerrit.libreoffice.org/41433
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit ac3a4fe35e873de17eefb46c3f5e792aded6b0a5)
    Reviewed-on: https://gerrit.libreoffice.org/56683
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/configure.ac b/configure.ac
index 7abc5c56653c..816410692087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8295,10 +8295,14 @@ internal)
     # when MSVC 2013 support was dropped.
     if test "$COM" = "MSC" -a "$VCVER" = "120"; then
         PYTHON_VERSION_MINOR=3
+        PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
     else
         PYTHON_VERSION_MINOR=5
+        PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4
+    fi
+    if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
+        AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst])
     fi
-    PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
     AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"])
     BUILD_TYPE="$BUILD_TYPE PYTHON"
     # Embedded Python dies without Home set