From 6a66c972cafeeabd6e1a35ea7f622bb1f380bb94 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 29 Jan 2006 04:00:45 +0000 Subject: [PATCH] If major.minor of required and available glib versions are the same, add 2006-01-28 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 +++++++ ChangeLog.pre-2-10 | 7 +++++++ configure.in | 8 ++++++++ contrib/gdk-pixbuf-xlib/Makefile.am | 1 - demos/Makefile.am | 1 - demos/gtk-demo/Makefile.am | 1 - gdk-pixbuf/Makefile.am | 1 - gdk-pixbuf/pixops/Makefile.am | 1 - gdk/Makefile.am | 1 - gdk/linux-fb/Makefile.am | 1 - gdk/quartz/Makefile.am | 1 - gdk/x11/Makefile.am | 1 - gtk/Makefile.am | 1 - gtk/theme-bits/Makefile.am | 1 - modules/engines/ms-windows/Makefile.am | 1 - modules/engines/pixbuf/Makefile.am | 1 - modules/input/Makefile.am | 1 - perf/Makefile.am | 1 - tests/Makefile.am | 1 - 19 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1df480d9c..a464d4199 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-28 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-28 Dom Lachowicz * 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 1df480d9c..a464d4199 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2006-01-28 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-28 Dom Lachowicz * modules/engines/ms-windows/msw-style.c: Re-sync with gtk-wimp diff --git a/configure.in b/configure.in index beabb8b71..4e786c831 100644 --- 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 a9c40c886..dabdb52d0 100644 --- 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 9e4016955..7ab6ef0b4 100644 --- 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 c3bd17f55..f51fdacd6 100644 --- 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 8a6638d11..d279928de 100644 --- 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 9b00b7443..e002af7d6 100644 --- 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 c2a4f8de8..c5c7c1ddc 100644 --- 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 2287c33a8..c3a2ca45f 100644 --- 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 b9d0b98a2..b45875ff8 100644 --- 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 d6168df23..59f8e5e0c 100644 --- 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 6a4d5b655..961c55cfd 100644 --- 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 e7edd7df8..49a3c39a8 100644 --- 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 4460d17a0..bd7a806dc 100644 --- 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 c641f79ab..d2a682f95 100644 --- 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 3beb81b69..d4a2088c5 100644 --- 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 6a6ae1182..d466f6ddf 100644 --- 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 2a84d7b17..8471bc9a5 100644 --- 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 \ -- 2.43.2