[PATCH evdev] When building against server 1.8, install 00-evdev.conf.

Peter Hutterer peter.hutterer at who-t.net
Thu Mar 25 04:25:42 PDT 2010


Installing a vanilla X server and evdev now at least allows the server to
start up with a few input devices.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 00-evdev.conf |    5 +++++
 Makefile.am   |    5 +++++
 configure.ac  |    4 ++++
 3 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 00-evdev.conf

diff --git a/00-evdev.conf b/00-evdev.conf
new file mode 100644
index 0000000..00a5d4c
--- /dev/null
+++ b/00-evdev.conf
@@ -0,0 +1,5 @@
+Section "InputClass"
+        Identifier "evdev-catchall"
+        Driver "evdev"
+        MatchDevicePath "/dev/input/event*"
+EndSection
diff --git a/Makefile.am b/Makefile.am
index 47d5e78..523fcdd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,3 +38,8 @@ ChangeLog:
 	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog INSTALL
+
+if XSERVER18
+confdir = $(sysconfdir)/xorg.conf.d
+conf_DATA = 00-evdev.conf
+endif
diff --git a/configure.ac b/configure.ac
index e2716fa..eeb6326 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,10 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
 # Checks for pkg-config packages. We need to be able to override sdkdir
 # to satisfy silly distcheck requirements.
 PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XSERVER, [xorg-server >= 1.7.99],
+                           [have_server18="yes"], [have_server18="no"])
+
+AM_CONDITIONAL(XSERVER18, [test "x$have_server18" = "xyes"])
 
 AC_ARG_WITH([sdkdir], [],
     [sdkdir="$withval"],
-- 
1.6.6.1



More information about the xorg-devel mailing list