[Libreoffice-commits] core.git: configure.ac

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Tue Mar 19 23:37:39 PDT 2013


 configure.ac |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f44f1719efafd811bb604f7fcc3534d5ec344ad0
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Mar 19 17:39:58 2013 +0100

    lowering baseline for python used during building
    
    builds fine when using system python for building on Mac OSX 10.5
    (comes with python 2.5 only). Note that python 2.5 is not enough
    for pyuno/python scripting at runtime, so for that internal python is
    built nevertheless.
    
    Change-Id: I51a4450cad1e09aecd12f192db1fb797313cf322
    Reviewed-on: https://gerrit.libreoffice.org/2862
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/configure.ac b/configure.ac
index 1492d72..9627162 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7260,13 +7260,14 @@ AC_SUBST([MINGW_LIBXML_DLL])
 AC_SUBST([MINGW_ZLIB_DLL])
 
 # =====================================================================
-# Checking for a Python interpreter with version >= 2.6 needed to build LO.
+# Checking for a Python interpreter with version >= 2.5 needed to build LO.
+# runtime requires Python 3 compatible version (>= 2.6)
 # Optionally user can pass an option to configure, i. e.
 # ./configure PYTHON=/usr/bin/python
 # =====================================================================
 if test "$build_os" != "cygwin"; 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.5],, [:])
     # Clean PYTHON_VERSION checked below if cross-compiling
     PYTHON_VERSION=""
     if test "$PYTHON" != ":"; then


More information about the Libreoffice-commits mailing list