If major.minor of required and available glib versions are the same, add

2006-01-25  Behdad Esfahbod  <behdad@gnome.org>

        * configure.in: If major.minor of required and available glib versions
        are the same, add -DG_DISABLE_DEPRECATED to GLIB_CFLAGS. (bug #328617)

        * */Makefile.am: Remove hardcoded -DG_DISABLE_DEPRECATED.

9 files changed, 6 insertions, 14 deletions

diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index d3e459e8..cdb1aecd 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET
 INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 570750b0..a260c7d8 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -10,7 +10,6 @@ pangowin32libs = $(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la $(p
 INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index 451e8367..b390d87a 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET
 INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am
index b084924a..068961bb 100644
--- a/modules/hebrew/Makefile.am
+++ b/modules/hebrew/Makefile.am
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET
 INCLUDES =				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 06ee65de..274abf1d 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET
 INCLUDES =					\
 	-DG_LOG_DOMAIN=\"Pango\"		\
 	-DPANGO_ENABLE_ENGINE			\
-	-DG_DISABLE_DEPRECATED			\
 	$(PANGO_DEBUG_FLAGS)			\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/pango			\
diff --git a/modules/khmer/Makefile.am b/modules/khmer/Makefile.am
index 47a12f7b..3d924211 100644
--- a/modules/khmer/Makefile.am
+++ b/modules/khmer/Makefile.am
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET
 INCLUDES =					\
 	-DG_LOG_DOMAIN=\"Pango\"		\
 	-DPANGO_ENABLE_ENGINE			\
-	-DG_DISABLE_DEPRECATED			\
 	$(PANGO_DEBUG_FLAGS)			\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/pango			\
diff --git a/modules/syriac/Makefile.am b/modules/syriac/Makefile.am
index 4b8a3853..9dfb2c02 100644
--- a/modules/syriac/Makefile.am
+++ b/modules/syriac/Makefile.am
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET
 INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index dbaf3d30..c17d89e5 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET
 INCLUDES =				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
-	-DG_DISABLE_DEPRECATED		\
 	$(PANGO_DEBUG_FLAGS)		\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/pango		\
diff --git a/modules/tibetan/Makefile.am b/modules/tibetan/Makefile.am
index d8c822e0..8b58bca8 100644
--- a/modules/tibetan/Makefile.am
+++ b/modules/tibetan/Makefile.am
@@ -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