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

2006-01-28  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.

diff --git a/ChangeLog b/ChangeLog
index 1df480d9c7e173597913dd9c17901fa25c33d885..a464d4199d5d15a240aa58879bc6f1822109e793 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-28  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-28  Dom Lachowicz <cinamod@hotmail.com>
 
        * modules/engines/ms-windows/msw-style.c: Re-sync with gtk-wimp

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1df480d9c7e173597913dd9c17901fa25c33d885..a464d4199d5d15a240aa58879bc6f1822109e793 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-01-28  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-28  Dom Lachowicz <cinamod@hotmail.com>
 
        * modules/engines/ms-windows/msw-style.c: Re-sync with gtk-wimp

diff --git a/configure.in b/configure.in
index beabb8b712fb35c74e33a102ed20892e6772dd0b..4e786c831f817c2e6c655bf2ca1e313ebc703714 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -515,6 +515,14 @@ AM_PATH_GLIB_2_0(glib_required_version, :,
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
   gobject gmodule-no-export gthread)
 
+# 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
+  CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
+fi
+
+
 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 dnl

diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am
index a9c40c886fcc34e0c8daf6f400b70a4bb21e8bc7..dabdb52d01fb8878c2d68d14d001e5ddc27c45b6 100644 (file)
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -4,7 +4,6 @@ INCLUDES = \
        -I$(top_srcdir) -I$(top_builddir)       \
        -I$(top_srcdir)/gdk-pixbuf              \
        -I$(top_srcdir)/contrib                 \
-       -DG_DISABLE_DEPRECATED                  \
        -DGDK_PIXBUF_DISABLE_DEPRECATED         \
        $(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 

diff --git a/demos/Makefile.am b/demos/Makefile.am
index 9e401695590005c4464da447f09fed51ab02b1a5..7ab6ef0b4669ad862f353f96eb6681caba8d74f6 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -5,7 +5,6 @@ SUBDIRS = gtk-demo
 INCLUDES =                                             \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)/gdk                           \
-       -DG_DISABLE_DEPRECATED                          \
        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
        -DGTK_DISABLE_DEPRECATED                        \

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index c3bd17f55f9623af04b7997a5f31b5a8af74a487..f51fdacd68e3ace0b8159318aa617044098ae4e8 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -37,7 +37,6 @@ INCLUDES = \
        -DDEMOCODEDIR="\"$(democodedir)\""              \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)/gdk                           \
-       -DG_DISABLE_DEPRECATED                          \
        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
        -DGTK_DISABLE_DEPRECATED                        \

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 8a6638d11227d6eea40b2abf65e2de59bd7398ca..d279928deced9308b518a3eb3fa1e378e2ea2bfc 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -273,7 +273,6 @@ INCLUDES = \
        -DGTK_SYSCONFDIR=\"$(sysconfdir)\"      \
        -DGTK_VERSION=\"$(GTK_VERSION)\"        \
        -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"  \
-       -DG_DISABLE_DEPRECATED                  \
        -DGDK_PIXBUF_DISABLE_DEPRECATED         \
        -DGTK_PREFIX=\"$(prefix)\"              \
        $(INCLUDED_LOADER_DEFINE)               \

diff --git a/gdk-pixbuf/pixops/Makefile.am b/gdk-pixbuf/pixops/Makefile.am
index 9b00b744353a57e53dcedc40d96a7181ff18df13..e002af7d6560cdbb3b36a4b467ac0fc2b1508d7c 100644 (file)
--- a/gdk-pixbuf/pixops/Makefile.am
+++ b/gdk-pixbuf/pixops/Makefile.am
@@ -4,7 +4,6 @@ INCLUDES = \
        -I$(top_srcdir) -I$(top_builddir)       \
        $(GTK_DEBUG_FLAGS)                      \
        $(GDK_PIXBUF_DEP_CFLAGS)                \
-       -DG_DISABLE_DEPRECATED                  \
        -DGDK_PIXBUF_DISABLE_DEPRECATED
 
 noinst_PROGRAMS = timescale

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index c2a4f8de879c54c58364fc22b499f14ed92a685f..c5c7c1ddc278bde43e9312656f0bda760bd6cca2 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -23,7 +23,6 @@ INCLUDES =                              \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk-pixbuf      \
-       -DG_DISABLE_DEPRECATED          \
        -DGDK_PIXBUF_DISABLE_DEPRECATED \
        -DGDK_DISABLE_DEPRECATED        \
        $(GTK_DEBUG_FLAGS)              \

diff --git a/gdk/linux-fb/Makefile.am b/gdk/linux-fb/Makefile.am
index 2287c33a8f450b68b3e97e5461a5e854d30ba0d1..c3a2ca45f75db835b10915932e6f0837c3c9aa8f 100644 (file)
--- a/gdk/linux-fb/Makefile.am
+++ b/gdk/linux-fb/Makefile.am
@@ -15,7 +15,6 @@ INCLUDES = \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
        -I$(top_builddir)/gdk   \
-       -DG_DISABLE_DEPRECATED  \
        -DGDK_PIXBUF_DISABLE_DEPRECATED \
        $(GDK_DEP_CFLAGS)       \
        $(GTK_DEBUG_FLAGS)

diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index b9d0b98a27fd50e9e49dd448496ade0d5a8d84e2..b45875ff835f0fe50e0b6febbcce9646b625277f 100644 (file)
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES =                              \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/gdk             \
        -I$(top_builddir)/gdk           \
-       -DG_DISABLE_DEPRECATED          \
        -DGDK_PIXBUF_DISABLE_DEPRECATED \
        -DGDK_DISABLE_DEPRECATED        \
        $(GTK_DEBUG_FLAGS)              \

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index d6168df23ae87d130b779b093796724f795ab957..59f8e5e0caef6f5d185dd02d2f7af6c666dd5e15 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES =                              \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/gdk             \
        -I$(top_builddir)/gdk           \
-       -DG_DISABLE_DEPRECATED          \
        -DGDK_PIXBUF_DISABLE_DEPRECATED \
        -DGDK_DISABLE_DEPRECATED        \
        $(GTK_DEBUG_FLAGS)              \

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 6a4d5b6558377a2b7957e1d631f823f151adc543..961c55cfd9e0f5f1b984f8d096ea519fecf4a74f 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -22,7 +22,6 @@ INCLUDES =                                            \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
-       -DG_DISABLE_DEPRECATED                          \
        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
        -DGTK_DISABLE_DEPRECATED                        \

diff --git a/gtk/theme-bits/Makefile.am b/gtk/theme-bits/Makefile.am
index e7edd7df8f2883b01ee3a01ed0bbf70311ce6359..49a3c39a80c9b9c0e06334c188015bf6dd7b67aa 100644 (file)
--- a/gtk/theme-bits/Makefile.am
+++ b/gtk/theme-bits/Makefile.am
@@ -1,5 +1,4 @@
 INCLUDES = -I$(top_srcdir) -I$(top_builddir)   \
-       -DG_DISABLE_DEPRECATED                  \
        -DGDK_PIXBUF_DISABLE_DEPRECATED         \
        $(GDK_PIXBUF_DEP_CFLAGS)
 

diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
index 4460d17a0b3d24e6340b7711c8c0cdd192e6156e..bd7a806dc4a6cf8eb6fc48d77cdff895ea348405 100644 (file)
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES = \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/gdk                             \
        -I$(top_builddir)/gdk                           \
-       -DG_DISABLE_DEPRECATED                          \
        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
        $(GTK_DEP_CFLAGS)

diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index c641f79abc626754e384ef597c2cb08b3a9f3a83..d2a682f9590720ea33308d88005c64ef9b993788 100644 (file)
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES = \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/gdk                             \
        -I$(top_builddir)/gdk                           \
-       -DG_DISABLE_DEPRECATED                          \
        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
        $(GTK_DEP_CFLAGS)

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 3beb81b696f90ccd83adff7d06ce667454757b56..d4a2088c5de35c2353973e5d61c2622d442a97f0 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -8,7 +8,6 @@ INCLUDES = \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/gdk                             \
        -I$(top_builddir)/gdk                           \
-       -DG_DISABLE_DEPRECATED                          \
        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
        -DGTK_DISABLE_DEPRECATED                        \

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 6a6ae118268ad75ad690cf065b9ffb3e999d5cfb..d466f6ddf89c59d0589b40119708b77017254dbd 100644 (file)
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -4,7 +4,6 @@ INCLUDES =                                      \
        -I$(top_srcdir)                         \
        -I$(top_builddir)/gdk                   \
        -I$(top_srcdir)/gdk                     \
-       -DG_DISABLE_DEPRECATED                  \
        -DGDK_PIXBUF_DISABLE_DEPRECATED         \
        -DGDK_DISABLE_DEPRECATED                \
        -DGTK_DISABLE_DEPRECATED                \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2a84d7b17eefc70c49772d53255c907330ca6765..8471bc9a59003073c503c4f0122d2ec2ec5fd707 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,6 @@ INCLUDES =                                      \
        -I$(top_srcdir)                         \
        -I$(top_builddir)/gdk                   \
        -I$(top_srcdir)/gdk                     \
-       -DG_DISABLE_DEPRECATED                  \
        -DGDK_PIXBUF_DISABLE_DEPRECATED         \
        -DGDK_DISABLE_DEPRECATED                \
        -DGTK_DISABLE_DEPRECATED                \