summaryrefslogtreecommitdiff
path: root/np_sdk/Module_np_sdk.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-20 11:15:56 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-20 11:24:05 +0100
commita6139f6fe6d4615c993a9b52b63b7d93c0c8ad4f (patch)
treeefb46139e9bfb497598e08007f1b0118405488f9 /np_sdk/Module_np_sdk.mk
parent4c359c22e12a8cd6b6b40af60e1a39261737ad2a (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 'np_sdk/Module_np_sdk.mk')
-rw-r--r--np_sdk/Module_np_sdk.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index 81c374263a26..673ee5f38999 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -27,11 +27,10 @@
$(eval $(call gb_Module_Module,np_sdk))
-ifeq ($(ENABLE_NSPLUGIN),YES)
+ifneq (,$(filter YES,$(ENABLE_NPAPI_FROM_BROWSER) $(ENABLE_NPAPI_INTO_BROWSER)))
$(eval $(call gb_Module_add_targets,np_sdk,\
Package_inc \
- StaticLibrary_nputils \
))
ifeq ($(SYSTEM_NPAPI_HEADERS),NO)
@@ -40,6 +39,12 @@ $(eval $(call gb_Module_add_targets,np_sdk,\
))
endif
+ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
+$(eval $(call gb_Module_add_targets,np_sdk,\
+ StaticLibrary_nputils \
+))
+endif
+
endif
# vim: set noet sw=4 ts=4: