Index: configure.in
===================================================================
RCS file: /cvs/gnome/pango/configure.in,v
retrieving revision 1.221
diff -u -p -r1.221 configure.in
--- configure.in	16 Jan 2006 11:49:38 -0000	1.221
+++ configure.in	25 Jan 2006 19:29:55 -0000
@@ -340,6 +340,13 @@ PKG_CHECK_MODULES(GLIB, $GLIB_MODULES, :
 # necesary defines for thread-safety.
 GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
 
+# See if it's safe to turn G_DISABLE_DEPRECATED on.
+GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"`
+GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.@<:@^.@:>@*\$//"`
+if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+  GLIB_CFLAGS="-DG_DISABLE_DEPRECATED $GLIB_CFLAGS"
+fi
+
 #
 # The OpenType test programs aren't particularly portable
 #
Index: examples/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/examples/Makefile.am,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile.am
--- examples/Makefile.am	23 Jan 2006 16:27:20 -0000	1.55
+++ examples/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -13,7 +13,6 @@ EXTRA_DIST=			\
 CLEANFILES = pangorc
 
 INCLUDES =				\
-	-DG_DISABLE_DEPRECATED		\
 	-DPANGO_DISABLE_DEPRECATED	\
 	-I$(top_srcdir)			\
 	$(PANGO_DEBUG_FLAGS)		\
Index: modules/arabic/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/arabic/Makefile.am,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile.am
--- modules/arabic/Makefile.am	16 Jan 2006 10:10:19 -0000	1.32
+++ modules/arabic/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/lib
 INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
Index: modules/basic/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/basic/Makefile.am,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile.am
--- modules/basic/Makefile.am	16 Jan 2006 10:10:19 -0000	1.40
+++ modules/basic/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -11,7 +11,6 @@ pangoatsuilibs = $(top_builddir)/pango/l
 INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
Index: modules/hangul/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/hangul/Makefile.am,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile.am
--- modules/hangul/Makefile.am	16 Jan 2006 10:10:20 -0000	1.32
+++ modules/hangul/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/lib
 INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
Index: modules/hebrew/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/hebrew/Makefile.am,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile.am
--- modules/hebrew/Makefile.am	16 Jan 2006 10:10:20 -0000	1.22
+++ modules/hebrew/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/lib
 INCLUDES =				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
Index: modules/indic/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/Makefile.am,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.am
--- modules/indic/Makefile.am	16 Jan 2006 10:10:21 -0000	1.27
+++ modules/indic/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/lib
 INCLUDES =					\
 	-DG_LOG_DOMAIN=\"Pango\"		\
 	-DPANGO_ENABLE_ENGINE			\
-	-DG_DISABLE_DEPRECATED			\
 	$(PANGO_DEBUG_FLAGS)			\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/pango			\
Index: modules/khmer/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/khmer/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- modules/khmer/Makefile.am	16 Jan 2006 10:10:21 -0000	1.5
+++ modules/khmer/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/lib
 INCLUDES =					\
 	-DG_LOG_DOMAIN=\"Pango\"		\
 	-DPANGO_ENABLE_ENGINE			\
-	-DG_DISABLE_DEPRECATED			\
 	$(PANGO_DEBUG_FLAGS)			\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/pango			\
Index: modules/syriac/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/syriac/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- modules/syriac/Makefile.am	16 Jan 2006 10:10:22 -0000	1.5
+++ modules/syriac/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/lib
 INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
Index: modules/thai/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/thai/Makefile.am,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile.am
--- modules/thai/Makefile.am	16 Jan 2006 10:10:22 -0000	1.29
+++ modules/thai/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/lib
 INCLUDES =				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
Index: modules/tibetan/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/modules/tibetan/Makefile.am,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.am
--- modules/tibetan/Makefile.am	16 Jan 2006 10:10:23 -0000	1.4
+++ modules/tibetan/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -3,12 +3,12 @@
 pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
-INCLUDES =			\
-	-DPANGO_ENABLE_ENGINE	\
-	-DG_DISABLE_DEPRECATED	\
-	$(PANGO_DEBUG_FLAGS)	\
-	-I$(top_srcdir)		\
-	-I$(top_srcdir)/pango	\
+INCLUDES =				\
+	-DG_LOG_DOMAIN=\"Pango\"	\
+	-DPANGO_ENABLE_ENGINE		\
+	$(PANGO_DEBUG_FLAGS)		\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/pango		\
 	$(GLIB_CFLAGS)
 
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
Index: pango/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/pango/Makefile.am,v
retrieving revision 1.133
diff -u -p -r1.133 Makefile.am
--- pango/Makefile.am	23 Jan 2006 16:27:20 -0000	1.133
+++ pango/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -21,7 +21,6 @@ INCLUDES =						\
 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
 	-DLIBDIR=\"$(libdir)\"				\
 	-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\"	\
-	-DG_DISABLE_DEPRECATED				\
 	-I$(top_srcdir)					\
 	$(PANGO_DEBUG_FLAGS)				\
 	$(GLIB_CFLAGS)					\
Index: pango/mini-fribidi/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/pango/mini-fribidi/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- pango/mini-fribidi/Makefile.am	3 Nov 2005 21:13:13 -0000	1.10
+++ pango/mini-fribidi/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -3,7 +3,6 @@
 INCLUDES = 					\
 	-DSYSCONFDIR=\"$(sysconfdir)\" 		\
 	-DLIBDIR=\"$(libdir)\" 			\
-	-DG_DISABLE_DEPRECATED			\
 	$(PANGO_DEBUG_FLAGS)			\
 	-I$(top_srcdir)				\
 	$(GLIB_CFLAGS)
Index: pango/opentype/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/Makefile.am,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.am
--- pango/opentype/Makefile.am	22 Jul 2005 17:56:37 -0000	1.16
+++ pango/opentype/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -5,7 +5,6 @@ INCLUDES = 					\
 	-DPANGO_ENABLE_ENGINE			\
 	-DSYSCONFDIR=\"$(sysconfdir)\"		\
 	-DLIBDIR=\"$(libdir)\"			\
-	-DG_DISABLE_DEPRECATED			\
 	$(PANGO_DEBUG_FLAGS)			\
 	$(GLIB_CFLAGS)				\
 	$(FREETYPE_CFLAGS)			\
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/tests/Makefile.am,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile.am
--- tests/Makefile.am	23 Jan 2006 16:27:21 -0000	1.21
+++ tests/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -9,7 +9,6 @@ CLEANFILES = pangorc
 DISTCLEANFILES = all-unicode.txt runtests.log
 
 INCLUDES =					\
-	-DG_DISABLE_DEPRECATED			\
 	-I$(top_srcdir)				\
 	$(PANGO_DEBUG_FLAGS)			\
 	$(GLIB_CFLAGS)				\
Index: tools/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/tools/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- tools/Makefile.am	14 Nov 2005 23:30:41 -0000	1.7
+++ tools/Makefile.am	25 Jan 2006 19:29:55 -0000
@@ -3,7 +3,6 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	$(GLIB_CFLAGS)				\
-	-DG_DISABLE_DEPRECATED			\
 	-DPANGO_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)