equal
deleted
inserted
replaced
3470 ifdef MOZ_ENABLE_LIBCONIC |
3470 ifdef MOZ_ENABLE_LIBCONIC |
3471 EXTRA_DSO_LDOPTS += $(LIBCONIC_LIBS) |
3471 EXTRA_DSO_LDOPTS += $(LIBCONIC_LIBS) |
3472 endif |
3472 endif |
3473 |
3473 |
3474 ifdef MOZ_ENABLE_DBUS |
3474 ifdef MOZ_ENABLE_DBUS |
3475 EXTRA_DSO_LDOPTS += $(MOZ_DBUS_GLIB_LIBS) |
3475 EXTRA_DSO_LDOPTS += $(MOZ_DBUS_LIBS) |
3476 endif |
3476 endif |
3477 |
3477 |
3478 +ifdef MOZ_ENABLE_GCONF |
3478 +ifdef MOZ_ENABLE_GCONF |
3479 +EXTRA_DSO_LDOPTS += $(MOZ_GCONF_LIBS) |
3479 +EXTRA_DSO_LDOPTS += $(MOZ_GCONF_LIBS) |
3480 +endif |
3480 +endif |
3488 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 |
3488 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 |
3489 EXTRA_DSO_LDOPTS += $(FT2_LIBS) |
3489 EXTRA_DSO_LDOPTS += $(FT2_LIBS) |
3490 diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk |
3490 diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk |
3491 --- a/toolkit/toolkit-tiers.mk |
3491 --- a/toolkit/toolkit-tiers.mk |
3492 +++ b/toolkit/toolkit-tiers.mk |
3492 +++ b/toolkit/toolkit-tiers.mk |
3493 @@ -254,16 +254,23 @@ endif |
3493 @@ -258,16 +258,23 @@ endif |
3494 ifdef MOZ_ENABLE_LIBXUL |
3494 ifdef MOZ_ENABLE_LIBXUL |
3495 tier_toolkit_dirs += xpcom/stub |
3495 tier_toolkit_dirs += xpcom/stub |
3496 endif |
3496 endif |
3497 |
3497 |
3498 ifdef NS_TRACE_MALLOC |
3498 ifdef NS_TRACE_MALLOC |