Enable or disable Online Update in configure

7 files changed, 36 insertions, 4 deletions

diff --git a/configure.in b/configure.in
index 764dbc5d2e17..8c4f37c7d01a 100644
--- a/configure.in
+++ b/configure.in
@@ -46,6 +46,9 @@ AC_ARG_ENABLE(graphite,
 AC_ARG_WITH(system-graphite,
 [  --with-system-graphite    use graphite library already installed on system
 ],,)
+AC_ARG_ENABLE(online-update,
+[  --disable-online-update Disables the Online Update feature.
+],,enable_online_update=yes)
 AC_ARG_ENABLE(ldap,
 [  --disable-ldap          Disables the use of LDAP backend via Netscape/Mozilla
                           or OpenLDAP LDAP SDK
@@ -1342,6 +1345,20 @@ fi
 
 # gstreamer is used only via pre-installed libraries: not a problem
 
+dnl ===================================================================
+dnl Online Update
+dnl ===================================================================
+AC_MSG_CHECKING([whether to enable the Online Update support])
+if test "$enable_online_update" = "yes" -o "$enable_online_update" = "TRUE"; then
+   ENABLE_ONLINE_UPDATE="YES"
+   SCPDEFS="$SCPDEFS -DENABLE_ONLINE_UPDATE"
+   AC_MSG_RESULT([yes])
+else
+   ENABLE_ONLINE_UPDATE=""
+   AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_ONLINE_UPDATE)
+
 
 AC_MSG_CHECKING([whether to enable native CUPS support])
 if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then
diff --git a/extensions/source/update/check/makefile.mk b/extensions/source/update/check/makefile.mk
index b66a48a63991..66dc486e32ae 100644
--- a/extensions/source/update/check/makefile.mk
+++ b/extensions/source/update/check/makefile.mk
@@ -26,6 +26,12 @@ PRJNAME=extensions
 TARGET=updchk
 PACKAGE=org.openoffice.Office
 
+
+.IF "$(ENABLE_ONLINE_UPDATE)" != "YES"
+@all:
+    @echo "Online Update disabled."
+.ELSE
+
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE
 
@@ -140,3 +146,5 @@ $(MISC)/updchk.uno.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
     $(XSLTPROC) --nonet --stringparam uri \
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt updchk.uno.component
+
+.ENDIF # "$(ENABLE_ONLINE_UPDATE)" == "YES"
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 4445df65fbd1..0206e992f9ed 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -163,7 +163,6 @@ my_components = \
     ucptdoc1 \
     updatefeed \
     updchk \
-    updchk.uno \
     utl \
     uui \
     vbaevents \
@@ -187,6 +186,10 @@ my_components += component/vcl/vcl.unx
 .ENDIF
 .ENDIF
 
+.IF "$(ENABLE_ONLINE_UPDATE)"=="YES"
+my_components += updchk.uno
+.END
+
 .IF "$(BUILD_SPECIAL)" != ""
 my_components += oooimprovement
 .END
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 9e75ae01a689..41a79f1504cd 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -42,7 +42,6 @@ MY_XCDS = \
     $(MISC)/lingucomponent.xcd \
     $(MISC)/main.xcd \
     $(MISC)/math.xcd \
-    $(MISC)/onlineupdate.xcd \
     $(MISC)/oooimprovement.xcd \
     $(MISC)/palm.xcd \
     $(MISC)/pocketexcel.xcd \
@@ -51,6 +50,10 @@ MY_XCDS = \
     $(MISC)/w4w.xcd \
     $(MISC)/writer.xcd \
     $(MISC)/xsltfilter.xcd
+.IF "$(ENABLE_ONLINE_UPDATE)" == "YES"
+MY_XCDS += \
+    $(MISC)/onlineupdate.xcd
+.END
 
 MY_DEPS_base = main
 MY_FILES_base = \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index cfd4849615f2..a42a6a204cfa 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1006,7 +1006,7 @@ ProfileItem gid_Brand_Profileitem_Version_Updateurl
     Section = "Version";
     Order = 15;
     Key = "UpdateURL";
-  #if defined(BUILD_SPECIAL)
+  #if defined(ENABLE_ONLINE_UPDATE)
   #ifdef WNT
     Value = "${UPDATEURL}";
   #else  // defined WNT
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 8d0730c49c15..01a83896b44f 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -182,7 +182,7 @@ SCP1FILES += cairocanvas.par
 SCP1FILES += layout.par
 .ENDIF # ENABLE_LAYOUT == TRUE
 
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)" != ""
 SCP1FILES += \
              module_onlineupdate.par   \
              file_onlineupdate.par
diff --git a/set_soenv.in b/set_soenv.in
index 61aa9240e8b1..e6a95a7de2b7 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1716,6 +1716,7 @@ ToFile( "TARFILE_LOCATION",  $TARFILE_LOCATION,  "e" );
 ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@",  "e" );
 ToFile( "CUSTOM_PACK_LIST",  "@CUSTOM_PACK_LIST@",  "e" );
 ToFile( "USE_PACKAGER",      "@USE_PACKAGER@",      "e" );
+ToFile( "ENABLE_ONLINE_UPDATE", "@ENABLE_ONLINE_UPDATE@", "e" );
 #
 # Writing the platform dependent constant values to file.
 # (c = comment, e = environment variable, a = alias )