[PATCH input-keyboard 11/13] config: move inputproto check to PKG_CHECK_MODULES

Gaetan Nadon memsize at videotron.ca
Wed May 12 10:11:52 PDT 2010


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.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac |    5 +----
 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.
 
-- 
1.6.0.4



More information about the xorg-devel mailing list