[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac

[Riccardo Magliocchetti]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ca6943b8462b843a5f99fc3291cef86454f4ac7a
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Sat May 4 19:24:40 2013 +0200

    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
    Reviewed-on: https://gerrit.libreoffice.org/3786
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/configure.ac b/configure.ac
index 390b3eb..b196fe9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8304,7 +8304,7 @@ dnl ===================================================================
 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