diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rwxr-xr-x | postprocess/Rdb_services.mk | 2 | ||||
| -rw-r--r-- | ucb/Module_ucb.mk | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index ba194a4de48b..79958f916fa3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -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@ diff --git a/configure.ac b/configure.ac index 82909e297728..7aad76191c31 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index fc7c671b9d43..ad1ac490aff1 100755 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -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 \ diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk index 0ea37f61bba2..805a21b568c8 100644 --- a/ucb/Module_ucb.mk +++ b/ucb/Module_ucb.mk @@ -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 \ |