Index: configure.in
===================================================================
RCS file: /cvs/gnome/pango/configure.in,v
retrieving revision 1.252
diff -u -w -u -w -r1.252 configure.in
--- configure.in	10 Jul 2006 22:52:45 -0000	1.252
+++ configure.in	18 Jul 2006 17:02:20 -0000
@@ -369,6 +369,18 @@
 fi
 
 #
+# Checks for Graphite
+#
+PKG_CHECK_MODULES(GRAPHITE, silgraphite >= 2.1.0, have_graphite=true, :)
+if $have_graphite; then
+  AC_PROG_CXX
+  GR_CFLAGS=`$PKG_CONFIG --cflags silgraphite`
+  GR_LIBS=`$PKG_CONFIG --libs silgraphite`
+  AC_SUBST(GR_CFLAGS)
+  AC_SUBST(GR_LIBS)
+fi
+
+#
 # Checks for GLib
 #
 GLIB_REQUIRED_VERSION=2.10.0
@@ -397,6 +409,7 @@
 arabic_modules="arabic-fc"
 basic_modules="basic-fc,basic-win32,basic-x,basic-atsui"
 hangul_modules="hangul-fc"
+graphite_modules="graphite-fc"
 hebrew_modules="hebrew-fc"
 indic_modules="indic-fc"
 khmer_modules="khmer-fc"
@@ -404,7 +417,7 @@
 thai_modules="thai-fc"
 tibetan_modules="tibetan-fc"
 
-all_modules="$arabic_modules,$basic_modules,$hangul_modules,$hebrew_modules,$indic_modules,$khmer_modules,$syriac_modules,$thai_modules,$tibetan_modules"
+all_modules="$arabic_modules,$basic_modules,$graphite_modules,$hangul_modules,$hebrew_modules,$indic_modules,$khmer_modules,$syriac_modules,$thai_modules,$tibetan_modules"
 
 #
 # Allow building some or all modules included
@@ -476,6 +489,7 @@
 AM_CONDITIONAL(INCLUDE_BASIC_WIN32,	echo $included_modules | egrep '(^|,)basic-win32($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_X,		echo $included_modules | egrep '(^|,)basic-x($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_ATSUI,	echo $included_modules | egrep '(^|,)basic-atsui($|,)' 	> /dev/null)
+AM_CONDITIONAL(INCLUDE_GRAPHITE_FC,	echo $included_modules | egrep '(^|,)graphite-fc($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_HANGUL_FC,	echo $included_modules | egrep '(^|,)hangul-fc($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_HEBREW_FC,	echo $included_modules | egrep '(^|,)hebrew-fc($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_INDIC_FC,	echo $included_modules | egrep '(^|,)indic-fc($|,)' 	> /dev/null)
@@ -489,6 +503,7 @@
 AM_CONDITIONAL(DYNAMIC_BASIC_WIN32,	echo $dynamic_modules | egrep '(^|,)basic-win32($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_BASIC_X,		echo $dynamic_modules | egrep '(^|,)basic-x($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_BASIC_ATSUI,	echo $dynamic_modules | egrep '(^|,)basic-atsui($|,)' 	> /dev/null)
+AM_CONDITIONAL(DYNAMIC_GRAPHITE_FC,	echo $dynamic_modules | egrep '(^|,)graphite-fc($|,)'	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_HANGUL_FC,	echo $dynamic_modules | egrep '(^|,)hangul-fc($|,)'	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_HEBREW_FC,	echo $dynamic_modules | egrep '(^|,)hebrew-fc($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_INDIC_FC,	echo $dynamic_modules | egrep '(^|,)indic-fc($|,)' 	> /dev/null)
@@ -818,6 +833,7 @@
 modules/Makefile
 modules/arabic/Makefile
 modules/basic/Makefile
+modules/graphite/Makefile
 modules/hangul/Makefile
 modules/hebrew/Makefile
 modules/indic/Makefile
Index: modules/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/Makefile.am,v
retrieving revision 1.31
diff -u -w -u -w -r1.31 Makefile.am
--- modules/Makefile.am	13 Feb 2006 19:03:21 -0000	1.31
+++ modules/Makefile.am	18 Jul 2006 17:02:20 -0000
@@ -3,6 +3,7 @@
 SUBDIRS = 		\
 	arabic		\
 	basic 		\
+	graphite	\
 	hangul 		\
 	hebrew		\
 	indic           \

