Quit using "-include config.h": use #ifdef HAVE_CONFIG_H etc. like everyone else.

diff --git a/src/Makefile.am b/src/Makefile.am
index ea34a2c..af0ddec 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,7 @@ COREPROTO   = $(CORESOURCES) $(COREHEADERS)
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
 
 CFLAGS =
-AM_CFLAGS = -include config.h $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS)
+AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS)
 libXCB_la_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS)
 libXCB_la_SOURCES = \
                xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \

diff --git a/src/xcbint.h b/src/xcbint.h
index ebbb2fe..1d7b873 100644 (file)
--- a/src/xcbint.h
+++ b/src/xcbint.h
@@ -28,6 +28,10 @@
 #ifndef __XCBINT_H
 #define __XCBINT_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 enum workarounds {
     WORKAROUND_NONE,
     WORKAROUND_GLX_GET_FB_CONFIGS_BUG