[easytag] build: Only use G*_DISABLE_DEPRECATED flags with GTK2



commit ae44533bb47500e713dd0fa5435e2d7d66a0d45a
Author: Florian MÃllner <fmuellner gnome org>
Date:   Sun Feb 10 21:10:06 2013 +0100

    build: Only use G*_DISABLE_DEPRECATED flags with GTK2
    
    For now, the code has only been updated to not use any deprecated
    GTK+-2 API to ease porting to GTK+-3; API that has only been
    deprecated in GTK+-3 is still in use, so don't use those flags
    when building with --with-gtk3.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=693548

 Makefile.am  |    6 +++++-
 configure.ac |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d199c4a..f995c66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,13 @@ 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 9821a0d..4a9f70a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,6 +96,7 @@ 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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]