summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-03-16 21:05:31 +0100
committersb <sb@openoffice.org>2010-03-16 21:05:31 +0100
commit084ef1d92ac0c8dd21d2a34cb10a2e1b26afcb1d (patch)
treea9042d6beed0e0ad8df2708adbee1a92412ad3cb /configure
parent0cec9ead996dd410d33a7a999df668ac0925aebb (diff)
sb120: #i106059# On Mac OS X, compile against system Python from 10.4 SDK (patch by cloph)
(transplanted from 9f7ed09e2d7215d58bf71615b481b74b2344c79c)
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure23
1 files changed, 11 insertions, 12 deletions
diff --git a/configure b/configure
index ef4db28989e9..7524601a7ab5 100755
--- a/configure
+++ b/configure
@@ -14957,14 +14957,16 @@ fi
-if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
- with_system_python=yes
-fi
{ echo "$as_me:$LINENO: checking which python to use" >&5
echo $ECHO_N "checking which python to use... $ECHO_C" >&6; }
-if test -n "$with_system_python" -o -n "$with_system_libs" && \
+if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then
+ with_system_python=yes
+ { echo "$as_me:$LINENO: result: compiling against MacOSX10.4u.sdk (python version 2.3)" >&5
+echo "${ECHO_T}compiling against MacOSX10.4u.sdk (python version 2.3)" >&6; }
+ PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3"
+ PYTHON_LIBS="-framework Python"
+elif test -n "$with_system_python" -o -n "$with_system_libs" && \
test "$with_system_python" != "no"; then
- SYSTEM_PYTHON=YES
{ echo "$as_me:$LINENO: result: external" >&5
echo "${ECHO_T}external" >&6; }
@@ -15157,13 +15159,10 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
PYTHON_CFLAGS="-I$python_include"
-
- if test "$_os" = "Darwin"; then
- PYTHON_LIBS="-framework Python"
- else
- PYTHON_LIBS="-lpython$python_version"
- fi
-
+ PYTHON_LIBS="-lpython$python_version"
+fi
+if test "$with_system_python" != "no" ; then
+ SYSTEM_PYTHON=YES
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
if test "${ac_cv_header_Python_h+set}" = set; then