--- configure.in	2006-05-10 08:57:25.000000000 +0200
+++ configure.in	2006-05-18 17:06:52.000000000 +0200
@@ -4577,17 +4577,17 @@
 MOZ_ARG_ENABLE_BOOL(pango,
 [  --enable-pango          Enable Pango font rendering support],
     MOZ_ENABLE_PANGO=1,
     MOZ_ENABLE_PANGO=)
 
 if test "$MOZ_ENABLE_PANGO"
 then
     AC_DEFINE(MOZ_ENABLE_PANGO)
-    PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0)
+    PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0)
 
     AC_SUBST(MOZ_ENABLE_PANGO)
     AC_SUBST(MOZ_PANGO_CFLAGS)
     AC_SUBST(MOZ_PANGO_LIBS)
 fi
 
 dnl ========================================================
 dnl = x11 core font support (default and ability to enable depend on toolkit)
--- gfx/src/gtk/Makefile.in	2006-05-09 07:56:57.000000000 +0200
+++ gfx/src/gtk/Makefile.in	2006-05-18 17:03:26.000000000 +0200
@@ -198,16 +198,20 @@
 		-lgkgfx \
 		$(GFX_XINERAMA_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 endif
 
+ifdef MOZ_ENABLE_PANGO
+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)
+endif
+
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
 CXXFLAGS	+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
 CFLAGS		+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
 
 ifeq ($(OS_ARCH), SunOS)
 ifndef GNU_CC
 # When using Sun's WorkShop compiler, including
 # /wherever/workshop-5.0/SC5.0/include/CC/std/time.hIndex: mozilla/config/static-config.mk
===================================================================
RCS file: /cvsroot/mozilla/config/static-config.mk,v
retrieving revision 3.26
diff -u -8 -r3.26 static-config.mk
--- config/static-config.mk	20 Mar 2006 21:16:36 -0000	3.26
+++ config/static-config.mk	30 Mar 2006 00:46:11 -0000
@@ -110,16 +110,24 @@
 		$(MOZ_XIE_LIBS) \
 		$(NULL)
 endif
 
 ifdef MOZ_ENABLE_XPRINT
 STATIC_EXTRA_LIBS	+= $(MOZ_XPRINT_LDFLAGS)
 endif
 
+ifdef MOZ_ENABLE_XFT
+STATIC_EXTRA_LIBS	+= $(MOZ_XFT_LIBS)
+endif
+
+ifdef MOZ_ENABLE_PANGO
+STATIC_EXTRA_LIBS	+= $(MOZ_PANGO_LIBS)
+endif
+
 # Component Makefile always brings in this.
 # STATIC_EXTRA_LIBS	+= $(TK_LIBS)
 
 # Some random modules require this
 ifndef MINIMO
 STATIC_EXTRA_LIBS	+= $(MOZ_XPCOM_OBSOLETE_LIBS)
 endif