configure.ac | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 37c6106f3a74f249cd421454d20f8ce561f71eb0
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Jan 7 14:40:51 2013 +0200
Since 6eff6fae6272e8ed5d74553597bb4b73db3f2864 Python needed on Windows
Change-Id: Id49730b7ad2f7122a2c9b0415330b6fb803ec21c
diff --git a/configure.ac b/configure.ac
index 0a1fd05..2fa044f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7415,12 +7415,18 @@ AC_MSG_CHECKING([which Python to use])
case "$enable_python" in
no|disable)
+ if test $build_os = cygwin; then
+ # Python is required to build nss. In theory we could separate the
build-time Python
+ # requirement from the choice whether to include Python stuff in the
installer, but why
+ # bother?
+ AC_MSG_ERROR([Python is required at build time when building on
Windows])
+ fi
enable_python=no
AC_MSG_RESULT([none])
DISABLE_PYTHON=TRUE
;;
""|yes|auto)
- if test "$DISABLE_SCRIPTING" = TRUE; then
+ if test "$DISABLE_SCRIPTING" = TRUE -a $build_os != cygwin; then
AC_MSG_RESULT([no, overridden by --disable-scripting])
enable_python=no
DISABLE_PYTHON=TRUE
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
