From 1fdf2cb5e708c0a40379bf6f95cfc045289dfa96 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 25 Jan 2006 19:33:58 +0000 Subject: If major.minor of required and available glib versions are the same, add 2006-01-25 Behdad Esfahbod * 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. --- ChangeLog | 7 +++++++ configure.in | 7 +++++++ examples/Makefile.am | 1 - modules/arabic/Makefile.am | 1 - modules/basic/Makefile.am | 1 - modules/hangul/Makefile.am | 1 - modules/hebrew/Makefile.am | 1 - modules/indic/Makefile.am | 1 - modules/khmer/Makefile.am | 1 - modules/syriac/Makefile.am | 1 - modules/thai/Makefile.am | 1 - modules/tibetan/Makefile.am | 12 ++++++------ pango/Makefile.am | 1 - pango/mini-fribidi/Makefile.am | 1 - pango/opentype/Makefile.am | 1 - tests/Makefile.am | 1 - tools/Makefile.am | 1 - 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index ccff837d..c9c4d5e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-25 Behdad Esfahbod + + * 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. + 2006-01-25 Behdad Esfahbod * pango/pangoatsui-fontmap.c (pango_atsui_family_class_init): Declare diff --git a/configure.in b/configure.in index 0f62b954..a85186f7 100644 --- a/configure.in +++ b/configure.in @@ -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 # diff --git a/examples/Makefile.am b/examples/Makefile.am index d884f122..a3d12d8b 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -13,7 +13,6 @@ EXTRA_DIST= \ CLEANFILES = pangorc INCLUDES = \ - -DG_DISABLE_DEPRECATED \ -DPANGO_DISABLE_DEPRECATED \ -I$(top_srcdir) \ $(PANGO_DEBUG_FLAGS) \ diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index 78c488e1..ec632972 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 4a17c224..f3a35aed 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -11,7 +11,6 @@ pangoatsuilibs = $(top_builddir)/pango/libpangocairo-$(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 9b57f036..bb0f2469 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 3b03c8f6..f8450f83 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 c604492d..ff073711 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 d79aa2a4..94b22f5f 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 302df7d3..6722f00e 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 05a26ad0..252240a5 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 6cb71164..2dab807f 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 diff --git a/pango/Makefile.am b/pango/Makefile.am index 57b705b0..1547403b 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -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) \ diff --git a/pango/mini-fribidi/Makefile.am b/pango/mini-fribidi/Makefile.am index e15e0735..44919522 100644 --- a/pango/mini-fribidi/Makefile.am +++ b/pango/mini-fribidi/Makefile.am @@ -3,7 +3,6 @@ INCLUDES = \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBDIR=\"$(libdir)\" \ - -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ $(GLIB_CFLAGS) diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am index ca9d294e..14d11564 100644 --- a/pango/opentype/Makefile.am +++ b/pango/opentype/Makefile.am @@ -5,7 +5,6 @@ INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBDIR=\"$(libdir)\" \ - -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ $(FREETYPE_CFLAGS) \ diff --git a/tests/Makefile.am b/tests/Makefile.am index d46b8469..c29f50e9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -9,7 +9,6 @@ CLEANFILES = pangorc DISTCLEANFILES = all-unicode.txt runtests.log INCLUDES = \ - -DG_DISABLE_DEPRECATED \ -I$(top_srcdir) \ $(PANGO_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ diff --git a/tools/Makefile.am b/tools/Makefile.am index d521c58b..deecda93 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -3,7 +3,6 @@ INCLUDES = \ -I$(top_srcdir) \ $(GLIB_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ -DPANGO_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) -- cgit v1.2.1