online update: Configure switch --enable-online-update=mar

This will enable the mar-based online update instead of the 'traditional' one.
At the moment, this does not build, as libbz2 was not packaged as an external
library yet.

Change-Id: I1ad7d9adf7a12a427786682ad932597eb2319256

Repository.mk

@@ -179,12 +179,12 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \
 ))
 endif
 
+ifneq ($(ENABLE_ONLINE_UPDATE_MAR),)
 $(eval $(call gb_Helper_register_executables_for_install,OOO,updater,\
-	$(if $(ENABLE_ONLINE_UPDATE), \
 		mar \
 		updater \
-	) \
 ))
+endif
 
 $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
 	$(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \

config_host.mk.in

@@ -156,6 +156,7 @@ export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@
 export ENABLE_MARIADBC=@ENABLE_MARIADBC@
 export ENABLE_NPAPI_FROM_BROWSER=@ENABLE_NPAPI_FROM_BROWSER@
 export ENABLE_ONLINE_UPDATE=@ENABLE_ONLINE_UPDATE@
+export ENABLE_ONLINE_UPDATE_MAR=@ENABLE_ONLINE_UPDATE_MAR@
 export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
 export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL=@ENABLE_OPENGL@

configure.ac

@@ -1342,7 +1342,9 @@ AC_ARG_ENABLE(extra-font,
 AC_ARG_ENABLE(online-update,
     AS_HELP_STRING([--enable-online-update],
         [Enable the online update service that will check for new versions of
-         LibreOffice. By default, it is enabled on Windows and Mac, disabled on Linux.]),
+         LibreOffice. By default, it is enabled on Windows and Mac, disabled on Linux.
+         If the value is "mar", the experimental Mozilla-like update will be
+         enabled instead of the traditional update mechanism.]),
 ,)
 
 AC_ARG_ENABLE(extension-update,
@@ -11782,6 +11784,7 @@ dnl Test whether to enable online update service
 dnl ===================================================================
 AC_MSG_CHECKING([whether to enable online update])
 ENABLE_ONLINE_UPDATE=
+ENABLE_ONLINE_UPDATE_MAR=
 if test "$enable_online_update" = ""; then
     if test "$_os" = "WINNT" -o "$_os" = "Darwin"; then
         AC_MSG_RESULT([yes])
@@ -11790,7 +11793,10 @@ if test "$enable_online_update" = ""; then
         AC_MSG_RESULT([no])
     fi
 else
-    if test "$enable_online_update" = "yes"; then
+    if test "$enable_online_update" = "mar"; then
+        AC_MSG_RESULT([yes - MAR-based online update])
+        ENABLE_ONLINE_UPDATE_MAR="TRUE"
+    elif test "$enable_online_update" = "yes"; then
         AC_MSG_RESULT([yes])
         ENABLE_ONLINE_UPDATE="TRUE"
     else
@@ -11798,6 +11804,7 @@ else
     fi
 fi
 AC_SUBST(ENABLE_ONLINE_UPDATE)
+AC_SUBST(ENABLE_ONLINE_UPDATE_MAR)
 
 dnl ===================================================================
 dnl Test whether to enable extension update

onlineupdate/Executable_updater.mk

@@ -13,7 +13,6 @@ $(eval $(call gb_Executable_set_include,updater,\
 	-I$(SRCDIR)/onlineupdate/source/update/src \
 	-I$(SRCDIR)/onlineupdate/source/update/inc \
 	-I$(SRCDIR)/onlineupdate/source/update/common \
-	-I$(SRCDIR)/onlineupdate/source/update/updater/libbz2/src \
 	-I$(SRCDIR)/onlineupdate/source/update/updater/xpcom/glue \
 	-lpthread \
 	$$(INCLUDE) \
@@ -80,13 +79,6 @@ $(eval $(call gb_Executable_add_cobjects,updater,\
 	onlineupdate/source/update/src/mar_create \
 	onlineupdate/source/update/src/mar_extract \
 	onlineupdate/source/update/src/mar_read \
-	onlineupdate/source/update/updater/libbz2/src/blocksort \
-	onlineupdate/source/update/updater/libbz2/src/bzlib \
-	onlineupdate/source/update/updater/libbz2/src/compress \
-	onlineupdate/source/update/updater/libbz2/src/crctable \
-	onlineupdate/source/update/updater/libbz2/src/decompress \
-	onlineupdate/source/update/updater/libbz2/src/huffman \
-	onlineupdate/source/update/updater/libbz2/src/randtable \
 ))
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab: */

onlineupdate/Module_onlineupdate.mk

@@ -10,9 +10,11 @@
 
 $(eval $(call gb_Module_Module,onlineupdate))
 
+ifneq ($(ENABLE_ONLINE_UPDATE_MAR),)
 $(eval $(call gb_Module_add_targets,onlineupdate,\
 	Executable_mar \
 	Executable_updater \
 ))
+endif
 
 # vim: set noet sw=4 ts=4: