[easytag] Build without deprecations with GTK+ 3

[David King <davidk src gnome org>]

commit 535d5ed9c2b77dd4ef4144553adc5ebe17919366
Author: David King <amigadave amigadave com>
Date:   Tue Feb 12 08:36:57 2013 +0000

    Build without deprecations with GTK+ 3
    
    This reverts commit ae44533bb47500e713dd0fa5435e2d7d66a0d45a.

 Makefile.am  |    6 +-----
 configure.ac |    1 -
 2 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f995c66..d199c4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,13 +17,9 @@ localedir = $(datadir)/locale
 easytag_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
+	$(DEPRECATED_CPPFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"
-
-if !USE_GTK3
-easytag_CPPFLAGS += $(DEPRECATED_CPPFLAGS)
-endif
-
 easytag_CFLAGS = \
 	$(WARN_CFLAGS) \
 	$(EASYTAG_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 4a9f70a..9821a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,6 @@ AS_IF([test "x$with_gtk3" = "xyes"],
       [AC_MSG_RESULT([no])
        GTK_DEPS="$GTK2_DEPS"])
 PKG_CHECK_MODULES([GTK], [$GTK_DEPS])
-AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk3" = "xyes"])
 
 
 dnl Patch from Ben Taylor to fix a Solaris bug (for CDDB)