diff options
author | Andras Timar <andras.timar@collabora.com> | 2013-12-21 13:44:51 -0800 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2013-12-21 22:57:08 +0100 |
commit | 1b215d42075ca7cb6afb50cde59261664f9ba545 (patch) | |
tree | c5672f3fe2c7a1e886195cf6f56d26ff04e2df59 /configure.ac | |
parent | da6c12df9161f93114c1aecdb1ed3cd24aeb1697 (diff) |
build fix
Change-Id: I6a2e8e69106584b6b7c9af35d4e0e79bf6ef5342
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 8c08b1eaf28f..c3b691832ee4 100644 --- a/configure.ac +++ b/configure.ac @@ -9128,7 +9128,7 @@ 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" = "" \) -a \ - "$enable_headless" != yes + "$enable_headless" != yes -a "$enable_mpl_subset" != yes then AC_MSG_RESULT([yes]) ENABLE_NPAPI_FROM_BROWSER=TRUE @@ -9142,8 +9142,8 @@ dnl =================================================================== dnl Check for NPAPI interface to plug LibreOffice into browser windows dnl =================================================================== AC_MSG_CHECKING([whether to plug LibreOffice into browser windows]) -if test "$_os" = WINNT -o "$_os" != Android -a "$_os" != Darwin -a "$_os" != iOS -a \ - "$enable_headless" != yes -a "$enable_gtk" != no +if test "$enable_mpl_subset" != yes -a \( "$_os" = WINNT -o "$_os" != Android -a "$_os" != Darwin -a "$_os" != iOS -a \ + "$enable_headless" != yes -a "$enable_gtk" != no \) then AC_MSG_RESULT([yes]) ENABLE_NPAPI_INTO_BROWSER=TRUE |