From b2d8c463b274c05ddf9fe365491dd0b2aa85d8ff Mon Sep 17 00:00:00 2001
From: "wr@rosenauer.org" <none@none>
Date: Wed, 18 Apr 2007 22:00:25 -0700
Subject: [PATCH] Bug 377843 - Fix build of the DBUS component, r=bsmedberg

---
 config/autoconf.mk.in           | 1 +
 toolkit/system/dbus/Makefile.in | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 2e0e38a733f..3eb96b28451 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -472,6 +472,7 @@ MOZ_GTK2_LIBS		= @MOZ_GTK2_LIBS@
 
 MOZ_DBUS_GLIB_CFLAGS    = @MOZ_DBUS_GLIB_CFLAGS@
 MOZ_DBUS_GLIB_LIBS      = @MOZ_DBUS_GLIB_LIBS@
+MOZ_ENABLE_DBUS         = @MOZ_ENABLE_DBUS@
 
 MOZ_XLIB_CFLAGS		= @MOZ_XLIB_CFLAGS@
 MOZ_XLIB_LDFLAGS	= @MOZ_XLIB_LDFLAGS@
diff --git a/toolkit/system/dbus/Makefile.in b/toolkit/system/dbus/Makefile.in
index 0aaa314a2a9..4687bf597b9 100644
--- a/toolkit/system/dbus/Makefile.in
+++ b/toolkit/system/dbus/Makefile.in
@@ -54,7 +54,11 @@ REQUIRES  = xpcom \
                       embedcomponents \
             $(NULL)
 
-EXTRA_DSO_LDOPTS = $(MOZ_DBUS_GLIB_LIBS)
+EXTRA_DSO_LDOPTS = \
+	$(XPCOM_GLUE_LDOPTS) \
+	$(NSPR_LIBS) \
+	$(MOZ_DBUS_GLIB_LIBS) \
+	$(NULL)
                 
 CPPSRCS =   \
   nsDBusModule.cpp             \