rename SYSTEM_LIBCDR to SYSTEM_CDR to remove specialcasing

Change-Id: I14bd9c0a4b9b55963da67102468d573f7132fab7

RepositoryExternal.mk

@@ -1194,7 +1194,7 @@ endef
 endif # SYSTEM_OPENSSL
 
 
-ifeq ($(SYSTEM_LIBCDR),YES)
+ifeq ($(SYSTEM_CDR),YES)
 
 define gb_LinkTarget__use_cdr
 $(call gb_LinkTarget_set_include,$(1),\
@@ -1205,7 +1205,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(CDR_LIBS))
 
 endef
 
-else # !SYSTEM_LIBCDR
+else # !SYSTEM_CDR
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	cdr-0.0 \
@@ -1221,7 +1221,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 
 endef
 
-endif # SYSTEM_LIBCDR
+endif # SYSTEM_CDR
 
 
 ifeq ($(SYSTEM_LIBMSPUB),YES)

config_host.mk.in

@@ -545,7 +545,7 @@ export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@
 export SYSTEM_JPEG=@SYSTEM_JPEG@
 export SYSTEM_LCMS2=@SYSTEM_LCMS2@
 export SYSTEM_LIBC=@SYSTEM_LIBC@
-export SYSTEM_LIBCDR=@SYSTEM_LIBCDR@
+export SYSTEM_CDR=@SYSTEM_CDR@
 export SYSTEM_CMIS=@SYSTEM_CMIS@
 export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
 export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@

configure.ac

@@ -7255,8 +7255,6 @@ if test $_os = iOS; then
 else
     libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.0 >= 0.0.5])
 fi
-SYSTEM_LIBCDR=$SYSTEM_CDR
-AC_SUBST(SYSTEM_LIBCDR)
 
 dnl ===================================================================
 dnl Check for system libmspub

libcdr/Module_libcdr.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,libcdr))
 
-ifeq ($(SYSTEM_LIBCDR),NO)
+ifeq ($(SYSTEM_CDR),NO)
 
 $(eval $(call gb_Module_add_targets,libcdr,\
 	ExternalPackage_libcdr \

writerperfect/Module_writerperfect.mk

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