[gnome-color-manager/colord: 11/72] Depend on colord

[Richard Hughes <rhughes src gnome org>]

commit 8d81d70bd20789ac33e504eaca961c37ca7ff81c
Author: Richard Hughes <richard hughsie com>
Date:   Sun Jan 16 11:54:49 2011 +0000

    Depend on colord

 configure.ac    |    1 +
 src/Makefile.am |   10 ++--------
 2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8681531..4d1839c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,6 +140,7 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.91.0)
 PKG_CHECK_MODULES(GUDEV, gudev-1.0)
 PKG_CHECK_MODULES(LCMS, lcms2)
 PKG_CHECK_MODULES(X11, x11)
+PKG_CHECK_MODULES(COLORD, colord)
 PKG_CHECK_MODULES(SETTINGS_DAEMON, gnome-settings-daemon)
 PKG_CHECK_MODULES(USB, libusb-1.0 >= 1.0.9, has_new_libusb=yes, has_new_libusb=no)
 if test x$has_new_libusb = xyes; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 4055357..a05fbca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,11 +4,11 @@ INCLUDES =						\
 	$(GTK_CFLAGS)					\
 	$(VTE_CFLAGS)					\
 	$(XORG_CFLAGS)					\
-	$(CUPS_CFLAGS)					\
 	$(SANE_CFLAGS)					\
 	$(TIFF_CFLAGS)					\
 	$(EXIF_CFLAGS)					\
 	$(EXIV_CFLAGS)					\
+	$(COLORD_CFLAGS)				\
 	$(NOTIFY_CFLAGS)				\
 	$(CANBERRA_CFLAGS)				\
 	$(CONTROL_CENTER_CFLAGS)			\
@@ -104,7 +104,6 @@ gcm_inspect_LDADD =					\
 	$(XORG_LIBS)					\
 	$(GTK_LIBS)					\
 	$(SANE_LIBS)					\
-	$(CUPS_LIBS)					\
 	$(COLOR_GLIB_LIBS)				\
 	-lm
 
@@ -122,7 +121,6 @@ gcm_import_LDADD =					\
 	$(XORG_LIBS)					\
 	$(GTK_LIBS)					\
 	$(SANE_LIBS)					\
-	$(CUPS_LIBS)					\
 	$(COLOR_GLIB_LIBS)				\
 	-lm
 
@@ -143,7 +141,6 @@ gcm_viewer_LDADD =					\
 	$(XORG_LIBS)					\
 	$(GTK_LIBS)					\
 	$(SANE_LIBS)					\
-	$(CUPS_LIBS)					\
 	$(TIFF_LIBS)					\
 	$(EXIF_LIBS)					\
 	$(COLOR_GLIB_LIBS)				\
@@ -164,7 +161,6 @@ gcm_picker_LDADD =					\
 	$(XORG_LIBS)					\
 	$(GTK_LIBS)					\
 	$(SANE_LIBS)					\
-	$(CUPS_LIBS)					\
 	$(TIFF_LIBS)					\
 	$(EXIF_LIBS)					\
 	$(CANBERRA_LIBS)				\
@@ -188,7 +184,7 @@ gcm_session_LDADD =					\
 	$(EXIF_LIBS)					\
 	$(SANE_LIBS)					\
 	$(NOTIFY_LIBS)					\
-	$(CUPS_LIBS)					\
+	$(COLORD_LIBS)					\
 	$(COLOR_GLIB_LIBS)				\
 	-lm
 
@@ -218,7 +214,6 @@ libcolor_la_LIBADD =					\
 	$(EXIF_LIBS)					\
 	$(SANE_LIBS)					\
 	$(NOTIFY_LIBS)					\
-	$(CUPS_LIBS)					\
 	$(CANBERRA_LIBS)				\
 	$(CONTROL_CENTER_LIBS)				\
 	$(COLOR_GLIB_LIBS)
@@ -246,7 +241,6 @@ gcm_self_test_LDADD =					\
 	$(XORG_LIBS)					\
 	$(GTK_LIBS)					\
 	$(SANE_LIBS)					\
-	$(CUPS_LIBS)					\
 	$(TIFF_LIBS)					\
 	$(EXIF_LIBS)					\
 	$(COLOR_GLIB_LIBS)				\