- Link Xext to /lib/Xext/src rather than /lib/XextXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10

- Conditionally include config.h in Xext source
- Remove unnecessary include of ImUtil.h from XShm.c

15 files changed, 45 insertions, 1 deletions

diff --git a/src/DPMS.c b/src/DPMS.c
index dd00e5e..35b21b4 100644
--- a/src/DPMS.c
+++ b/src/DPMS.c
@@ -33,6 +33,9 @@ Equipment Corporation.
  */
 
 #define NEED_REPLIES
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xlibint.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/dpmsstr.h>
diff --git a/src/MITMisc.c b/src/MITMisc.c
index 4554ec4..c0fa872 100644
--- a/src/MITMisc.c
+++ b/src/MITMisc.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM BLESSING */
 
 #define NEED_REPLIES
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xlibint.h>
 #include <X11/extensions/MITMisc.h>
 #include <X11/extensions/mitmiscstr.h>
diff --git a/src/XAppgroup.c b/src/XAppgroup.c
index 299e20f..2ca3e4d 100644
--- a/src/XAppgroup.c
+++ b/src/XAppgroup.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: XAppgroup.c,v 1.5 2001/02/09 02:03:49 xorgcvs Exp $ */
 
 #ifdef WIN32
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xwindows.h>
 #endif
 
diff --git a/src/XEVI.c b/src/XEVI.c
index aba4f57..a64b9c1 100644
--- a/src/XEVI.c
+++ b/src/XEVI.c
@@ -24,6 +24,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* $XFree86$ */
 #define NEED_EVENTS
 #define NEED_REPLIES
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xlibint.h>
 #include <X11/extensions/XEVI.h>
 #include <X11/extensions/XEVIstr.h>
diff --git a/src/XLbx.c b/src/XLbx.c
index d382ff5..8c0cfad 100644
--- a/src/XLbx.c
+++ b/src/XLbx.c
@@ -26,6 +26,9 @@
 
 #define NEED_EVENTS
 #define NEED_REPLIES
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/XLbx.h>
diff --git a/src/XMultibuf.c b/src/XMultibuf.c
index 61af605..3e0049e 100644
--- a/src/XMultibuf.c
+++ b/src/XMultibuf.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 
 #define NEED_EVENTS
 #define NEED_REPLIES
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xlibint.h>
 #include <stdio.h>
 #include <X11/extensions/Xext.h>
diff --git a/src/XSecurity.c b/src/XSecurity.c
index 4842744..161ade3 100644
--- a/src/XSecurity.c
+++ b/src/XSecurity.c
@@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group.
 */
 /* $XFree86: xc/lib/Xext/XSecurity.c,v 1.5 2002/10/16 00:37:27 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xlibint.h>
 #include <stdio.h>
 #include <X11/extensions/Xext.h>
diff --git a/src/XShape.c b/src/XShape.c
index 21a3076..661ad9f 100644
--- a/src/XShape.c
+++ b/src/XShape.c
@@ -28,6 +28,9 @@ in this Software without prior written authorization from The Open Group.
 /* $XFree86: xc/lib/Xext/XShape.c,v 1.3 2002/10/16 00:37:27 dawes Exp $ */
 #define NEED_EVENTS
 #define NEED_REPLIES
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xlibint.h>
 #include <X11/Xutil.h>
 #include "region.h"			/* in Xlib sources */
diff --git a/src/XShm.c b/src/XShm.c
index cddb3db..35f12aa 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -31,13 +31,15 @@ in this Software without prior written authorization from The Open Group.
 
 #define NEED_EVENTS
 #define NEED_REPLIES
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/XShm.h>
 #include <X11/extensions/shmstr.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
-#include "ImUtil.h"
 
 static XExtensionInfo _shm_info_data;
 static XExtensionInfo *shm_info = &_shm_info_data;
diff --git a/src/XSync.c b/src/XSync.c
index ec68f49..61f8600 100644
--- a/src/XSync.c
+++ b/src/XSync.c
@@ -52,6 +52,9 @@ PERFORMANCE OF THIS SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/lib/Xext/XSync.c,v 1.7tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
diff --git a/src/XTestExt1.c b/src/XTestExt1.c
index 5bb3c47..ee4a0bd 100644
--- a/src/XTestExt1.c
+++ b/src/XTestExt1.c
@@ -60,6 +60,9 @@ University of California.
 #define NEED_REPLIES
 #define NEED_EVENTS
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <X11/Xproto.h>
 #include <X11/Xlibint.h>
diff --git a/src/Xcup.c b/src/Xcup.c
index c0ebacb..6315d32 100644
--- a/src/Xcup.c
+++ b/src/Xcup.c
@@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: Xcup.c,v 1.5 2001/02/09 02:03:49 xorgcvs Exp $ */
 
 #ifdef WIN32
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xwindows.h>
 #endif
 
diff --git a/src/Xdbe.c b/src/Xdbe.c
index 039d53c..954c8f0 100644
--- a/src/Xdbe.c
+++ b/src/Xdbe.c
@@ -34,6 +34,9 @@
 
 #define NEED_EVENTS
 #define NEED_REPLIES
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
diff --git a/src/extutil.c b/src/extutil.c
index 2950d57..d96b17f 100644
--- a/src/extutil.c
+++ b/src/extutil.c
@@ -47,6 +47,9 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/lib/Xext/extutil.c,v 1.5 2002/10/16 00:37:27 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/Xext.h>
diff --git a/src/globals.c b/src/globals.c
index b59d3c5..0cd5d26 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -31,6 +31,9 @@ from The Open Group.
 /*
  * This file should contain only those objects which must be predefined.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <X11/Xlib.h>
 #include <X11/extensions/Xext.h>
 #include <stddef.h>			/* for definition of NULL */