diff options
| author | sb <sb@openoffice.org> | 2010-03-26 14:29:30 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-03-26 14:29:30 +0100 |
| commit | 4ded51564e225874d110b3a8a4ecb75c6e02c8bb (patch) | |
| tree | b351dead84a4c9093e66562e2e4cd14565279b14 | |
| parent | 8fa58bb6e7c867f9af76033c18f11c1a9dcabd90 (diff) | |
sb120: #i106059# fixed previous fix
(transplanted from 4cd1436dc271f868b6b63987c71a6a15136af99a)
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure index 6b86fbabe62b..cccab2762589 100755 --- a/configure +++ b/configure @@ -14965,7 +14965,8 @@ if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then 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 "$with_system_python" != "no" -o -n "$with_system_libs"; then +elif test -n "$with_system_python" -o -n "$with_system_libs" && \ + test "$with_system_python" != "no"; then with_system_python=yes { echo "$as_me:$LINENO: result: external" >&5 echo "${ECHO_T}external" >&6; } diff --git a/configure.in b/configure.in index 5c2ba1cbf3c5..14273cb4d2eb 100644 --- a/configure.in +++ b/configure.in @@ -3728,7 +3728,8 @@ if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then 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_LIBS="-framework Python" -elif test "$with_system_python" != "no" -o -n "$with_system_libs"; then +elif test -n "$with_system_python" -o -n "$with_system_libs" && \ + test "$with_system_python" != "no"; then with_system_python=yes AC_MSG_RESULT([external]) AM_PATH_PYTHON([2.2]) |