Let's try to manage without building libcmis for iOS

libcmis needs curl and sice 618052e201
we don't build that for iOS.

Change-Id: I78b5faa1a997a3e304cdbd80e254eab370caf552
This commit is contained in:
Tor Lillqvist
2013-12-05 12:38:56 +02:00
parent 461e0f9eaf
commit 4eaa08f1d4
4 changed files with 11 additions and 3 deletions
+1
View File
@@ -105,6 +105,7 @@ export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
export ENABLE_AVAHI=@ENABLE_AVAHI@
export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
export ENABLE_CMIS=@ENABLE_CMIS@
export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
export ENABLE_CUPS=@ENABLE_CUPS@
export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
+8 -1
View File
@@ -7743,7 +7743,14 @@ libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.0])
dnl ===================================================================
dnl Check for system libcmis
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 >= 0.4.0])
# libcmis requires curl and we can't build curl for iOS
if test $_os != iOS; then
libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 >= 0.4.0])
ENABLE_CMIS=TRUE
else
ENABLE_CMIS=
fi
AC_SUBST(ENABLE_CMIS)
dnl ===================================================================
dnl Check for system libwpd
+1 -1
View File
@@ -92,7 +92,7 @@ $(eval $(call gb_Rdb_add_components,services,\
ucb/source/sorter/srtrs1 \
ucb/source/core/ucb1 \
ucb/source/cacher/cached1 \
ucb/source/ucp/cmis/ucpcmis1 \
$(if $(ENABLE_CMIS),ucb/source/ucp/cmis/ucpcmis1) \
ucb/source/ucp/expand/ucpexpand1 \
ucb/source/ucp/ext/ucpext \
ucb/source/ucp/file/ucpfile1 \
+1 -1
View File
@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,ucb,\
Library_cached1 \
Library_srtrs1 \
Library_ucb1 \
Library_ucpcmis1 \
$(if $(ENABLE_CMIS),Library_ucpcmis1) \
Library_ucpexpand1 \
Library_ucpext \
Library_ucpfile1 \