Fix more include paths; add dix-config.h to XKB code.

11 files changed, 63 insertions, 74 deletions

diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index c415380ee..9430ac0ed 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -28,13 +28,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#elif defined(HAVE_CONFIG_H)
+#include <config.h>
 #endif
 
 #ifndef XKB_IN_SERVER
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <stdio.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
@@ -47,14 +46,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #else 
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#include "XKBsrv.h"
-#include "XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
 
 #endif /* XKB_IN_SERVER */
 
diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index d5b9a1c93..fddb770b6 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -26,18 +26,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.4 2001/01/17 19:41:48 dawes Exp $ */
 
-#define	NEED_EVENTS
-#define	NEED_REPLIES
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#elif defined(HAVE_CONFIG_H)
+#include <config.h>
 #endif
 
+#define	NEED_EVENTS
+#define	NEED_REPLIES
+
 #ifndef XKB_IN_SERVER
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <stdio.h>
 #include "Xlibint.h"
 #include "XKBlibint.h"
@@ -47,12 +46,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #else 
 
 #include <stdio.h>
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#include "XKBsrv.h"
-#include "XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
 
 #endif /* XKB_IN_SERVER */
 
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index db0020691..91d87d57c 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -28,13 +28,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#elif defined(HAVE_CONFIG_H)
+#include <config.h>
 #endif
 
 #ifndef XKB_IN_SERVER
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <stdio.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
@@ -46,15 +45,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #else 
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include <X11/keysym.h>
 #define	XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 
 #endif /* XKB_IN_SERVER */
 
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 6ad364127..09f361c19 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -28,13 +28,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#elif defined(HAVE_CONFIG_H)
+#include <config.h>
 #endif
 
 #ifndef XKB_IN_SERVER
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <stdio.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
@@ -46,15 +45,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #else 
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include <X11/keysym.h>
 #define	XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 
 #endif /* XKB_IN_SERVER */
 
diff --git a/xkb/maprules.c b/xkb/maprules.c
index 03ca51eaa..53decdcad 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -28,11 +28,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
+#elif defined(HAVE_CONFIG_H)
 #include <config.h>
 #endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -67,9 +66,9 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
 #define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 
 #endif
 
diff --git a/xkb/xkbconfig.c b/xkb/xkbconfig.c
index 3d582d1fb..7930979eb 100644
--- a/xkb/xkbconfig.c
+++ b/xkb/xkbconfig.c
@@ -28,11 +28,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
+#elif defined(HAVE_CONFIG_H)
 #include <config.h>
 #endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -51,15 +50,15 @@
 
 #else
 
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
 #include <X11/keysym.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 
 #include <X11/extensions/XKBconfig.h>
diff --git a/xkb/xkberrs.c b/xkb/xkberrs.c
index 731d0b5cf..1b856bcaf 100644
--- a/xkb/xkberrs.c
+++ b/xkb/xkberrs.c
@@ -28,11 +28,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
+#elif defined(HAVE_CONFIG_H)
 #include <config.h>
 #endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index f55ab5bdf..cca31f778 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -28,11 +28,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
+#elif defined(HAVE_CONFIG_H)
 #include <config.h>
 #endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -51,16 +50,16 @@
 
 #else
 
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
 #include <X11/keysym.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
 #define XKBSRV_NEED_FILE_FUNCS	1
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #include <X11/extensions/XKBgeom.h>
 #include "xkb.h"
 
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index cdf699509..b69fdfbb4 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -28,11 +28,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
+#elif defined(HAVE_CONFIG_H)
 #include <config.h>
 #endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -49,19 +48,19 @@
 
 #else
 
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
 #include <X11/keysym.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
 #define XKBSRV_NEED_FILE_FUNCS	1
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 
 #include <X11/extensions/XKBgeom.h>
-#include "extensions/XKBfile.h"
+#include <X11/extensions/XKBfile.h>
 
 #endif
 
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 0df7c894b..28592d242 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -28,11 +28,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
+#elif defined(HAVE_CONFIG_H)
 #include <config.h>
 #endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -50,16 +49,16 @@
 
 #else
 
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
 #define XKBSRV_NEED_FILE_FUNCS	1
-#include "XKBsrv.h"
-#include "XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
 
 #endif
 
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 3f38a4f96..f22941f67 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -28,11 +28,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
+#elif defined(HAVE_CONFIG_H)
 #include <config.h>
 #endif
+
 #include <stdio.h>
 
 #include <X11/Xos.h>
@@ -52,16 +51,16 @@
 
 #else
 
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include <X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
 #define	 XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
 
 Atom
 XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)