[Libreoffice-commits] core.git: configure.ac extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk postprocess/Rdb_services.mk Repository.mk

[Norbert Thiebaud]

 Repository.mk                   |    8 ++++----
 configure.ac                    |   12 ++++++------
 extensions/Module_extensions.mk |    8 ++++----
 np_sdk/Module_np_sdk.mk         |    4 ++--
 postprocess/Rdb_services.mk     |    2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 1376af9a727c8cbde8eae0c40a8206bffd021451
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Aug 29 11:14:34 2013 -0500

    ENABLE_NPAPI_* Harmonize ENABLE_* variable to TRUE/<nothing>
    
    Change-Id: Ia7575f0f51bc3ba355ec01d937bd155adb287572
    Reviewed-on: https://gerrit.libreoffice.org/5684
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/Repository.mk b/Repository.mk
index 3c52399..00e29b5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -81,9 +81,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 $(eval $(call gb_Helper_register_executables,OOO, \
 	$(call gb_Helper_optional,CRASHREP,crashrep) \
 	gnome-open-url.bin \
-	$(if $(filter YES,$(ENABLE_NPAPI_INTO_BROWSER)),nsplugin) \
+	$(if $(ENABLE_NPAPI_INTO_BROWSER),nsplugin) \
 	$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
-	$(if $(filter YES,$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
+	$(if $(ENABLE_NPAPI_FROM_BROWSER),pluginapp.bin) \
 	$(if $(filter-out WNT,$(OS)),soffice.bin) \
 	spadmin.bin \
 	$(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \
@@ -125,7 +125,7 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
 ))
 
-ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
+ifeq ($(ENABLE_NPAPI_INTO_BROWSER),TRUE)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	npsoplugin \
 ))
@@ -300,7 +300,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	offacc \
 	passwordcontainer \
 	pcr \
-	$(if $(filter YES,$(ENABLE_NPAPI_FROM_BROWSER)),pl) \
+	$(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \
 	pdffilter \
 	$(if $(DISABLE_SCRIPTING),,protocolhandler) \
 	res \
diff --git a/configure.ac b/configure.ac
index fc46d55..66dbf4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1678,8 +1678,8 @@ AC_ARG_WITH(system-liblangtag,
 AC_ARG_WITH(system-npapi-headers,
     AS_HELP_STRING([--with-system-npapi-headers],
         [Use NPAPI headers provided by system instead of bundled ones. Used in
-         extensions/source/nsplugin (ENABLE_NPAPI_INTO_BROWSER=YES) and
-         extensions/source/plugin (ENABLE_NPAPI_FROM_BROWSER=YES)]),,
+         extensions/source/nsplugin (ENABLE_NPAPI_INTO_BROWSER=TRUE) and
+         extensions/source/plugin (ENABLE_NPAPI_FROM_BROWSER=TRUE)]),,
     [with_system_npapi_headers="$with_system_headers"]
 )
 
@@ -8952,10 +8952,10 @@ if test "$_os" != Android -a "$_os" != iOS -a \( $_os != Darwin -o "$BITNESS_OVE
         "$enable_headless" != yes
 then
     AC_MSG_RESULT([yes])
-    ENABLE_NPAPI_FROM_BROWSER=YES
+    ENABLE_NPAPI_FROM_BROWSER=TRUE
 else
     AC_MSG_RESULT([no])
-    ENABLE_NPAPI_FROM_BROWSER=NO
+    ENABLE_NPAPI_FROM_BROWSER=
 fi
 AC_SUBST(ENABLE_NPAPI_FROM_BROWSER)
 
@@ -8967,10 +8967,10 @@ if test "$_os" == WINNT -o "$_os" != Android -a "$_os" != Darwin -a "$_os" != iO
         "$enable_headless" != yes -a "$enable_gtk" != no
 then
     AC_MSG_RESULT([yes])
-    ENABLE_NPAPI_INTO_BROWSER=YES
+    ENABLE_NPAPI_INTO_BROWSER=TRUE
 else
     AC_MSG_RESULT([no])
-    ENABLE_NPAPI_INTO_BROWSER=NO
+    ENABLE_NPAPI_INTO_BROWSER=
 fi
 AC_SUBST(ENABLE_NPAPI_INTO_BROWSER)
 
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 3ab07ab..0f7857e 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -84,7 +84,7 @@ endif # DISABLE_ATL
 
 endif # WNT
 
-ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
+ifeq ($(ENABLE_NPAPI_FROM_BROWSER),TRUE)
 
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_pl \
@@ -99,9 +99,9 @@ $(eval $(call gb_Module_add_targets,extensions,\
 endif
 endif
 
-endif # ENABLE_NPAPI_FROM_BROWSER=YES
+endif # ENABLE_NPAPI_FROM_BROWSER=TRUE
 
-ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
+ifeq ($(ENABLE_NPAPI_INTO_BROWSER),TRUE)
 
 $(eval $(call gb_Module_add_targets,extensions,\
 	Executable_nsplugin \
@@ -115,7 +115,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
 ))
 endif
 
-endif # ENABLE_NPAPI_INTO_BROWSER=YES
+endif # ENABLE_NPAPI_INTO_BROWSER=TRUE
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,extensions,\
diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk
index 5d82712..58b7404 100644
--- a/np_sdk/Module_np_sdk.mk
+++ b/np_sdk/Module_np_sdk.mk
@@ -10,9 +10,9 @@
 
 $(eval $(call gb_Module_Module,np_sdk))
 
-ifneq (,$(filter YES,$(ENABLE_NPAPI_FROM_BROWSER) $(ENABLE_NPAPI_INTO_BROWSER)))
+ifneq ($(ENABLE_NPAPI_FROM_BROWSER)$(ENABLE_NPAPI_INTO_BROWSER),)
 
-ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
+ifeq ($(ENABLE_NPAPI_INTO_BROWSER),TRUE)
 $(eval $(call gb_Module_add_targets,np_sdk,\
 	StaticLibrary_nputils \
 ))
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index bae565e..ef6223d 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -337,7 +337,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 
 endif # DESKTOP
 
-ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
+ifeq ($(ENABLE_NPAPI_FROM_BROWSER),TRUE)
 $(eval $(call gb_Rdb_add_components,services,\
 	extensions/source/plugin/pl \
 ))