configure.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 47d7d1e987e1caa030c7623767d9dfe3d85eb924
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Sep 27 09:46:00 2011 +0300
Enforce use of internal Python for MacOSX 10.[45] only, as apparently is
the intent
diff --git a/configure.in b/configure.in
index 6a98396..791b693 100644
--- a/configure.in
+++ b/configure.in
@@ -4771,8 +4771,8 @@ no|disable)
dnl MinGW cross-compilation setups.)
AC_MSG_RESULT([internal])
enable_python=internal
- elif test $_os = Darwin; then
- AC_MSG_RESULT([internal, neither 10.4's nor 10.5's Python is
compatible with Python3-ified pyuno])
+ elif test $_os = Darwin -a \( "$with_macosx_version_min_required" = 10.4
-o "$with_macosx_version_min_required" = 10.5 \); then
+ AC_MSG_RESULT([internal, the Python in Mac OS X
$with_macosx_version_min_required is incompatible with Python3-ified pyuno])
enable_python=internal
else
AC_MSG_RESULT([checking below])
@@ -4783,6 +4783,9 @@ internal)
AC_MSG_RESULT([internal])
;;
system)
+ if test $_os = Darwin -a \( "$with_macosx_version_min_required" = 10.4 -o
"$with_macosx_version_min_required" = 10.5 \); then
+ AC_MSG_ERROR([Cannot use "system" Python, the Python in Mac OS X
$with_macosx_version_min_required is incompatible with Python3-ified pyuno])
+ fi
AC_MSG_RESULT([system])
;;
*)
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
