From a6139f6fe6d4615c993a9b52b63b7d93c0c8ad4f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 20 Nov 2012 11:15:56 +0100 Subject: Key different browser plugin features to specific flags This is a rework of f9059d4eee8e53c0a6b531fff16e1fade58cb8b0 "Key all browser plugin features to --enable-nsplugin." The problem with that was that Mac OS X supports pluging browser plugins into LO documents (which was originally controlled by --enable-mozilla) but not plugging LO into browser windows (which was originally controlled by --enable-nsplugin), so controlling the former with the same switch as the latter did not actually work. Thus I replaced the single ENABLE_NSPLUGIN feature flag with two dedicated ones, ENABLE_NPAPI_FROM_BROWSER (for plugging browser plugins into LO documents) and ENABLE_NPAPI_INTO_BROWSER (for plugging LO into browser windows). The --enable-nsplugin configure switch is gone completely, setting the feature flags is always done fully automatically now. Change-Id: Iecf706637465e865c987563b5de489fa90b4c904 --- scp2/InstallModule_ooo.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scp2/InstallModule_ooo.mk') diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index d9c6f571313d..58168619b436 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -39,7 +39,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_KDE \ ENABLE_KDE4 \ ENABLE_LIBLANGTAG \ - ENABLE_NSPLUGIN \ + ENABLE_NPAPI_FROM_BROWSER \ + ENABLE_NPAPI_INTO_BROWSER \ ENABLE_ONLINE_UPDATE \ ENABLE_OPENGL \ ENABLE_TDE \ -- cgit