Index: configure
===================================================================
RCS file: /cvsroot/crossfire/crossfire/configure,v
retrieving revision 1.67
diff -u -r1.67 configure
--- configure	30 Jun 2006 05:46:51 -0000	1.67
+++ configure	11 Jul 2006 20:51:10 -0000
@@ -27118,6 +27118,7 @@
     ac_save_LIBS="$LIBS"
 
     LIBS=""$X11LIBS" $LIBS"
+    OCFLAGS=$CFLAGS
     CFLAGS="-Iinclude -Icrossedit/include"
     echo "$as_me:$LINENO: checking for crossedit required headers" >&5
 echo $ECHO_N "checking for crossedit required headers... $ECHO_C" >&6
@@ -27132,7 +27133,7 @@
 #include <Xaw.h>
 #include <Ansi.h>
 #include <config.h>
-#include <includes.h>
+/*#include <includes.h>*/
 #include <debug.h>
 #include <assert.h>
 
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/crossfire/crossfire/acinclude.m4,v
retrieving revision 1.12
retrieving revision 1.15
diff -u -r1.12 -r1.15
--- acinclude.m4	30 Jun 2006 05:46:51 -0000	1.12
+++ acinclude.m4	11 Jul 2006 20:19:14 -0000	1.15
@@ -290,6 +290,7 @@
     ac_save_LIBS="$LIBS"
 
     LIBS="$1 $LIBS" 
+    OCFLAGS=$CFLAGS
     CFLAGS="-Iinclude -Icrossedit/include"
     AC_MSG_CHECKING(for crossedit required headers)
     AC_TRY_LINK([
@@ -297,7 +298,7 @@
 #include <Xaw.h>
 #include <Ansi.h>
 #include <config.h>
-#include <includes.h>
+/*include <includes.h>*/
 #include <debug.h>
 #include <assert.h>