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 /config_host.mk.in | |
| 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 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index a5f8f40f70a0..727bdc7f04b2 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -161,7 +161,8 @@ export ENABLE_LTO=@ENABLE_LTO@ export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@ export ENABLE_MINIMIZER=@ENABLE_MINIMIZER@ export ENABLE_MYSQLC=@ENABLE_MYSQLC@ -export ENABLE_NSPLUGIN=@ENABLE_NSPLUGIN@ +export ENABLE_NPAPI_FROM_BROWSER=@ENABLE_NPAPI_FROM_BROWSER@ +export ENABLE_NPAPI_INTO_BROWSER=@ENABLE_NPAPI_INTO_BROWSER@ export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@ export ENABLE_OPENGL=@ENABLE_OPENGL@ export ENABLE_OXYGENOFFICE=@ENABLE_OXYGENOFFICE@ |