xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/utils/xorgcfg/text-mode.c     |    2 +-
 hw/xfree86/utils/xorgconfig/xorgconfig.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e6a4cde16dc99ea02ac93da1d1b9517b1073d159
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Feb 22 18:36:29 2008 -0500

    Use the client-side XKB headers for the config utilities

diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c
index c1fa67e..0b6e654 100644
--- a/hw/xfree86/utils/xorgcfg/text-mode.c
+++ b/hw/xfree86/utils/xorgcfg/text-mode.c
@@ -39,7 +39,7 @@
 #endif
 #include <ctype.h>
 #include <X11/Xlib.h>
-#include "xkbstr.h"
+#include <X11/extensions/XKBstr.h>
 #include <X11/extensions/XKBrules.h>
 #include "cards.h"
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index d537aba..30eb831 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -106,7 +106,7 @@
 #include <sys/stat.h>
 
 #include <X11/Xlib.h>
-#include "xkbstr.h"
+#include <X11/extensions/XKBstr.h>
 #include <X11/extensions/XKBrules.h>
 #define MAX_XKBOPTIONS	5