diff options
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libvisio/Module_libvisio.mk | 2 | ||||
| -rw-r--r-- | writerperfect/Module_writerperfect.mk | 2 |
5 files changed, 6 insertions, 9 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index da19e441ce5f..f838bf8df31b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1254,7 +1254,7 @@ endef endif # SYSTEM_LIBMSPUB -ifeq ($(SYSTEM_LIBVISIO),YES) +ifeq ($(SYSTEM_VISIO),YES) define gb_LinkTarget__use_visio $(call gb_LinkTarget_set_include,$(1),\ @@ -1265,7 +1265,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(VISIO_LIBS)) endef -else # !SYSTEM_LIBVISIO +else # !SYSTEM_VISIO $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ visio-0.0 \ @@ -1281,7 +1281,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef -endif # SYSTEM_LIBVISIO +endif # SYSTEM_VISIO ifeq ($(SYSTEM_LIBWPD),YES) diff --git a/config_host.mk.in b/config_host.mk.in index 152186b9ed28..dc18078c7a0a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -553,7 +553,7 @@ export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@ export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@ export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@ export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@ -export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@ +export SYSTEM_VISIO=@SYSTEM_VISIO@ export SYSTEM_LIBWPD=@SYSTEM_LIBWPD@ export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@ export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@ diff --git a/configure.ac b/configure.ac index 41a48d9f2f29..06661c7959dc 100644 --- a/configure.ac +++ b/configure.ac @@ -7279,15 +7279,12 @@ if test $_os = iOS; then else libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.0]) fi -SYSTEM_LIBVISIO=$SYSTEM_VISIO -AC_SUBST(SYSTEM_LIBVISIO) dnl =================================================================== dnl Check for system libcmis dnl =================================================================== libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.0]) - dnl =================================================================== dnl Check for system libwpd dnl =================================================================== diff --git a/libvisio/Module_libvisio.mk b/libvisio/Module_libvisio.mk index 9f8352ad14bc..371426545758 100644 --- a/libvisio/Module_libvisio.mk +++ b/libvisio/Module_libvisio.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libvisio)) -ifeq ($(SYSTEM_LIBVISIO),NO) +ifeq ($(SYSTEM_VISIO),NO) $(eval $(call gb_Module_add_targets,libvisio,\ ExternalPackage_libvisio \ diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index 921e7e8b0b13..5b10dcce1259 100644 --- a/writerperfect/Module_writerperfect.mk +++ b/writerperfect/Module_writerperfect.mk @@ -29,7 +29,7 @@ endif ifneq (,$(SYSTEM_LIBWPD)) ifneq (,$(SYSTEM_LIBWPG)) -ifneq (,$(SYSTEM_LIBVISIO)) +ifneq (,$(SYSTEM_VISIO)) ifneq (,$(SYSTEM_LIBCDR)) ifneq (,$(SYSTEM_LIBMSPUB)) $(eval $(call gb_Module_add_targets,writerperfect,\ |