openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1468480 - /openoffice/trunk/main/configure.in
Date Tue, 16 Apr 2013 15:56:40 GMT
Author: jsc
Date: Tue Apr 16 15:56:40 2013
New Revision: 1468480

URL: http://svn.apache.org/r1468480
Log:
#122010# ensure that python 2.7.4 is used under MacOS

Modified:
    openoffice/trunk/main/configure.in

Modified: openoffice/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1468480&r1=1468479&r2=1468480&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Tue Apr 16 15:56:40 2013
@@ -4086,8 +4086,20 @@ dnl ====================================
 AC_MSG_CHECKING([which python to use])
 if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
    with_system_python=yes
-   AC_MSG_RESULT([compiling against MacOSX10.4u.sdk (python version 2.3)])
-   PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
+
+   _python="/Library/Frameworks/Python.framework/Versions/Current/bin/python" 
+   _python_version=`$_python -c "import platform; print platform.python_version();"`
+   
+   if test "$_python_version" = "2.7.4" ; 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])
+   fi
+
    PYTHON_LIBS="-framework Python"
 elif test -n "$with_system_python" -o -n "$with_system_libs" && \
 	test "$with_system_python" != "no"; then



Mime
View raw message