RepositoryExternal.mk | 28 ++++++++++++++++++++++++++++
configure.in | 4 ++++
set_soenv.in | 2 ++
vcl/Library_vclplug_gtk.mk | 15 +--------------
vcl/Library_vclplug_gtk3.mk | 17 ++++-------------
5 files changed, 39 insertions(+), 27 deletions(-)
New commits:
commit 337b07d872e903cdc5f4411d76aca873567eee81
Author: David Tardon <dtar...@redhat.com>
Date: Wed Nov 2 13:04:19 2011 +0100
use external
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 2e1983e..e2f9b8d 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -41,20 +41,6 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\
-DVERSION=\"$(UPD)$(LAST_MINOR)\" \
))
-ifneq ($(ENABLE_DBUS),)
-# FIXME: pkg-config calls should be done in configure, and this should be
_use_external
-$(eval $(call gb_Library_set_include,vclplug_gtk,\
- $$(INCLUDE) \
- $(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \
-))
-$(eval $(call gb_Library_add_defs,vclplug_gtk,\
- -DENABLE_DBUS \
-))
-$(eval $(call gb_Library_add_libs,vclplug_gtk,\
- $(shell pkg-config --libs dbus-glib-1)\
-))
-endif
-
$(eval $(call gb_Library_add_api,vclplug_gtk,\
offapi \
udkapi \
@@ -84,6 +70,7 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
))
$(eval $(call gb_Library_use_externals,vclplug_gtk,\
+ dbus \
gtk \
gthread \
icule \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 72e7a75..9c589ff 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -51,19 +51,6 @@ $(eval $(call gb_Library_add_api,vclplug_gtk3,\
udkapi \
))
-ifneq ($(ENABLE_DBUS),)
-$(eval $(call gb_Library_set_include,vclplug_gtk3,\
- $$(INCLUDE) \
- $(filter -I%,$(shell pkg-config --cflags dbus-glib-1)) \
-))
-$(eval $(call gb_Library_add_defs,vclplug_gtk3,\
- -DENABLE_DBUS \
-))
-$(eval $(call gb_Library_add_libs,vclplug_gtk3,\
- $(shell pkg-config --libs dbus-glib-1)\
-))
-endif
-
$(eval $(call gb_Library_add_libs,vclplug_gtk3,\
$$(GTK3_LIBS) \
$$(GTHREAD_LIBS) \
@@ -92,6 +79,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_use_externals,vclplug_gtk,\
+ dbus \
+))
+
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/unx/gtk3/a11y/gtk3atkaction \
vcl/unx/gtk3/a11y/gtk3atkbridge \
commit 1b717cee8c7e9d321dc8fdbfb47719cbd9b6c870
Author: David Tardon <dtar...@redhat.com>
Date: Wed Nov 2 13:00:48 2011 +0100
export DBUS_{CFLAGS,LIBS}
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index db8138c..8891d6b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -646,6 +646,34 @@ $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
endef
+
+ifeq ($(ENABLE_DBUS),YES)
+
+define gb_LinkTarget__use_dbus
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(DBUS_CFLAGS) \
+)
+
+$(call gb_Library_add_defs,$(1),\
+ -DENABLE_DBUS \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(DBUS_LIBS) \
+)
+
+endef
+
+else # ENABLE_DBUS
+
+define gb_LinkTarget__use_dbus
+
+endef
+
+endif # ENABLE_DBUS
+
+
define gb_LinkTarget__use_dbusmenugtk
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
diff --git a/configure.in b/configure.in
index 6052587..a260a0a 100644
--- a/configure.in
+++ b/configure.in
@@ -6985,6 +6985,8 @@ GTK_CFLAGS=""
GTK_LIBS=""
ENABLE_SYSTRAY_GTK=""
ENABLE_DBUS=""
+DBUS_CFLAGS=""
+DBUS_LIBS=""
if test "$test_gtk" = "yes"; then
if test "$ENABLE_GTK" = "TRUE" ; then
@@ -7027,6 +7029,8 @@ AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTHREAD_CFLAGS)
AC_SUBST(GTHREAD_LIBS)
+AC_SUBST(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE",
ENABLE_QUICKSTART_LIBPNG="" )
AC_SUBST(LIBPNG_LIBS)
diff --git a/set_soenv.in b/set_soenv.in
index dc2d996..2505e19 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1530,6 +1530,8 @@ ToFile( "COMMONS_LOGGING_JAR","@COMMONS_LOGGING_JAR@","e"
);
ToFile( "SYSTEM_SERVLETAPI", "@SYSTEM_SERVLETAPI@", "e" );
ToFile( "SERVLETAPI_JAR", "@SERVLETAPI_JAR@", "e" );
ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" );
+ToFile( "DBUS_CFLAGS", "@DBUS_CFLAGS@", "e" );
+ToFile( "DBUS_LIBS", "@DBUS_LIBS@", "e" );
ToFile( "ENABLE_GCONF", "@ENABLE_GCONF@", "e" );
ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" );
ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
