mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename SYSTEM_LIBVISIO to SYSTEM_VISIO to remove specialcasing

Browse Source 
Change-Id: Ib895be66ecb4c95a86696007fdda453d3a3b34e0
This commit is contained in:
Bjoern Michaelsen
2013-02-19 11:14:46 +01:00
parent 88ed6d1348
commit fe8bcfa422
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RepositoryExternal.mk
View File

@@ -1254,7 +1254,7 @@ endef
endif # SYSTEM_LIBMSPUB endif # SYSTEM_LIBMSPUB
ifeq ($(SYSTEM_LIBVISIO),YES) ifeq ($(SYSTEM_VISIO),YES)
define gb_LinkTarget__use_visio define gb_LinkTarget__use_visio
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
@@ -1265,7 +1265,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(VISIO_LIBS))
endef endef
else # !SYSTEM_LIBVISIO else # !SYSTEM_VISIO
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
visio-0.0 \ visio-0.0 \
@@ -1281,7 +1281,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef endef
endif # SYSTEM_LIBVISIO endif # SYSTEM_VISIO
ifeq ($(SYSTEM_LIBWPD),YES) ifeq ($(SYSTEM_LIBWPD),YES)

2
config_host.mk.in
View File

@@ -553,7 +553,7 @@ export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@ export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@
export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@ export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@ export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@ export SYSTEM_VISIO=@SYSTEM_VISIO@
export SYSTEM_LIBWPD=@SYSTEM_LIBWPD@ export SYSTEM_LIBWPD=@SYSTEM_LIBWPD@
export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@ export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@
export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@ export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@

3
configure.ac
View File

@@ -7279,15 +7279,12 @@ if test $_os = iOS; then
else else
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.0]) libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.0])
fi fi
SYSTEM_LIBVISIO=$SYSTEM_VISIO
AC_SUBST(SYSTEM_LIBVISIO)
dnl =================================================================== dnl ===================================================================
dnl Check for system libcmis dnl Check for system libcmis
dnl =================================================================== dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.0]) libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.0])
dnl =================================================================== dnl ===================================================================
dnl Check for system libwpd dnl Check for system libwpd
dnl =================================================================== dnl ===================================================================

2
libvisio/Module_libvisio.mk
View File

@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libvisio)) $(eval $(call gb_Module_Module,libvisio))
ifeq ($(SYSTEM_LIBVISIO),NO) ifeq ($(SYSTEM_VISIO),NO)
$(eval $(call gb_Module_add_targets,libvisio,\ $(eval $(call gb_Module_add_targets,libvisio,\
ExternalPackage_libvisio \ ExternalPackage_libvisio \

2
writerperfect/Module_writerperfect.mk
View File

@@ -29,7 +29,7 @@ endif
ifneq (,$(SYSTEM_LIBWPD)) ifneq (,$(SYSTEM_LIBWPD))
ifneq (,$(SYSTEM_LIBWPG)) ifneq (,$(SYSTEM_LIBWPG))
ifneq (,$(SYSTEM_LIBVISIO)) ifneq (,$(SYSTEM_VISIO))
ifneq (,$(SYSTEM_LIBCDR)) ifneq (,$(SYSTEM_LIBCDR))
ifneq (,$(SYSTEM_LIBMSPUB)) ifneq (,$(SYSTEM_LIBMSPUB))
$(eval $(call gb_Module_add_targets,writerperfect,\ $(eval $(call gb_Module_add_targets,writerperfect,\