b=536031; netwerk/system/maemo linkage fail in no-libxul configuration, r=cbiesinger
authorOleg Romashin <romaxa@gmail.com>
Wed, 23 Dec 2009 14:00:38 +0200
changeset 36601 409bdb7f79dd3f68be5eab5453e66bc3edb1ec77
parent 36600 5d71b51b2f620949a94b39b78199f78f95063740
child 36603 b164d487f8cfc9b726d892501e11deb643f83ee7
push idunknown
push userunknown
push dateunknown
reviewerscbiesinger
bugs536031
milestone1.9.3a1pre
b=536031; netwerk/system/maemo linkage fail in no-libxul configuration, r=cbiesinger
netwerk/build/Makefile.in
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -145,16 +145,23 @@ EXTRA_DSO_LDOPTS = \
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LDOPTS += \
 		-framework SystemConfiguration \
 		$(TK_LIBS) \
 	$(NULL)
 endif
 
+ifdef MOZ_ENABLE_LIBCONIC
+EXTRA_DSO_LDOPTS += \
+		$(LIBCONIC_LIBS) \
+		$(MOZ_DBUS_GLIB_LIBS) \
+		$(NULL)
+endif
+
 ifeq ($(OS_ARCH),AIX)
 EXTRA_DSO_LDOPTS += -lodm -lcfg
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32)