[gnome-desktop] Disable deprecation warnings explicitly

[Ernestas Kulik <ernestask src gnome org>]

commit f6876293118d36e73ac1574de13450b132724a06
Author: Ernestas Kulik <ernestask gnome org>
Date:   Mon Feb 12 18:41:03 2018 +0200

    Disable deprecation warnings explicitly
    
    This additionally removes the ability to pass deprecation flags to
    configure.ac. Revert when GTK/GDK warnings are fixed, or just don’t define
    the magic macros.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=793195

 configure.ac                 |   11 -----------
 libgnome-desktop/Makefile.am |    5 +++--
 2 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 94ade7f..4fdb80f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,16 +74,6 @@ AC_SUBST(GNOME_DATE_COMMENT_END)
 
 AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
 
-AC_ARG_ENABLE(deprecation_flags,
-              [AS_HELP_STRING([--enable-deprecation-flags],
-                              [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
-              [enable_deprecation_flags=no])
-
-if test "x$enable_deprecation_flags" = "xyes"; then
-   DISABLE_DEPRECATED_CFLAGS=$DISABLE_DEPRECATED
-   AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-fi
-
 # Should we build shared desktop docs? Useful for people who
 # need to build two gnome-desktop using two different versions of GTK+
 AC_ARG_ENABLE([desktop-docs],
@@ -272,7 +262,6 @@ echo "
         compiler:                     ${CC}
         cflags:                       ${CFLAGS}
         Maintainer mode:              ${USE_MAINTAINER_MODE}
-        Use *_DISABLE_DEPRECATED:     ${enable_deprecation_flags}
 
         GNOME Distributor:            ${GNOME_DISTRIBUTOR}
         Build desktop-wide docs:      ${enable_desktop_docs}
diff --git a/libgnome-desktop/Makefile.am b/libgnome-desktop/Makefile.am
index 7e8ac7b..ab3e84f 100644
--- a/libgnome-desktop/Makefile.am
+++ b/libgnome-desktop/Makefile.am
@@ -10,12 +10,13 @@ AM_CPPFLAGS =                                                       \
        $(GNOME_DESKTOP_CFLAGS)                                 \
        $(XLIB_CFLAGS)                                          \
        -DG_LOG_DOMAIN=\"GnomeDesktop\"                         \
+       -DGDK_DISABLE_DEPRECATION_WARNINGS                      \
        -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\""  \
+       -DGTK_DISABLE_DEPRECATION_WARNINGS                      \
        -DISO_CODES_PREFIX=\""$(ISO_CODES_PREFIX)"\"            \
        -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"               \
        -DPNP_IDS=\""$(PNP_IDS)"\"                              \
-       -DXKB_BASE=\""$(XKB_BASE)"\"                            \
-       $(DISABLE_DEPRECATED_CFLAGS)
+       -DXKB_BASE=\""$(XKB_BASE)"\"
 
 AM_CFLAGS = $(WARN_CFLAGS)