[easytag] Reinstate versioning guards for GLib and GTK+

[David King <davidk src gnome org>]

commit 1eca256c4f4b67d38c4dcdb93a658e9f9f26edf9
Author: David King <amigadave amigadave com>
Date:   Mon Feb 23 18:53:10 2015 +0000

    Reinstate versioning guards for GLib and GTK+
    
    These were accidentally dropped when migrating to AX_COMPILER_FLAGS.

 Makefile.am  |    8 ++++++--
 configure.ac |    6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 50e70db..51b698a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,9 @@ easytag_CPPFLAGS = \
        -I$(top_srcdir)/src/tags \
        -I$(top_builddir) \
        -I$(top_builddir)/src \
-       -DLOCALEDIR=\"$(localedir)\"
+       -DLOCALEDIR=\"$(localedir)\" \
+       $(GLIB_DEPRECATION_FLAGS) \
+       $(GTK_DEPRECATION_FLAGS)
 
 easytag_CFLAGS = \
        $(WARN_CFLAGS) \
@@ -254,7 +256,9 @@ libnautilus_easytag_la_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_builddir) \
        -DLOCALEDIR=\"$(localedir)\" \
-       $(NAUTILUS_CFLAGS)
+       $(NAUTILUS_CFLAGS) \
+       $(GLIB_DEPRECATION_FLAGS) \
+       $(GTK_DEPRECATION_FLAGS)
 
 libnautilus_easytag_la_CFLAGS = \
        $(WARN_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 14eb182..f47b66e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,9 +335,11 @@ AM_CONDITIONAL([ENABLE_NAUTILUS_ACTIONS], [test x"$have_libnautilus_extension" !
 
 dnl Check the pkg-config dependencies
 GIO_DEPS="gio-2.0 >= 2.32.0" dnl For g_file_new_tmp()
-GLIB_DEPRECATION_FLAGS="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"
+AC_SUBST([GLIB_DEPRECATION_FLAGS],
+         ["-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"])
 GTK_DEPS="gtk+-3.0 >= 3.4.0"
-GTK_DEPRECATION_FLAGS="-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"
+AC_SUBST([GTK_DEPRECATION_FLAGS],
+         ["-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4"])
 PKG_CHECK_MODULES([EASYTAG], [$GIO_DEPS $GTK_DEPS $OPUS_DEPS $OGG_DEPS $SPEEX_DEPS $FLAC_DEPS $ID3TAG_DEPS 
$TAGLIB_DEPS $WAVPACK_DEPS])
 
 dnl Check for winsock