[Libreoffice-commits] core.git: 2 commits - configure.ac postprocess/Rdb_services.mk RepositoryModule_host.mk

[Tor Lillqvist]

 RepositoryModule_host.mk    |    2 +-
 configure.ac                |    2 +-
 postprocess/Rdb_services.mk |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 21e2f5b0b1bc86c5032242ee3505f8e07b54affa
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 7 13:52:47 2014 +0300

    No fpicker needed for non-DESKTOP surely?
    
    Sure, not a lot of code, but best to not even compile it, to catch
    eventual usage attempts.
    
    Change-Id: I7462ea9a5fbe6080fcec2f424d1a1b80ad0afe21

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a7e176e..bc456b9 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	filter \
 	$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
 	formula \
-	fpicker \
+	$(call gb_Helper_optional,DESKTOP,fpicker) \
 	framework \
 	$(call gb_Helper_optional,DESKTOP,helpcompiler) \
 	$(call gb_Helper_optional,HELP,helpcontent2) \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 15ca776..3acd027 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	filter/source/xsltdialog/xsltdlg \
 	filter/source/xsltfilter/xsltfilter \
 	formula/util/for \
-	fpicker/source/office/fps_office \
+	$(call gb_Helper_optional,DESKTOP,fpicker/source/office/fps_office) \
 	framework/util/fwk \
 	framework/util/fwl \
 	framework/util/fwm \
commit 171d001a89e70cb08b389ad58f1c9683c1adefa8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 7 13:06:18 2014 +0300

    Build libgltf (and freetype) for iOS, too
    
    They won't be used for now, but just to enforce portability of the
    libgltf code a bit.
    
    Change-Id: Ie5d2b9125eb0f4a2e432dcb8b55d5f494a5ed34d

diff --git a/configure.ac b/configure.ac
index 7520ea9..682aee6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10397,7 +10397,7 @@ dnl ===================================================================
 
 ENABLE_GLTF=
 AC_MSG_CHECKING([whether to enable glTF support])
-if test $_os != iOS -a  "x$enable_gltf" != "xno"; then
+if test "x$enable_gltf" != "xno"; then
     ENABLE_GLTF=TRUE
     AC_MSG_RESULT([yes])
     BUILD_TYPE="$BUILD_TYPE LIBGLTF"