[gnome-control-center/gnome-3-8] printers: Don't show CUPS deprecation warnings

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

commit af0bac957cc5eecfd9c7d46a646f68715f57065c
Author: Marek Kasik <mkasik redhat com>
Date:   Thu Mar 28 12:17:21 2013 +0100

    printers: Don't show CUPS deprecation warnings
    
    Hide CUPS deprecation warnings by definition of
    _PPD_DEPRECATED="".
    
    https://bugzilla.gnome.org/show_bug.cgi?id=696766

 configure.ac                |    8 ++++++++
 panels/printers/Makefile.am |    2 ++
 2 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 72a4aff..c470945 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,8 +256,16 @@ if test x"$enable_cups" != x"no" ; then
 
   AC_DEFINE(BUILD_PRINTERS, 1, [Define to 1 to build the Printers panel])
 
+  # https://bugzilla.gnome.org/show_bug.cgi?id=696766
+  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/panels/printers/Makefile.am b/panels/printers/Makefile.am
index 4e7715b..63a33b4 100644
--- a/panels/printers/Makefile.am
+++ b/panels/printers/Makefile.am
@@ -15,6 +15,8 @@ BUILT_SOURCES =                       \
        cc-printers-resources.c \
        cc-printers-resources.h
 
+libprinters_la_CPPFLAGS = $(CUPS_CPPFLAGS)
+
 libprinters_la_SOURCES =               \
        $(BUILT_SOURCES)                \
        pp-new-printer.c                \