From b24f82fda9558a8b07a6df9ac898d0e166113a10 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 2 Jan 2013 20:53:59 +0200
Subject: [PATCH] Can't build the NPAPI plugin stuff as 64-bit for OS X

It uses QuickTime and Carbon.
---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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