configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 759cc27530a5f58b43721f2d760c9429561a12fd
Author: Riccardo Magliocchetti <riccardo.magliocche...@gmail.com>
Date: Sat May 4 18:16:25 2013 +0200
configure: no ENABLE_NPAPI_FROM_BROWSER for --enable-headless
Change-Id: Icc986a13700396913e89299826f58cd107ff2673
diff --git a/configure.ac b/configure.ac
index d8fd6df..0be1aa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8498,7 +8498,8 @@ dnl
===================================================================
AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents])
# Obviously no such thing on iOS or Android. Also not possible when building
# 64-bit OS X code as the plugin code uses QuickTime and Carbon.
-if test "$_os" != Android -a "$_os" != iOS -a \( $_os != Darwin -o
"$BITNESS_OVERRIDE" = "" \)
+if test "$_os" != Android -a "$_os" != iOS -a \( $_os != Darwin -o
"$BITNESS_OVERRIDE" = "" \) -a \
+ "$enable_headless" != yes
then
AC_MSG_RESULT([yes])
ENABLE_NPAPI_FROM_BROWSER=YES
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
