Kaydet (Commit) d75defa3 authored tarafından Jan Holesovsky's avatar Jan Holesovsky Kaydeden (comit) Petr Mladek

Make the online update service configurable (via --enable-online-update).

Signed-off-by: 's avatarPetr Mladek <pmladek@suse.cz>
üst ba62ce46
...@@ -475,6 +475,12 @@ AC_ARG_ENABLE(lomenubar, ...@@ -475,6 +475,12 @@ AC_ARG_ENABLE(lomenubar,
[Enable global menu support.]), [Enable global menu support.]),
,) ,)
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 on on Windows and Mac, and off on Linux.]),
,)
dnl =================================================================== dnl ===================================================================
dnl Optional Packages (--with/without-) dnl Optional Packages (--with/without-)
dnl =================================================================== dnl ===================================================================
...@@ -7501,6 +7507,28 @@ else ...@@ -7501,6 +7507,28 @@ else
fi fi
AC_SUBST(ENABLE_LOMENUBAR) AC_SUBST(ENABLE_LOMENUBAR)
dnl ===================================================================
dnl Test whether to enable online update service
dnl ===================================================================
AC_MSG_CHECKING([whether to enable online update])
ENABLE_ONLINE_UPDATE=
if test "z$enable_online_update" = "z" ; then
if test "$_os" = "WINNT" -o "$_os" = "Darwin" ; then
AC_MSG_RESULT([yes])
ENABLE_ONLINE_UPDATE="TRUE"
else
AC_MSG_RESULT([no])
fi
else
if test "z$enable_online_update" = "zyes" ; then
AC_MSG_RESULT([yes])
ENABLE_ONLINE_UPDATE="TRUE"
else
AC_MSG_RESULT([no])
fi
fi
AC_SUBST(ENABLE_ONLINE_UPDATE)
dnl =================================================================== dnl ===================================================================
dnl Test whether to enable ActiveX embedding dnl Test whether to enable ActiveX embedding
dnl =================================================================== dnl ===================================================================
......
...@@ -1152,7 +1152,7 @@ ProfileItem gid_Brand_Profileitem_Version_Updateurl ...@@ -1152,7 +1152,7 @@ ProfileItem gid_Brand_Profileitem_Version_Updateurl
Section = "Version"; Section = "Version";
Order = 15; Order = 15;
Key = "UpdateURL"; Key = "UpdateURL";
#if defined(BUILD_SPECIAL) #if defined(ENABLE_ONLINE_UPDATE)
#ifdef WNT #ifdef WNT
Value = "${UPDATEURL}"; Value = "${UPDATEURL}";
#else // defined WNT #else // defined WNT
......
...@@ -45,6 +45,10 @@ SCPDEFS+=-D_MSC ...@@ -45,6 +45,10 @@ SCPDEFS+=-D_MSC
SCPDEFS+=-DBUILD_SPECIAL SCPDEFS+=-DBUILD_SPECIAL
.ENDIF .ENDIF
.IF "$(ENABLE_ONLINE_UPDATE)"!=""
SCPDEFS+=-DENABLE_ONLINE_UPDATE
.ENDIF
.IF "$(BUILD_X64)"!="" .IF "$(BUILD_X64)"!=""
SCPDEFS+=-DBUILD_X64 SCPDEFS+=-DBUILD_X64
.ENDIF .ENDIF
......
...@@ -215,7 +215,7 @@ SCP1FILES += cairocanvas.par ...@@ -215,7 +215,7 @@ SCP1FILES += cairocanvas.par
SCP1FILES += layout.par SCP1FILES += layout.par
.ENDIF # ENABLE_LAYOUT == TRUE .ENDIF # ENABLE_LAYOUT == TRUE
.IF "$(BUILD_SPECIAL)"!="" .IF "$(ENABLE_ONLINE_UPDATE)"!=""
SCP1FILES += \ SCP1FILES += \
module_onlineupdate.par \ module_onlineupdate.par \
file_onlineupdate.par file_onlineupdate.par
...@@ -392,7 +392,7 @@ SCP2FILES += \ ...@@ -392,7 +392,7 @@ SCP2FILES += \
SCP2FILES += layout.par SCP2FILES += layout.par
.ENDIF # ENABLE_LAYOUT == TRUE .ENDIF # ENABLE_LAYOUT == TRUE
.IF "$(BUILD_SPECIAL)"!="" .IF "$(ENABLE_ONLINE_UPDATE)"!=""
SCP2FILES += \ SCP2FILES += \
module_onlineupdate.par \ module_onlineupdate.par \
file_onlineupdate.par file_onlineupdate.par
......
...@@ -1983,6 +1983,7 @@ ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" ); ...@@ -1983,6 +1983,7 @@ ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" );
ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" ); ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" ); ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" );
ToFile( "ENABLE_LOMENUBAR", "@ENABLE_LOMENUBAR@", "e" ); ToFile( "ENABLE_LOMENUBAR", "@ENABLE_LOMENUBAR@", "e" );
ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" );
ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" ); ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" );
ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" ); ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" ); ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment