diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2006-01-25 20:00:09 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-01-25 20:00:09 +0000 |
commit | c0acd53423b6497e15921a9a55c6cc109bae8fb8 (patch) | |
tree | 22823bd936cec0df739fb5da24a0b724b1b27d86 | |
parent | f68e0e2aa8816f9821a42b40f6def080851df418 (diff) | |
download | pango-c0acd53423b6497e15921a9a55c6cc109bae8fb8.tar.gz |
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.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.in | 7 | ||||
-rw-r--r-- | examples/Makefile.am | 1 | ||||
-rw-r--r-- | modules/arabic/Makefile.am | 1 | ||||
-rw-r--r-- | modules/basic/Makefile.am | 1 | ||||
-rw-r--r-- | modules/hangul/Makefile.am | 1 | ||||
-rw-r--r-- | modules/hebrew/Makefile.am | 1 | ||||
-rw-r--r-- | modules/indic/Makefile.am | 1 | ||||
-rw-r--r-- | modules/khmer/Makefile.am | 1 | ||||
-rw-r--r-- | modules/syriac/Makefile.am | 1 | ||||
-rw-r--r-- | modules/thai/Makefile.am | 1 | ||||
-rw-r--r-- | modules/tibetan/Makefile.am | 12 | ||||
-rw-r--r-- | pango/Makefile.am | 1 | ||||
-rw-r--r-- | pango/mini-fribidi/Makefile.am | 1 | ||||
-rw-r--r-- | pango/opentype/Makefile.am | 1 | ||||
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | tools/Makefile.am | 1 |
17 files changed, 20 insertions, 20 deletions
@@ -1,3 +1,10 @@ +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. + 2006-01-24 Behdad Esfahbod <behdad@gnome.org> * pango/pangolayout.c (pango_layout_get_width): Improve docs to say diff --git a/configure.in b/configure.in index 65375bd2..4e3be1eb 100644 --- a/configure.in +++ b/configure.in @@ -328,6 +328,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 ba7e0a0b..19712ab6 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -3,7 +3,6 @@ aliasdir = $(sysconfdir)/pango 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 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 diff --git a/pango/Makefile.am b/pango/Makefile.am index 50860ddb..59dda397 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -19,7 +19,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 f3e1570a..1225f2fd 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 e407b57f..b37907af 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,6 @@ ## Process this file with automake to create Makefile.in. 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) |