[Libreoffice-commits] online.git: configure.ac

[Henry Castro (via logerrit)]

 configure.ac |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit bc4885b64ae6fbff17d870270c73a8d622276dd3
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Mon Apr 13 19:47:14 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Mon Apr 20 23:58:50 2020 +0200

    android: generate only the necessary config files
    
    Avoid generates files that are not needed to develop android
    
    Change-Id: Ica882e3faeaa800e03e8bf811c81c328a7dff6a3
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92138
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/configure.ac b/configure.ac
index a7bd6a57c..b4bf69e97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1064,21 +1064,28 @@ AM_CONDITIONAL([ENABLE_CYPRESS], [$ENABLE_CYPRESS])
 AC_SUBST(ENABLE_CYPRESS)
 
 AC_CONFIG_FILES([Makefile
-                 android/app/appSettings.gradle
-                 android/lib/libSettings.gradle
-                 android/lib/src/main/cpp/CMakeLists.txt
-                 android/Makefile
                  cypress_test/Makefile
                  gtk/Makefile
-                 ios/config.h
-                 ios/Mobile/Info.plist
-                 ios/Mobile/Resources/Settings.bundle/Root.plist
                  test/Makefile
                  loleaflet/Makefile
                  loleaflet/npm-shrinkwrap.json
                  loolwsd.spec
                  loolwsd.xml
                  debian/loolwsd.postinst])
+
+if test "$enable_iosapp" = "yes"; then
+    AC_CONFIG_FILES([ios/config.h
+                 ios/Mobile/Info.plist
+                 ios/Mobile/Resources/Settings.bundle/Root.plist])
+fi
+
+if test "$enable_androidapp" = "yes"; then
+    AC_CONFIG_FILES([android/Makefile
+                 android/app/appSettings.gradle
+                 android/lib/libSettings.gradle
+                 android/lib/src/main/cpp/CMakeLists.txt])
+fi
+
 AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])
 
 AC_OUTPUT