rename SYSTEM_LIBWPD to SYSTEM_WPD to remove specialcasing

Change-Id: Ibc8178e2dd7209705cb752f9570e414483c319a7

RepositoryExternal.mk

@@ -1284,7 +1284,7 @@ endef
 endif # SYSTEM_VISIO
 
 
-ifeq ($(SYSTEM_LIBWPD),YES)
+ifeq ($(SYSTEM_WPD),YES)
 
 define gb_LinkTarget__use_wpd
 $(call gb_LinkTarget_set_include,$(1),\
@@ -1296,7 +1296,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(WPD_LIBS))
 endef
 gb_ExternalProject__use_wpd :=
 
-else # !SYSTEM_LIBWPD
+else # !SYSTEM_WPD
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	wpd-0.9 \
@@ -1316,7 +1316,7 @@ $(call gb_ExternalProject_use_package,$(1),libwpd)
 
 endef
 
-endif # SYSTEM_LIBWPD
+endif # SYSTEM_WPD
 
 
 ifeq ($(SYSTEM_LIBWPG),YES)

config_host.mk.in

@@ -554,7 +554,7 @@ export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@
 export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
 export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
 export SYSTEM_VISIO=@SYSTEM_VISIO@
-export SYSTEM_LIBWPD=@SYSTEM_LIBWPD@
+export SYSTEM_WPD=@SYSTEM_WPD@
 export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@
 export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@
 export SYSTEM_LIBXML=@SYSTEM_LIBXML@

configure.ac

@@ -7297,8 +7297,6 @@ else
     fi
     libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9])
 fi
-SYSTEM_LIBWPD=$SYSTEM_WPD
-AC_SUBST(SYSTEM_LIBWPD)
 
 dnl ===================================================================
 dnl Check for system lcms2

libwpd/Module_libwpd.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,libwpd))
 
-ifeq ($(SYSTEM_LIBWPD),NO)
+ifeq ($(SYSTEM_WPD),NO)
 
 $(eval $(call gb_Module_add_targets,libwpd,\
 	ExternalProject_libwpd \

writerperfect/Module_writerperfect.mk

@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Module_Module,writerperfect))
 
-ifneq (,$(SYSTEM_LIBWPD))
+ifneq (,$(SYSTEM_WPD))
 ifneq (,$(SYSTEM_LIBWPS))
 $(eval $(call gb_Module_add_targets,writerperfect,\
 	Library_wpftwriter \
@@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,writerperfect,\
 endif
 endif
 
-ifneq (,$(SYSTEM_LIBWPD))
+ifneq (,$(SYSTEM_WPD))
 ifneq (,$(SYSTEM_LIBWPG))
 ifneq (,$(SYSTEM_VISIO))
 ifneq (,$(SYSTEM_LIBCDR))
@@ -41,7 +41,7 @@ endif
 endif
 endif
 
-ifneq (,$(SYSTEM_LIBWPD))
+ifneq (,$(SYSTEM_WPD))
 ifneq (,$(SYSTEM_LIBWPG))
 $(eval $(call gb_Module_add_targets,writerperfect,\
 	StaticLibrary_writerperfect \