summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-01-29 04:00:45 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-01-29 04:00:45 +0000
commit6a66c972cafeeabd6e1a35ea7f622bb1f380bb94 (patch)
tree17ac6e6ca176643b755e9b92b24d83075ba27a91
parentcca151bab7ff3f26d0f3b613ce1661dcfe199826 (diff)
downloadgtk+-6a66c972cafeeabd6e1a35ea7f622bb1f380bb94.tar.gz
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.
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--configure.in8
-rw-r--r--contrib/gdk-pixbuf-xlib/Makefile.am1
-rw-r--r--demos/Makefile.am1
-rw-r--r--demos/gtk-demo/Makefile.am1
-rw-r--r--gdk-pixbuf/Makefile.am1
-rw-r--r--gdk-pixbuf/pixops/Makefile.am1
-rw-r--r--gdk/Makefile.am1
-rw-r--r--gdk/linux-fb/Makefile.am1
-rw-r--r--gdk/quartz/Makefile.am1
-rw-r--r--gdk/x11/Makefile.am1
-rw-r--r--gtk/Makefile.am1
-rw-r--r--gtk/theme-bits/Makefile.am1
-rw-r--r--modules/engines/ms-windows/Makefile.am1
-rw-r--r--modules/engines/pixbuf/Makefile.am1
-rw-r--r--modules/input/Makefile.am1
-rw-r--r--perf/Makefile.am1
-rw-r--r--tests/Makefile.am1
19 files changed, 22 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 1df480d9c7..a464d4199d 100644
--- 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 1df480d9c7..a464d4199d 100644
--- 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 beabb8b712..4e786c831f 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 a9c40c886f..dabdb52d01 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 9e40169559..7ab6ef0b46 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 c3bd17f55f..f51fdacd68 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 8a6638d112..d279928dec 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 9b00b74435..e002af7d65 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 c2a4f8de87..c5c7c1ddc2 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 2287c33a8f..c3a2ca45f7 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 b9d0b98a27..b45875ff83 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 d6168df23a..59f8e5e0ca 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 6a4d5b6558..961c55cfd9 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 e7edd7df8f..49a3c39a80 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 4460d17a0b..bd7a806dc4 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 c641f79abc..d2a682f959 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 3beb81b696..d4a2088c5d 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 6a6ae11826..d466f6ddf8 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 2a84d7b17e..8471bc9a59 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 \
View Lorry Controller Status