configure.ac | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
New commits:
commit 9ea80bb272c6bb9f6a29cc7320a7e4d42fa37eda
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Wed Mar 25 16:42:31 2020 +0100
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed Mar 25 16:42:31 2020 +0100
Remove option to build against system Python
With python3: upgrade to release 3.5.9 we only support internal
python builds on this LTS branch.
Change-Id: Ib7f9ab86c767b76a94b350b8ab0bcd413a8b2a62
diff --git a/configure.ac b/configure.ac
index 02cfb83d7dd2..4accf14e1215 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8136,21 +8136,12 @@ no|disable)
AC_MSG_RESULT([system])
enable_python=system
else
- # Unset variables set by the above AM_PATH_PYTHON so that
- # we actually do check anew.
- unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
am_cv_python_version am_cv_python_platform am_cv_python_pythondir
am_cv_python_pyexecdir
- AM_PATH_PYTHON([3.3],, [:])
- if test "$PYTHON" = ":"; then
- if test -z "$PYTHON_FOR_BUILD"; then
- AC_MSG_RESULT([fully internal])
- else
- AC_MSG_RESULT([internal])
- fi
- enable_python=internal
+ if test -z "$PYTHON_FOR_BUILD"; then
+ AC_MSG_RESULT([fully internal])
else
- AC_MSG_RESULT([system])
- enable_python=system
+ AC_MSG_RESULT([internal])
fi
+ enable_python=internal
fi
;;
internal)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
