diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2019-04-12 17:58:53 +0100 |
|---|---|---|
| committer | Marek Kasik <mkasik@redhat.com> | 2019-05-10 16:40:58 +0200 |
| commit | 91cc9b58f36ae1158c455863c54dd9736826529f (patch) | |
| tree | ab54c56aec7e2cc0883112c45ab1f56455fa55b9 | |
| parent | 7bd9cdc8fb85cd4049d8cb96285b067d214a7770 (diff) | |
| download | gtk+-91cc9b58f36ae1158c455863c54dd9736826529f.tar.gz | |
Detect CUPS ≥ 1.7
We support CUPS ≥ 1.2, but we use API that was introduced and deprecated
at a later point.
| -rw-r--r-- | config.h.meson | 3 | ||||
| -rw-r--r-- | modules/printbackends/meson.build | 3 |
2 files changed, 6 insertions, 0 deletions
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, |