From 91cc9b58f36ae1158c455863c54dd9736826529f Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 12 Apr 2019 17:58:53 +0100
Subject: [PATCH] =?UTF-8?q?Detect=20CUPS=20=E2=89=A5=201.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We support CUPS ≥ 1.2, but we use API that was introduced and deprecated
at a later point.
---
 config.h.meson                    | 3 +++
 modules/printbackends/meson.build | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/config.h.meson b/config.h.meson
index f90c96b7e6..2b6c584e74 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -26,6 +26,9 @@
 /* Define to 1 if CUPS 1.6 API is available */
 #mesondefine HAVE_CUPS_API_1_6
 
+/* Define to 1 if CUPS 2.0 API is available */
+#mesondefine HAVE_CUPS_API_2_0
+
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #mesondefine HAVE_DCGETTEXT
diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build
index 3f4dfd13f1..f0e134bd64 100644
--- a/modules/printbackends/meson.build
+++ b/modules/printbackends/meson.build
@@ -78,6 +78,9 @@ if enabled_print_backends.contains('cups')
       if cups_major_version > 1 or cups_minor_version >= 6
         cdata.set('HAVE_CUPS_API_1_6', 1)
       endif
+      if cups_major_version > 1 or cups_minor_version >= 7
+        cdata.set('HAVE_CUPS_API_2_0', 1)
+      endif
 
       if cc.compiles('#include <cups/http.h> \n http_t http; char *s = http.authstring;')
         cdata.set('HAVE_HTTP_AUTHSTRING', 1,