[PATCH] Wayland X server uses xwayand.conf instead of xorg.conf, and xwayland.conf.d instead of xorg.conf.d.

[spitzak at gmail.com]

From: Bill Spitzak <spitzak at gmail.com>

This allows X applications to be run on wayland without having to
delete conf files needed to run the legacy X server on the same
machine.

The --config and --configdir switches can override these changes.

An extra patch to xorg was needed, as it *always* looked for
xorg.conf.d. I changed it to not do this if --configdir or
--wayland was given.
---
 hw/xfree86/common/xf86Config.c |    5 ++++-
 hw/xfree86/common/xf86Init.c   |    4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 3934ff0..2376889 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -2386,7 +2386,10 @@ xf86HandleConfigFile(Bool autoconfig)
             dirfrom = X_CMDLINE;
 
         xf86initConfigFiles();
-        sysdirname = xf86openConfigDirFiles(SYS_CONFIGDIRPATH, NULL,
+        if (xf86ConfigDir)
+            sysdirname = 0;
+        else
+            sysdirname = xf86openConfigDirFiles(SYS_CONFIGDIRPATH, NULL,
                                             PROJECTROOT);
         dirname = xf86openConfigDirFiles(dirsearch, xf86ConfigDir, PROJECTROOT);
         filename = xf86openConfigFile(filesearch, xf86ConfigFile, PROJECTROOT);
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index a062929..b2a668c 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1412,6 +1412,10 @@ ddxProcessArgument(int argc, char **argv, int i)
   if (!strcmp(argv[i], "-wayland"))
   {
     xorgWayland = TRUE;
+    if (!xf86ConfigFile)
+      xf86ConfigFile = "xwayland.conf";
+    if (!xf86ConfigDir)
+      xf86ConfigDir = "xwayland.conf.d";
     return 1;
   }
 
-- 
1.7.9.5