Merge remote-tracking branch 'origin/libreoffice-3-4'

Conflicts:
Makefile.in
bootstrap.1
configure.in
solenv/inc/minor.mk

1 files changed, 1 insertions, 0 deletions

diff --git a/set_soenv.in b/set_soenv.in
index b9e42a84673e..863a39100062 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1965,6 +1965,7 @@ ToFile( "DB_LIB",            "@DB_LIB@",           "e" );
 ToFile( "DB_CPPLIB",         "@DB_CPPLIB@",        "e" );
 ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );
 ToFile( "ENABLE_LOMENUBAR",  "@ENABLE_LOMENUBAR@", "e" );
+ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" );
 ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
 ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
 ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );