[Libreoffice-commits] .: 2 commits - configure.in RepositoryExternal.mk set_soenv.in

[Bjoern Michaelsen]

 RepositoryExternal.mk |   10 ++++++++++
 configure.in          |    1 +
 set_soenv.in          |    2 ++
 3 files changed, 13 insertions(+)

New commits:
commit 898bde8171fee50a1d478d28ea76f3bd9745f41d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jul 26 16:04:15 2011 +0200

    add dbumenugtk external

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4241b67..c5d226d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -452,4 +452,14 @@ $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
 
 endef
 
+define gb_LinkTarget__use_dbusmenugtk
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(DBUSMENUGTK_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),$(DBUSMENUGTK_LIBS))
+
+endef
+
 # vim: set noet sw=4 ts=4:
commit 0daccf01702e865be7f9e2be1e3bf444a374a176
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jul 26 16:04:01 2011 +0200

    add dbumenugtk configure check

diff --git a/configure.in b/configure.in
index 841e805..92d0cb5 100755
--- a/configure.in
+++ b/configure.in
@@ -7744,6 +7744,7 @@ if test "z$enable_lomenubar" = "z" -o "z$enable_lomenubar" = "zno" ; then
     ENABLE_LOMENUBAR="FALSE"
 else
     AC_MSG_RESULT([yes])
+    PKG_CHECK_MODULES(DBUSMENUGTK, dbusmenu-gtk-0.4,, AC_MSG_ERROR([requirements to build lo-menubar not met. Use --disable-lomenubar or install the missing packages]))
     ENABLE_LOMENUBAR="TRUE"
 fi
 AC_SUBST(ENABLE_LOMENUBAR)
diff --git a/set_soenv.in b/set_soenv.in
index ebfad11..39c8ffb 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1971,6 +1971,8 @@ 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( "DBUSMENUGTK_CFLAGS",  "@DBUSMENUGTK_CFLAGS@", "e" );
+ToFile( "DBUSMENUGTK_LIBS",  "@DBUSMENUGTK_LIBS@", "e" );
 ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" );
 ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
 ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );