[PATCH v4 0/3] xfree86: Use xorg.conf.d directory for multiple config files

[Dan Nicholson]

Another iteration, and now it's a series. I think this is solid, but it
probably needs another review since there are changes and additions.
Sorry.

Changes from v3:
* Added a patch to unexport the config file functions. I'm not really that
  familiar with this part of the API to know which symbols should be
  available, so I took a guess. Peter, I hope this makes you happy. :)
* Allow the config dir to be specified on the command line with the
  -configdir option. This works just like -config. The only difference
  between the two searches now is that there is no environment variable
  to specify the directory. This isn't quite what Daniel proposed, but
  I think it needs to be a separate argument from -config because the
  directory scanning takes a different path than the file scanning.
* Another refactor of the xorg.conf.d code to allow the command line
  argument. Before I was adding arguments to xf86openConfigFile, but
  now there are two entry points and xf86initConfigFiles to set things
  up. This should allow future improvements where we can skip opening
  the config directory or the config file or both.

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

 configure.ac                         |    2 +
 cpprules.in                          |    3 +-
 hw/xfree86/common/xf86AutoConfig.c   |    3 +-
 hw/xfree86/common/xf86Config.c       |   60 +++++--
 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 |   53 ++++--
 hw/xfree86/parser/scan.c             |  326 +++++++++++++++++++++++++---------
 hw/xfree86/parser/xf86Parser.h       |   17 +-
 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 +
 16 files changed, 454 insertions(+), 126 deletions(-)