From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 12 Apr 2019 16:58:53 +0000 (+0100)
Subject: Detect CUPS ≥ 1.7
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~1695^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=feddf5a6943872f948ace6e48713aa22e7d34697;p=gtk4.git

Detect CUPS ≥ 1.7

We support CUPS ≥ 1.2, but we use API that was introduced and deprecated
at a later point.
---

diff --git a/config.h.meson b/config.h.meson
index 74a90d3df8..b792b4ae93 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -27,6 +27,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 to 1 if you have the `dcgettext' function. */
 #mesondefine HAVE_DCGETTEXT
 
diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build
index 0e26d829f9..00ee33a80d 100644
--- a/modules/printbackends/meson.build
+++ b/modules/printbackends/meson.build
@@ -30,6 +30,9 @@ if enable_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,