[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am

[Libreoffice Gerrit user]

 configure.ac          |   13 +++++++++++++
 loleaflet/Makefile.am |    5 +++++
 2 files changed, 18 insertions(+)

New commits:
commit fd758496a5e32a7908333479bf5d703fbf2bf8d8
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 17 01:22:24 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Oct 17 01:22:24 2018 +0300

    Add --enable-gtkapp configury option
    
    Change-Id: Ib805581663aeec62d713f87ca72ab3cfe95db79f

diff --git a/configure.ac b/configure.ac
index 5d337ef42..669783ef0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,12 @@ AC_ARG_ENABLE([iosapp],
                              [Use in a tree where the only purpose is to build the HTML and CSS stuff
                               to be copied to a Mac where the iOS app is being built.]))
 
+AC_ARG_ENABLE([gtkapp],
+              AS_HELP_STRING([--enable-gtkapp],
+                             [Use in a tree where the only purpose is to build the gtk+ "app" that is supposed
+                              to work similarly to the iOS app, from the JavaScript and the pseudo WebSocket
+                              message plumbing point of view.]))
+
 AC_ARG_ENABLE([seccomp],
               AS_HELP_STRING([--disable-seccomp],
                              [Disable use of linux/seccomp.h header when kernel on target system does not support it.
@@ -165,6 +171,13 @@ fi
 AC_SUBST(ENABLE_IOSAPP)
 AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"])
 
+ENABLE_GTKAPP=
+if test "$enable_gtkapp" = "yes"; then
+   ENABLE_GTKAPP=true
+fi
+AC_SUBST(ENABLE_GTKAPP)
+AM_CONDITIONAL([ENABLE_GTKAPP], [test "$ENABLE_GTKAPP" = "true"])
+
 MAX_CONNECTIONS=20
 AS_IF([test -n "$with_max_connections" && test "$with_max_connections" -gt "0"],
       [MAX_CONNECTIONS="$with_max_connections"])
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index a1deb0f78..5ae2ed51c 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -13,8 +13,10 @@ L10N_PO = $(wildcard $(srcdir)/po/*.po)
 # HTTP to load the message catalog .json files.
 
 if !ENABLE_IOSAPP
+if !ENABLE_GTKAPP
 L10N_JSON = $(patsubst $(srcdir)/po/%.po,$(builddir)/dist/l10n/%.json,$(L10N_PO))
 endif
+endif
 
 JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images
 JQUERY_UI_IMAGES = $(wildcard $(JQUERY_UI_IMAGE_PATH)/*.png)
@@ -93,9 +95,11 @@ NODE_MODULES_JS =\
 	node_modules/vex-js/js/vex.dialog.js
 
 if !ENABLE_IOSAPP
+if !ENABLE_GTKAPP
 NODE_MODULES_JS +=\
 	node_modules/l10n-for-node/l10n.js
 endif
+endif
 
 NODE_MODULES_JS_SRC = $(patsubst %.js,$(builddir)/%.js,$(NODE_MODULES_JS))
 NODE_MODULES_JS_DST = $(patsubst %.js,$(builddir)/dist/%.js,$(NODE_MODULES_JS))
@@ -202,6 +206,7 @@ $(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
 	@echo "Generating loleaflet.html..."
 	@m4 -E -DDEBUG=$(ENABLE_DEBUG) \
 		-DIOSAPP=$(ENABLE_IOSAPP) \
+		-DGTKAPP=$(ENABLE_GTKAPP) \
 		-DLOLEAFLET_CSS="$(subst $(SPACE),$(COMMA),$(LOLEAFLET_CSS_M4))" \
 		-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(GLOBAL_JS) $(NODE_MODULES_JS) \
 		$(call LOLEAFLET_JS,$(srcdir)/build/build.js) \