[Libreoffice-commits] core.git: Branch 'aoo/trunk' - configure.in

[Jürgen Schmidt]

 configure.in |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 134580778fcc09bd459800d9a214f78cc832dfed
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Thu May 23 11:53:52 2013 +0000

    #122010# prepare configur to support Python 2.7.5 and newer on MacOS, 2.7.1 is now still supported

diff --git a/configure.in b/configure.in
index e303691..d403d0d 100644
--- a/configure.in
+++ b/configure.in
@@ -4090,16 +4090,17 @@ if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
    with_system_python=yes
 
    _python="/Library/Frameworks/Python.framework/Versions/Current/bin/python" 
-   _python_version=`$_python -c "import platform; print platform.python_version();"`
+   _python_hexversion=`$_python -c "import sys; print sys.hexversion;"`
    
-   if test "$_python_version" = "2.7.4" ; then
+   dnl hex version of Python 2.7.1 = 34013680
+   if test "$_python_hexversion" >= "34013680" ; then
       AC_MSG_RESULT([compiling against system python (version $_python_version)])
 
 	  _python_ver=`$_python -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
 	  
    	  PYTHON_CFLAGS="-I/Library/Frameworks/Python.framework/Versions/$_python_ver/include/python$_python_ver"
    else
-		AC_MSG_ERROR([Python 2.7.4 is required])
+		AC_MSG_ERROR([Python 2.7.1 or higher is required])
    fi
 
    PYTHON_LIBS="-framework Python"