[gnome-settings-daemon] wacom: Split out wacom checks

[Bastien Nocera <hadess src gnome org>]

commit 753be74fe9892b8546dbcf6a2487a90fc376dae6
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Dec 6 11:24:30 2011 +0000

    wacom: Split out wacom checks
    
    So we can add some new stuff there.

 configure.ac              |    6 ++++++
 plugins/wacom/Makefile.am |    6 +++++-
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index acead53..49bcb1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,6 +217,12 @@ dnl ---------------------------------------------------------------------------
 
 PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
 
+dnl ---------------------------------------------------------------------------
+dnl - wacom
+dnl ---------------------------------------------------------------------------
+
+PKG_CHECK_MODULES(WACOM, [x11 xi])
+
 dnl ==============================================
 dnl PackageKit section
 dnl ==============================================
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index 6ead3fa..bdf72b2 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -21,6 +21,7 @@ libgsdwacom_la_CPPFLAGS = \
 libgsdwacom_la_CFLAGS = \
 	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(WACOM_CFLAGS)			\
 	$(AM_CFLAGS)
 
 libgsdwacom_la_LDFLAGS =		\
@@ -29,7 +30,7 @@ libgsdwacom_la_LDFLAGS =		\
 libgsdwacom_la_LIBADD  =						\
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(SETTINGS_PLUGIN_LIBS)						\
-	$(XINPUT_LIBS)
+	$(WACOM_LIBS)
 
 noinst_PROGRAMS = test-wacom list-wacom
 
@@ -52,6 +53,7 @@ test_wacom_CPPFLAGS = \
 
 test_wacom_CFLAGS =			\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(WACOM_CFLAGS)			\
 	$(AM_CFLAGS)
 
 test_wacom_LDADD = \
@@ -59,6 +61,7 @@ test_wacom_LDADD = \
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\
+	$(WACOM_LIBS)				\
 	-lm
 
 list_wacom_SOURCES =		\
@@ -85,6 +88,7 @@ list_wacom_LDADD = \
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\
+	$(WACOM_LIBS)				\
 	-lm
 
 plugin_in_files = wacom.gnome-settings-plugin.in