summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-05-10 17:36:14 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-05-14 14:37:53 -0400
commit0aa1afb5b1e52c7e945b3a010372362c3157533b (patch)
tree5ebb0345007776966ef0a98499b058fd7f8fee86
parent9a93f9c5ad7c3ddf226dfdc987e60c580b6e0912 (diff)
downloadxorg-driver-xf86-input-keyboard-0aa1afb5b1e52c7e945b3a010372362c3157533b.tar.gz
config: move inputproto check to PKG_CHECK_MODULES
The XORG_DRIVER_CHECK_EXT macro conditionally adds inputproto to PKG_CHECK_MODULES if this extension is defined in xorg-server.h. It allows a module to use ifdef XINPUT if the extension is available. In this module, the extension is required and not optional. Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--configure.ac5
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index b77fe4f..8591cda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,11 +81,8 @@ AC_ARG_WITH(xorg-module-dir,
[moduledir="$libdir/xorg/modules"])
AC_SUBST(moduledir)
-# Checks for extensions
-XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
-
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2.99.0] xproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2.99.0] xproto inputproto)
# Checks for libraries.