[gpointing-device-settings] Link libgpds with xlib

[Hiroyuki Ikezoe <hiikezoe src gnome org>]

commit 0bd44b9534cb7fb3458e5b40575ad906e64f145c
Author: Michal Ä?ihaÅ? <nijel debian org>
Date:   Sat Dec 5 19:46:23 2009 +0900

    Link libgpds with xlib
    
    Fix for bug 603459.
    The libgpds library uses xlib symbols but does not link to xlib.

 configure.ac    |    4 ++++
 src/Makefile.am |    7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index efbd04b..e71f821 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,10 @@ PKG_CHECK_MODULES(XINPUT, xi >= 1.2.0)
 AC_SUBST(XINPUT_CFLAGS)
 AC_SUBST(XINPUT_LIBS)
 
+PKG_CHECK_MODULES(X11, x11 >= 1.2.0)
+AC_SUBST(X11_CFLAGS)
+AC_SUBST(X11_LIBS)
+
 LT_CURRENT=1
 LT_REVISION=0
 LT_AGE=1
diff --git a/src/Makefile.am b/src/Makefile.am
index b1abb0d..225e021 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,9 @@ AM_CFLAGS = -DG_LOG_DOMAIN=\"GPointingDeviceSettings\"
 
 libgpds_la_CFLAGS =			\
 	$(GPDS_CFLAGS)			\
-	$(COVERAGE_CFLAGS)
+	$(COVERAGE_CFLAGS)		\
+	$(XINPUT_CFLAGS)		\
+	$(X11_CFLAGS)
 
 libgpds_la_LDFLAGS =				\
 	-version-info $(LT_VERSION_INFO)	\
@@ -36,7 +38,8 @@ libgpds_la_LDFLAGS =				\
 libgpds_la_LIBADD =			\
 	$(GTK_LIBS)			\
 	$(GCONF2_LIBS)			\
-	$(XINPUT_LIBS)
+	$(XINPUT_LIBS)		\
+	$(X11_LIBS)
 
 pkginclude_HEADERS =			\
 	$(libgpds_public_headers)