[gnome-settings-daemon/gnome-3-22] build: Require lcms2 version 2.2 minimum

[Bastien Nocera <hadess src gnome org>]

commit 8798d6a8570aff82e274e4f18df779e4b7043f9a
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Sep 27 19:11:45 2016 +0200

    build: Require lcms2 version 2.2 minimum
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741688

 configure.ac              |   14 ++------------
 plugins/color/Makefile.am |    3 ---
 2 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 122b1ac..ed29f9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION=3.20.0
 GEOCODE_GLIB_REQUIRED_VERSION=3.10.0
 GEOCLUE_REQUIRED_VERSION=2.3.1
 NM_REQUIRED_VERSION=1.0
+LCMS_REQUIRED_VERSION=2.2
 
 EXTRA_COMPILE_WARNINGS(yes)
 
@@ -102,16 +103,6 @@ dnl ---------------------------------------------------------------------------
 PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
 
 dnl ---------------------------------------------------------------------------
-dnl - Check for LCMS2
-dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, have_new_lcms=yes, have_new_lcms=no)
-if test x$have_new_lcms = xyes; then
-        AC_DEFINE(HAVE_NEW_LCMS,1,[Got new lcms2])
-else
-        PKG_CHECK_MODULES(LCMS, lcms2)
-fi
-
-dnl ---------------------------------------------------------------------------
 dnl - Check for libnotify
 dnl ---------------------------------------------------------------------------
 
@@ -254,7 +245,7 @@ dnl ---------------------------------------------------------------------------
 dnl - color
 dnl ---------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION 
libcanberra-gtk3])
+PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION 
libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])
 
 dnl ---------------------------------------------------------------------------
 dnl - datetime
@@ -590,7 +581,6 @@ echo "
         cflags:                   ${CFLAGS}
         Maintainer mode:          ${USE_MAINTAINER_MODE}
 
-        LCMS DICT support:        ${have_new_lcms}
         NetworkManager support:   ${enable_network_manager}
         Libnotify support:        ${have_libnotify}
         Smartcard support:        ${have_smartcard_support}
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index 78a78c9..0f7497a 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -26,7 +26,6 @@ libcolor_la_CPPFLAGS = \
 libcolor_la_CFLAGS = \
        $(PLUGIN_CFLAGS)                \
        $(COLOR_CFLAGS)         \
-       $(LCMS_CFLAGS)                  \
        $(SETTINGS_PLUGIN_CFLAGS)       \
        $(LIBNOTIFY_CFLAGS)             \
        $(AM_CFLAGS)
@@ -37,7 +36,6 @@ libcolor_la_LDFLAGS =                         \
 libcolor_la_LIBADD  =                  \
        $(top_builddir)/gnome-settings-daemon/libgsd.la \
        $(COLOR_LIBS)                   \
-       $(LCMS_LIBS)                    \
        $(SETTINGS_PLUGIN_LIBS)         \
        $(LIBNOTIFY_LIBS)
 
@@ -61,7 +59,6 @@ gcm_self_test_SOURCES =                       \
 
 gcm_self_test_LDADD =                  \
        $(COLOR_LIBS)                   \
-       $(LCMS_LIBS)                    \
        $(SETTINGS_PLUGIN_LIBS)         \
        -lm