From f9059d4eee8e53c0a6b531fff16e1fade58cb8b0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 19 Nov 2012 17:41:01 +0100
Subject: Key all browser plugin features to --enable-nsplugin

...instead of having them spread across --enable-nsplugin (plug LO into browser
windows) and --enable-mozilla (plug browser plugins into LO documents).  The
ultimate goal is to clean up the various configure options mentioning "mozilla"
and WITH_MOZILLA.

Change-Id: I6f4b1c3a5701424f586cc1e303af90c9d59a91b6
---
 np_sdk/Module_np_sdk.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'np_sdk/Module_np_sdk.mk')

diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index 6ebba871eef6..81c374263a26 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -27,10 +27,11 @@
 
 $(eval $(call gb_Module_Module,np_sdk))
 
-ifneq (,$(filter YES,$(ENABLE_NSPLUGIN) $(WITH_MOZILLA)))
+ifeq ($(ENABLE_NSPLUGIN),YES)
 
 $(eval $(call gb_Module_add_targets,np_sdk,\
 	Package_inc \
+	StaticLibrary_nputils \
 ))
 
 ifeq ($(SYSTEM_NPAPI_HEADERS),NO)
@@ -39,12 +40,6 @@ $(eval $(call gb_Module_add_targets,np_sdk,\
 ))
 endif
 
-ifeq ($(ENABLE_NSPLUGIN),YES)
-$(eval $(call gb_Module_add_targets,np_sdk,\
-	StaticLibrary_nputils \
-))
-endif
-
 endif
 
 # vim: set noet sw=4 ts=4:
-- 
cgit