[Libreoffice-commits] .: configure.in set_soenv.in

[Bjoern Michaelsen]

 configure.in |   18 ++++++++++++++++++
 set_soenv.in |    1 +
 2 files changed, 19 insertions(+)

New commits:
commit 7e4a56d662eae32850384d39583be1809b2f17d2
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Apr 27 14:29:58 2011 +0200

    add --enable-lomenubar switch to configure

diff --git a/configure.in b/configure.in
index 7419fd4..9641f81 100755
--- a/configure.in
+++ b/configure.in
@@ -472,6 +472,11 @@ AC_ARG_ENABLE(extra-font,
 	[Add extra font content.]),
 ,)
 
+AC_ARG_ENABLE(lomenubar,
+    AS_HELP_STRING([--enable-lomenubar],
+	[Enable global menu support.]),
+,)
+
 dnl ===================================================================
 dnl Optional Packages (--with/without-)
 dnl ===================================================================
@@ -7415,6 +7420,19 @@ AC_SUBST(WITH_EXTRA_FONT)
 AC_SUBST(OOOP_FONTS_PACK)
 
 dnl ===================================================================
+dnl Test whether to build global menu support
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build global menu support])
+if test "z$enable_lomenubar" = "z" -o "z$enable_lomenubar" = "zno" ; then
+  AC_MSG_RESULT([no])
+  ENABLE_LOMENUBAR="FALSE"
+else
+  AC_MSG_RESULT([yes])
+  ENABLE_LOMENUBAR="TRUE"
+fi
+AC_SUBST(ENABLE_LOMENUBAR)
+
+dnl ===================================================================
 dnl Test whether to enable ActiveX embedding
 dnl ===================================================================
 if test "$_os" = "WINNT"; then
diff --git a/set_soenv.in b/set_soenv.in
index fc010b0..602adb6 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1864,6 +1864,7 @@ ToFile( "DB_LIB",            "@DB_LIB@",           "e" );
 ToFile( "DB_CPPLIB",         "@DB_CPPLIB@",        "e" );
 ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
 ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );
+ToFile( "ENABLE_LOMENUBAR",  "@ENABLE_LOMENUBAR@", "e" );
 ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
 ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
 ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );