Kaydet (Commit) 88ed6d13 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen

rename SYSTEM_LIBCMIS to SYSTEM_CMIS to remove specialcasing

Change-Id: I7fdf7fd285d6b8c584d8fe225729f15f3f9798ad
üst 43682489
......@@ -565,7 +565,7 @@ endef
endif # SYSTEM_BOOST
ifeq ($(SYSTEM_LIBCMIS),YES)
ifeq ($(SYSTEM_CMIS),YES)
define gb_LinkTarget__use_cmis
$(call gb_LinkTarget_set_include,$(1),\
......@@ -576,7 +576,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(CMIS_LIBS))
endef
else # !SYSTEM_LIBCMIS
else # !SYSTEM_CMIS
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
cmislib \
......@@ -589,7 +589,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef
endif # SYSTEM_LIBCMIS
endif # SYSTEM_CMIS
ifeq ($(OS)$(COM),WNTGCC)
......
......@@ -546,7 +546,7 @@ export SYSTEM_JPEG=@SYSTEM_JPEG@
export SYSTEM_LCMS2=@SYSTEM_LCMS2@
export SYSTEM_LIBC=@SYSTEM_LIBC@
export SYSTEM_LIBCDR=@SYSTEM_LIBCDR@
export SYSTEM_LIBCMIS=@SYSTEM_LIBCMIS@
export SYSTEM_CMIS=@SYSTEM_CMIS@
export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
......
......@@ -7286,8 +7286,6 @@ dnl ===================================================================
dnl Check for system libcmis
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.0])
SYSTEM_LIBCMIS=$SYSTEM_CMIS
AC_SUBST(SYSTEM_LIBCMIS)
dnl ===================================================================
......
......@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,libcmis))
ifeq ($(SYSTEM_LIBCMIS),NO)
ifeq ($(SYSTEM_CMIS),NO)
$(eval $(call gb_Module_add_targets,libcmis,\
ExternalPackage_libcmis \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment