diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-20 11:15:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-20 11:24:05 +0100 |
| commit | a6139f6fe6d4615c993a9b52b63b7d93c0c8ad4f (patch) | |
| tree | efb46139e9bfb497598e08007f1b0118405488f9 /extensions | |
| parent | 4c359c22e12a8cd6b6b40af60e1a39261737ad2a (diff) | |
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
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Module_extensions.mk | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 99ec13f0875f..7bd6348ce797 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -103,14 +103,10 @@ endif # DISABLE_ATL endif # WNT -ifeq ($(ENABLE_NSPLUGIN),YES) +ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES) $(eval $(call gb_Module_add_targets,extensions,\ - Executable_nsplugin \ - Library_npsoplugin \ Library_pl \ - StaticLibrary_npsoenv \ - WinResTarget_npsoplugin \ )) ifeq ($(GUI),UNX) @@ -122,7 +118,18 @@ $(eval $(call gb_Module_add_targets,extensions,\ endif endif -endif # ENABLE_PLUGIN=YES +endif # ENABLE_NPAPI_FROM_BROWSER=YES + +ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES) + +$(eval $(call gb_Module_add_targets,extensions,\ + Executable_nsplugin \ + Library_npsoplugin \ + StaticLibrary_npsoenv \ + WinResTarget_npsoplugin \ +)) + +endif # ENABLE_NPAPI_INTO_BROWSER=YES ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,extensions,\ |