configure.ac | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 1008cb39e8e7f69f64862747a65f4de8f7998a3a
Author: Tor Lillqvist <t...@iki.fi>
AuthorDate: Sun Jul 5 18:53:20 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Sun Nov 15 10:37:44 2020 +0100
Allow also --disable-python on macOS
Change-Id: I27cdd86a730a042d6e846c90319c306f5a3b35ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98159
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105875
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/configure.ac b/configure.ac
index 4efb2c3381df..1f120e9ba9e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8710,6 +8710,10 @@ AC_SUBST(XMLLINT)
# Optionally user can pass an option to configure, i. e.
# ./configure PYTHON=/usr/bin/python
# =====================================================================
+if test $_os = Darwin -a "$enable_python" != no -a "$enable_python" !=
fully-internal -a "$enable_python" != internal; then
+ # Only allowed choices for macOS are 'no', 'internal' (default), and
'fully-internal'
+ enable_python=internal
+fi
if test "$build_os" != "cygwin" -a "$enable_python" != fully-internal; then
if test -n "$PYTHON"; then
PYTHON_FOR_BUILD=$PYTHON
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
