[PATCH libreoffice-4-0] configure: don't enable ENABLE_NPAPI_FROM_BROWSER with --ena...

[Riccardo Magliocchetti (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3786

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3786/1

configure: don't enable ENABLE_NPAPI_FROM_BROWSER with --enable-headless

This fix a build error since otherwise X libraries are required
Backport of 759cc27530a5f58b43721f2d760c9429561a12fd

Change-Id: Iba718969dca90563ba9e60aa16944e6de67c7141
---
M configure.ac
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/configure.ac b/configure.ac
index 390b3eb..b196fe9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8304,7 +8304,7 @@
 dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents
 dnl ===================================================================
 AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents])
-if test "$_os" != Android -a "$_os" != iOS
+if test "$_os" != Android -a "$_os" != iOS -a "$enable_headless" != yes
 then
     AC_MSG_RESULT([yes])
     ENABLE_NPAPI_FROM_BROWSER=YES

-- 
To view, visit https://gerrit.libreoffice.org/3786
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba718969dca90563ba9e60aa16944e6de67c7141
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>