[Libreoffice-commits] core.git: config_host.mk.in configure.ac ios/Module_ios.mk

[Libreoffice Gerrit user]

 config_host.mk.in |    1 +
 configure.ac      |   23 ++++++++++++++++++-----
 ios/Module_ios.mk |    8 +++++---
 3 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit a922f56cbf25f78534cd2d36bf13a86a4f15d970
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Tue Aug 28 11:36:13 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Tue Aug 28 11:38:51 2018 +0300

    Add --enable-ios-libreofficelight-app option to build stuff for janI's app
    
    Change-Id: I1310cb8f5f543f49f9667ee10cb26c9809df259e

diff --git a/config_host.mk.in b/config_host.mk.in
index 0d87b7dfb535..691ec809bbab 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -143,6 +143,7 @@ export ENABLE_GTK=@ENABLE_GTK@
 export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
 export DISABLE_GUI=@DISABLE_GUI@
 export ENABLE_HTMLHELP=@ENABLE_HTMLHELP@
+export ENABLE_IOS_LIBREOFFICELIGHT_APP=@ENABLE_IOS_LIBREOFFICELIGHT_APP@
 export ENABLE_JAVA=@ENABLE_JAVA@
 export ENABLE_KDE4=@ENABLE_KDE4@
 export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
diff --git a/configure.ac b/configure.ac
index a31b26c62ab9..4a2d71a04877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -949,6 +949,24 @@ if test $_os != "WINNT"; then
 fi
 AC_SUBST(DLOPEN_LIBS)
 
+AC_ARG_ENABLE(ios-simulator,
+    AS_HELP_STRING([--enable-ios-simulator],
+        [build i386 or x86_64 for ios simulator])
+)
+
+AC_ARG_ENABLE(ios-libreofficelight-app,
+    AS_HELP_STRING([--enable-ios-libreofficelight-app],
+        [When building for iOS, build stuff relevant only for the 'LibreOfficeLight' app
+         (in ios/LibreOfficeLight). Note that this app is not known to work in any useful manner,
+         and also that its actual build (in Xcode) requires some obvious modifications to the project.])
+)
+
+ENABLE_IOS_LIBREOFFICELIGHT_APP=
+if test "$enable_ios_libreofficelight_app" = yes; then
+    ENABLE_IOS_LIBREOFFICELIGHT_APP=TRUE
+fi
+AC_SUBST(ENABLE_IOS_LIBREOFFICELIGHT_APP)
+
 ###############################################################################
 # Extensions switches --enable/--disable
 ###############################################################################
@@ -962,11 +980,6 @@ AC_SUBST(DLOPEN_LIBS)
 # if you use --disable-extension-integration. Is that really the
 # case?
 
-AC_ARG_ENABLE(ios-simulator,
-    AS_HELP_STRING([--enable-ios-simulator],
-        [build i386 or x86_64 for ios simulator])
-)
-
 libo_FUZZ_ARG_ENABLE(extension-integration,
     AS_HELP_STRING([--disable-extension-integration],
         [Disable integration of the built extensions in the installer of the
diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk
index 111391b31bee..d5b215e2cb82 100644
--- a/ios/Module_ios.mk
+++ b/ios/Module_ios.mk
@@ -12,12 +12,14 @@ ifeq ($(OS),IOS)
 
 $(eval $(call gb_Module_add_targets,ios,\
 	CustomTarget_iOS_setup \
-	CustomTarget_iOS_link \
 ))
 
+ifneq ($(ENABLE_IOS_LIBREOFFICELIGHT),)
+$(eval $(call gb_Module_add_targets,ios,\
+	CustomTarget_iOS_link \
+))
 
-
-
+endif
 endif
 
 # vim: set noet sw=4 ts=4: