Bug 377843 - Fix build of the DBUS component, r=bsmedberg
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -467,16 +467,17 @@ MOZ_ENABLE_XREMOTE = @MOZ_ENABLE_XREMOTE
MOZ_GTK_CFLAGS = @MOZ_GTK_CFLAGS@
MOZ_GTK_LDFLAGS = @MOZ_GTK_LDFLAGS@
MOZ_GTK2_CFLAGS = @MOZ_GTK2_CFLAGS@
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@
MOZ_QT_CFLAGS = @MOZ_QT_CFLAGS@
MOZ_QT_LDFLAGS = @MOZ_QT_LDFLAGS@
MOZ_XPRINT_CFLAGS = @MOZ_XPRINT_CFLAGS@
--- a/toolkit/system/dbus/Makefile.in
+++ b/toolkit/system/dbus/Makefile.in
@@ -49,17 +49,21 @@ IS_COMPONENT = 1
FORCE_SHARED_LIB = 1
REQUIRES = xpcom \
string \
necko \
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 \
nsDBusService.cpp \
nsNetworkManagerListener.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk