summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-01-02 20:53:59 +0200
committerTor Lillqvist <tml@iki.fi>2013-01-02 20:55:12 +0200
commitb24f82fda9558a8b07a6df9ac898d0e166113a10 (patch)
treecfc22f2391e124aaa6c35cae75e10aef34d0570a /configure.ac
parent0f6f38b5d7288dd71a26040aee04b1ca4f6e0bcf (diff)
Can't build the NPAPI plugin stuff as 64-bit for OS X
It uses QuickTime and Carbon.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index f3e69acf5ab2..d5ed79d0de58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8508,7 +8508,9 @@ 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
+# 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" = "" \)
then
AC_MSG_RESULT([yes])
ENABLE_NPAPI_FROM_BROWSER=YES