xserver: Branch 'master'

[Keith Packard]

Rebased ref, commits from common ancestor:
commit 24952b786625fef808cb26d539dd5109d623c053
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Apr 1 23:44:24 2010 -0700

    Install 10-evdev.conf in $(prefix)/etc/X11/xorg.conf.d under udev
    
    udev needs some xorg.conf file to tell it to load a suitable input
    driver, 10-evdev.conf is as simple as they come, mapping all evdev
    devices to the evdev driver.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/config/10-evdev.conf b/config/10-evdev.conf
new file mode 100644
index 0000000..7406f4e
--- /dev/null
+++ b/config/10-evdev.conf
@@ -0,0 +1,8 @@
+#
+# Catch-all evdev loader for udev-based systems
+#
+Section "InputClass"
+        Identifier "evdev-catchall"
+        Driver "evdev"
+        MatchDevicePath "/dev/input/event*"
+EndSection
diff --git a/config/Makefile.am b/config/Makefile.am
index 27f251b..eed7454 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -9,6 +9,9 @@ AM_CFLAGS += $(UDEV_CFLAGS)
 libconfig_la_SOURCES += udev.c
 libconfig_la_LIBADD = $(UDEV_LIBS)
 
+xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR)
+xorgconfd_DATA = 10-evdev.conf
+
 else
 
 if CONFIG_NEED_DBUS
@@ -33,4 +36,4 @@ endif # CONFIG_NEED_DBUS
 
 endif # !CONFIG_UDEV
 
-EXTRA_DIST = xorg-server.conf x11-input.fdi
+EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf
diff --git a/configure.ac b/configure.ac
index cc45362..57127ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1764,6 +1764,7 @@ if test "x$XORG" = xyes; then
 	dnl these only go in xorg-config.h
 	XF86CONFIGFILE="xorg.conf"
 	XF86CONFIGDIR="xorg.conf.d"
+	AC_SUBST(XF86CONFIGDIR)
 	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
 	LOGPREFIX="$logdir/Xorg."
 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])