diff options
| author | Marek Kasik <mkasik@redhat.com> | 2019-05-10 16:38:02 +0200 |
|---|---|---|
| committer | Marek Kasik <mkasik@redhat.com> | 2019-05-10 16:40:58 +0200 |
| commit | 4e804ff4a7616c9ae1616fa21fe26bd50d3f00e4 (patch) | |
| tree | ca87cb488e288ed58e720ef8dbf4d1f0d622831b | |
| parent | a7e207abe229344224f2b26083934a48698571fb (diff) | |
| download | gtk+-4e804ff4a7616c9ae1616fa21fe26bd50d3f00e4.tar.gz | |
Require CUPS >= 2.0 in configure.ac
Require CUPS 2.0 and newer to simplify code.
This removes all ifdefs dependent on CUPS version.
| -rw-r--r-- | config.h.win32.in | 3 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/config.h.win32.in b/config.h.win32.in index 50471ff449..4cda084f61 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -29,9 +29,6 @@ /* Define to 1 if you have the <crt_externs.h> header file. */ /* #undef HAVE_CRT_EXTERNS_H */ -/* Define to 1 if CUPS 1.2 API is available */ -/* #undef HAVE_CUPS_API_1_2 */ - /* Define to 1 if you have the `dcgettext' function. */ #define HAVE_DCGETTEXT 1 diff --git a/configure.ac b/configure.ac index 5615ac7193..bf35c55837 100644 --- a/configure.ac +++ b/configure.ac @@ -1534,15 +1534,8 @@ else CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` - if test $CUPS_API_MAJOR -lt 1 -o \ - $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then - AC_MSG_ERROR([CUPS >= 1.2 not found]) - fi - if test $CUPS_API_MAJOR -gt 1 -o \ - $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then - AC_DEFINE(HAVE_CUPS_API_1_6, 1, - [Define to 1 if CUPS 1.6 API is available]) - have_cups_api_1_6=yes + if test $CUPS_API_MAJOR -lt 2; then + AC_MSG_ERROR([CUPS >= 2.0 not found]) fi AC_SUBST(CUPS_API_MAJOR) |