summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-05-16 21:48:36 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-05-16 21:48:36 +0000
commit8bd3aea84ce54b8b76a898f3ae00e2b499c14a5e (patch)
treebc92737e8d686191135b72d93a30bba9210758be
parent9b1fa9ca3ed852ed40860f137511683f4bdae6fa (diff)
Mon May 16 17:48:03 2005 Søren Sandmann <sandmann@redhat.com>
Check for kbproto if using XKB.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6949655..f8a5106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 16 17:48:03 2005 Søren Sandmann <sandmann@redhat.com>
+
+ * configure.ac: Check for kbproto if using XKB.
+
2005-05-16 <ssp@aware-of-vacuity.boston.redhat.com>
* configure.ac: Require xextproto rather than xextensions
diff --git a/configure.ac b/configure.ac
index 80da1ec..47e3da9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,7 +181,10 @@ fi
AM_CONDITIONAL(XKB, [ test x$XKB = xyes ])
if test "$XKB" = yes; then
+ PKG_CHECK_MODULES(XKBPROTO, kbproto)
AC_DEFINE(XKB, YES, [Use XKB])
+ X11_CFLAGS="$X11_CFLAGS $XKBPROTO_CFLAGS"
+ X11_LIBS="$X11_LIBS $XKBPROTO_LIBS"
fi
if test "x$GCC" = "xyes"; then