Kaydet (Commit) 47d7d1e9 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Enforce use of internal Python for MacOSX 10.[45] only, as apparently is the intent

üst 36e4ca30
...@@ -4771,8 +4771,8 @@ no|disable) ...@@ -4771,8 +4771,8 @@ no|disable)
dnl MinGW cross-compilation setups.) dnl MinGW cross-compilation setups.)
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
enable_python=internal enable_python=internal
elif test $_os = Darwin; then 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, neither 10.4's nor 10.5's Python is compatible with Python3-ified pyuno]) AC_MSG_RESULT([internal, the Python in Mac OS X $with_macosx_version_min_required is incompatible with Python3-ified pyuno])
enable_python=internal enable_python=internal
else else
AC_MSG_RESULT([checking below]) AC_MSG_RESULT([checking below])
...@@ -4783,6 +4783,9 @@ internal) ...@@ -4783,6 +4783,9 @@ internal)
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
;; ;;
system) 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]) AC_MSG_RESULT([system])
;; ;;
*) *)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment