Index: build/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/intl/build/Makefile.in,v
retrieving revision 1.17
diff -u -r1.17 Makefile.in
--- build/Makefile.in	13 Feb 2006 20:52:16 -0000	1.17
+++ build/Makefile.in	26 Feb 2006 12:24:01 -0000
@@ -113,3 +113,15 @@
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef MOZ_ENABLE_PANGO
+INCLUDES		+= \
+			$(MOZ_GTK2_CFLAGS) \
+			$(FT2_CFLAGS) \
+			$(NULL)
+
+EXTRA_DSO_LDOPTS	+= \
+			$(MOZ_GTK2_LIBS) \
+			$(FT2_LIBS) \
+			$(NULL)
+endif
+
Index: build/nsI18nModule.cpp
===================================================================
RCS file: /cvsroot/mozilla/intl/build/nsI18nModule.cpp,v
retrieving revision 1.14
diff -u -r1.14 nsI18nModule.cpp
--- build/nsI18nModule.cpp	22 Aug 2005 03:00:04 -0000	1.14
+++ build/nsI18nModule.cpp	26 Feb 2006 12:24:01 -0000
@@ -291,8 +291,13 @@
     NULL, NULL},
 #endif /* INCLUDE_DBGDETECTOR */
  // lwbrk
+#ifdef MOZ_ENABLE_PANGO
+  { "Line Breaker", NS_LBRK_CID, 
+    NS_LBRK_CONTRACTID, nsPangoLineBreakerConstructor},
+#else
   { "Line Breaker", NS_LBRK_CID, 
     NS_LBRK_CONTRACTID, nsJISx4051LineBreakerConstructor},
+#endif
   { "Word Breaker", NS_WBRK_CID,
     NS_WBRK_CONTRACTID, nsSampleWordBreakerConstructor},
   { "Semantic Unit Scanner", NS_SEMANTICUNITSCANNER_CID,
Index: lwbrk/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/intl/lwbrk/src/Makefile.in,v
retrieving revision 1.31
diff -u -r1.31 Makefile.in
--- lwbrk/src/Makefile.in	22 Aug 2005 03:00:04 -0000	1.31
+++ lwbrk/src/Makefile.in	26 Feb 2006 12:24:02 -0000
@@ -60,4 +60,23 @@
 		nsSemanticUnitScanner.cpp \
 		$(NULL)
 
+ifdef MOZ_ENABLE_PANGO
+CPPSRCS		+= \
+		nsPangoLineBreaker.cpp \
+		$(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_ENABLE_PANGO
+INCLUDES		+= \
+			$(MOZ_GTK2_CFLAGS) \
+			$(FT2_CFLAGS) \
+			$(NULL)
+
+EXTRA_DSO_LDOPTS	+= \
+			$(MOZ_GTK2_LIBS) \
+			$(FT2_LIBS) \
+			$(NULL)
+endif
+
Index: lwbrk/src/nsLWBrkConstructors.h
===================================================================
RCS file: /cvsroot/mozilla/intl/lwbrk/src/nsLWBrkConstructors.h,v
retrieving revision 1.3
diff -u -r1.3 nsLWBrkConstructors.h
--- lwbrk/src/nsLWBrkConstructors.h	22 Aug 2005 03:00:04 -0000	1.3
+++ lwbrk/src/nsLWBrkConstructors.h	26 Feb 2006 12:24:02 -0000
@@ -41,11 +41,20 @@
 #include "nsLWBrkCIID.h"
 #include "nsILineBreaker.h"
 #include "nsIWordBreaker.h"
+#ifdef MOZ_ENABLE_PANGO
+#include "nsPangoLineBreaker.h"
+#else
 #include "nsJISx4501LineBreaker.h"
+#endif
 #include "nsSampleWordBreaker.h"
 #include "nsLWBRKDll.h"
 
+#ifdef MOZ_ENABLE_PANGO
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsPangoLineBreaker)
+#else
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsJISx4051LineBreaker)
+#endif
+
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSampleWordBreaker)
 
 #endif
Index: lwbrk/src/nsLWIMP.h
===================================================================
RCS file: /cvsroot/mozilla/intl/lwbrk/src/nsLWIMP.h,v
retrieving revision 1.6
diff -u -r1.6 nsLWIMP.h
--- lwbrk/src/nsLWIMP.h	18 Apr 2004 14:21:07 -0000	1.6
+++ lwbrk/src/nsLWIMP.h	26 Feb 2006 12:24:02 -0000
@@ -37,10 +37,15 @@
 #ifndef nsLWIMP_h__
 #define nsLWIMP_h__
 
+#ifdef MOZ_ENABLE_PANGO
+#include "nsPangoLineBreaker.h"
+#define LINEBREAKER nsPangoLineBreaker
+#else
 #include "nsJISx4501LineBreaker.h"
-#include "nsSampleWordBreaker.h"
-
 #define LINEBREAKER nsJISx4501LineBreaker
+#endif
+
+#include "nsSampleWordBreaker.h"
 #define WORDBREAKER nsSampleWordBreaker
 
 #endif  /* nsLWIMP_h__ */