.gitignore | 2 ++
config_host.mk.in | 2 ++
configure.ac | 13 ++++++++++++-
postprocess/Rdb_services.mk | 4 ++--
ucb/Module_ucb.mk | 4 ++--
5 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit 215f87fb53164a5fc9af13acdad7fdada2117b60
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Dec 5 12:23:08 2013 +0200
We need an ENABLE_CURL, too
It is not enough to just have CURL in BUILD_TYPE or not. At least the
ftp UCP requires libcurl unconditionally, so it can't be built if we
don't have either a system or bundled libcurl.
Change-Id: I38e9939acb160d581e9a070a6cd7a0c89ddb5266
diff --git a/config_host.mk.in b/config_host.mk.in
index 79958f9..e1f0226f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -108,6 +108,7 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
export ENABLE_CMIS=@ENABLE_CMIS@
export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
export ENABLE_CUPS=@ENABLE_CUPS@
+export ENABLE_CURL=@ENABLE_CURL@
export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
export ENABLE_DBUS=@ENABLE_DBUS@
export ENABLE_DEBUG=@ENABLE_DEBUG@
diff --git a/configure.ac b/configure.ac
index 7aad761..c3ffe05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8640,17 +8640,21 @@ if test "$with_system_curl" = "yes"; then
libo_MINGW_TRY_DLL([libgpg-error])
libo_MINGW_TRY_DLL([libgcrypt])
libo_MINGW_TRY_DLL([libssh2])
+ ENABLE_CURL=TRUE
elif test $_os = iOS; then
# Let's see if we need curl, I think not?
AC_MSG_RESULT([none])
+ ENABLE_CURL=
else
AC_MSG_RESULT([internal])
SYSTEM_CURL=NO
BUILD_TYPE="$BUILD_TYPE CURL"
+ ENABLE_CURL=TRUE
fi
AC_SUBST(SYSTEM_CURL)
AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS)
+AC_SUBST(ENABLE_CURL)
dnl ===================================================================
dnl Check for system boost
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index ad1ac49..c044e14 100755
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -96,7 +96,7 @@ $(eval $(call gb_Rdb_add_components,services,\
ucb/source/ucp/expand/ucpexpand1 \
ucb/source/ucp/ext/ucpext \
ucb/source/ucp/file/ucpfile1 \
- ucb/source/ucp/ftp/ucpftp1 \
+ $(if $(ENABLE_CURL),ucb/source/ucp/ftp/ucpftp1) \
ucb/source/ucp/hierarchy/ucphier1 \
ucb/source/ucp/package/ucppkg1 \
ucb/source/ucp/tdoc/ucptdoc1 \
diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk
index 805a21b..1e64c24 100644
--- a/ucb/Module_ucb.mk
+++ b/ucb/Module_ucb.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_targets,ucb,\
Library_ucpexpand1 \
Library_ucpext \
Library_ucpfile1 \
- Library_ucpftp1 \
+ $(if $(ENABLE_CURL),Library_ucpftp1) \
Library_ucphier1 \
Library_ucppkg1 \
Library_ucptdoc1 \
commit ef8c2098a8528c0ca3cd9c66e23f4420f8660d19
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Dec 5 12:00:59 2013 +0200
Ignore also instdir_for_build and workdir_for_build
Change-Id: I2e6a26cd1e54ad28ec27f2205262413db039a136
diff --git a/.gitignore b/.gitignore
index a227af3..64ebb3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,9 @@
# where stuff are built
/instdir
+/instdir_for_build
/workdir
+/workdir_for_build
# where the external downloads maybe located
/external/tarballs
commit 4eaa08f1d4e110dd3c3f464eaf9e7c526b7c28f7
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Dec 5 12:00:06 2013 +0200
Let's try to manage without building libcmis for iOS
libcmis needs curl and sice 618052e201318bcfba8a0fcdd29cf88eaa4a143e
we don't build that for iOS.
Change-Id: I78b5faa1a997a3e304cdbd80e254eab370caf552
diff --git a/config_host.mk.in b/config_host.mk.in
index ba194a4..79958f9 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 82909e2..7aad761 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 fc7c671..ad1ac49 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 0ea37f6..805a21b 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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
