[gnome-settings-daemon/gnome-3-8] print-notifications: Don't show deprecation warnings

[Marek Kašík <mkasik src gnome org>]

commit 08a2c609637def36f7255d506dd8b41ebbe74e6b
Author: Marek Kasik <mkasik redhat com>
Date:   Tue Mar 26 17:21:34 2013 +0100

    print-notifications: Don't show deprecation warnings
    
    Hide deprecation warnings by definition of
    _PPD_DEPRECATED="" because of missing replacement for
    deprecated function ppdLocalizeIPPReason().
    
    https://bugzilla.gnome.org/show_bug.cgi?id=696571

 configure.ac                            |    8 ++++++++
 plugins/print-notifications/Makefile.am |    6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ae7a747..427ca7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -369,8 +369,16 @@ if test x"$enable_cups" != x"no" ; then
       AC_MSG_ERROR([CUPS 1.4 or newer not found, but CUPS support requested])
    fi
 
+   # https://bugzilla.gnome.org/show_bug.cgi?id=696571
+   CUPS_CPPFLAGS=""
+   if test $CUPS_API_MAJOR -gt 1 -o \
+           $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
+      CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
+   fi
+
    CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
    CUPS_LIBS=`$CUPS_CONFIG --libs`
+   AC_SUBST(CUPS_CPPFLAGS)
    AC_SUBST(CUPS_CFLAGS)
    AC_SUBST(CUPS_LIBS)
 fi
diff --git a/plugins/print-notifications/Makefile.am b/plugins/print-notifications/Makefile.am
index 449b88c..ce22eb5 100644
--- a/plugins/print-notifications/Makefile.am
+++ b/plugins/print-notifications/Makefile.am
@@ -12,7 +12,8 @@ libprint_notifications_la_CPPFLAGS = \
        -I$(top_srcdir)/gnome-settings-daemon           \
        -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
-       $(AM_CPPFLAGS)
+       $(AM_CPPFLAGS)                  \
+       $(CUPS_CPPFLAGS)
 
 libprint_notifications_la_CFLAGS = \
        $(PLUGIN_CFLAGS)                \
@@ -59,7 +60,8 @@ gsd_test_print_notifications_CPPFLAGS =                               \
        -I$(top_srcdir)/plugins/common                          \
        -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
        -DLIBEXECDIR=\""$(libexecdir)"\"                        \
-       $(AM_CPPFLAGS)
+       $(AM_CPPFLAGS)                                          \
+       $(CUPS_CPPFLAGS)
 
 gsd_test_print_notifications_CFLAGS =  \
        $(PLUGIN_CFLAGS)                \