[PULL] xorg.conf.d configuration

[Dan Nicholson]

Here are the xorg.conf.d patches I've been working that Peter has been
reviewing. Also included is his new AutoServerLayout patch for extra
input configuration fanciness.

Dan

The following changes since commit 90e6d93cf9bfafd63d7849dc16ce194d6f9c9d5f:
  Peter Hutterer (1):
        test/xi2: fail if xi2 class type is garbage. (#25492)

are available in the git repository at:

  git://people.freedesktop.org/~dbn/xserver xorg.conf.d

Dan Nicholson (3):
      xfree86: Unexport configuration file symbols
      xfree86: Use xorg.conf.d directory for multiple config files
      xfree86: Allow config directory to be specified on command line

Peter Hutterer (1):
      xfree86: Add Option AutoServerLayout for input devices.

 configure.ac                         |    2 +
 cpprules.in                          |    3 +-
 hw/xfree86/common/xf86AutoConfig.c   |    3 +-
 hw/xfree86/common/xf86Config.c       |  157 +++++++++++-----
 hw/xfree86/common/xf86Globals.c      |    1 +
 hw/xfree86/common/xf86Init.c         |   15 ++
 hw/xfree86/common/xf86Priv.h         |    1 +
 hw/xfree86/doc/man/Xorg.man.pre      |   34 ++++-
 hw/xfree86/doc/man/xorg.conf.man.pre |   58 +++++--
 hw/xfree86/parser/Layout.c           |   79 +++++++--
 hw/xfree86/parser/scan.c             |  326 +++++++++++++++++++++++++---------
 hw/xfree86/parser/xf86Parser.h       |   18 ++-
 hw/xwin/InitOutput.c                 |    3 +
 hw/xwin/winconfig.c                  |   40 ++++-
 hw/xwin/winconfig.h                  |    1 +
 hw/xwin/winprocarg.c                 |   18 ++
 include/xorg-config.h.in             |    3 +
 17 files changed, 583 insertions(+), 179 deletions(-)