rename SYSTEM_LIBMSPUB to SYSTEM_MSPUB to remove specialcasing

Change-Id: I06d6dec259f4e1d28d0fb13497097bbfae156b2f

RepositoryExternal.mk

@@ -1224,7 +1224,7 @@ endef
 endif # SYSTEM_CDR
 
 
-ifeq ($(SYSTEM_LIBMSPUB),YES)
+ifeq ($(SYSTEM_MSPUB),YES)
 
 define gb_LinkTarget__use_mspub
 $(call gb_LinkTarget_set_include,$(1),\
@@ -1235,7 +1235,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(MSPUB_LIBS))
 
 endef
 
-else # !SYSTEM_LIBMSPUB
+else # !SYSTEM_MSPUB
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	mspub-0.0 \
@@ -1251,7 +1251,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 
 endef
 
-endif # SYSTEM_LIBMSPUB
+endif # SYSTEM_MSPUB
 
 
 ifeq ($(SYSTEM_VISIO),YES)

config_host.mk.in

@@ -550,7 +550,7 @@ export SYSTEM_CMIS=@SYSTEM_CMIS@
 export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
 export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
 export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
-export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@
+export SYSTEM_MSPUB=@SYSTEM_MSPUB@
 export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
 export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
 export SYSTEM_VISIO=@SYSTEM_VISIO@

configure.ac

@@ -7265,8 +7265,6 @@ if test $_os = iOS; then
 else
     libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.0])
 fi
-SYSTEM_LIBMSPUB=$SYSTEM_MSPUB
-AC_SUBST(SYSTEM_LIBMSPUB)
 
 dnl ===================================================================
 dnl Check for system libvisio

libmspub/Module_libmspub.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,libmspub))
 
-ifeq ($(SYSTEM_LIBMSPUB),NO)
+ifeq ($(SYSTEM_MSPUB),NO)
 
 $(eval $(call gb_Module_add_targets,libmspub,\
 	ExternalPackage_libmspub \

writerperfect/Module_writerperfect.mk

@@ -31,7 +31,7 @@ ifneq (,$(SYSTEM_WPD))
 ifneq (,$(SYSTEM_LIBWPG))
 ifneq (,$(SYSTEM_VISIO))
 ifneq (,$(SYSTEM_CDR))
-ifneq (,$(SYSTEM_LIBMSPUB))
+ifneq (,$(SYSTEM_MSPUB))
 $(eval $(call gb_Module_add_targets,writerperfect,\
 	Library_wpftdraw \
 ))