strip out vestigial #ifdef HAVE_CONFIG_H stanzas, they're confusing the

modular X build

diff --git a/src/mesa/drivers/x11/glxheader.h b/src/mesa/drivers/x11/glxheader.h
index 42637f4c14d5e886882cb8c60cc06a52e97615b3..2533d504443eb15645089fd902b4871beec0dfd9 100644 (file)
--- a/src/mesa/drivers/x11/glxheader.h
+++ b/src/mesa/drivers/x11/glxheader.h
@@ -31,14 +31,8 @@
 #include <GL/vms_x_fix.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
-
 #include "glheader.h"
 
-
 #ifdef XFree86Server
 
 # include "resource.h"

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 719c68e30008de189fac6afbe29c10372254801d..de2bae9cb0d618c208d8eec87ef23f0eaa57697b 100644 (file)
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -31,11 +31,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
-
 /**
  * \name OpenGL implementation limits
  */

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index d1acd9ef81f36bfc86d45f8dd3227a063e9779ce..ee34076fb747515b96fb64a4c94a7d443d1c4b3a 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -70,11 +70,6 @@
 #include <stdarg.h>
 
 
-/* This is no longer uses since we dumped autoconf/automake! */
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
 /* Get typedefs for uintptr_t and friends */
 #if defined(_WIN32)
 #include <BaseTsd.h>

diff --git a/src/mesa/x86/common_x86_asm.h b/src/mesa/x86/common_x86_asm.h
index a913bb1d0940105e2018b8843d3c496187bf0659..99772983289105c87832d421b890b569e5c23234 100644 (file)
--- a/src/mesa/x86/common_x86_asm.h
+++ b/src/mesa/x86/common_x86_asm.h
@@ -1,4 +1,4 @@
-/* $Id: common_x86_asm.h,v 1.11 2004/04/26 10:10:25 alanh Exp $ */
+/* $Id: common_x86_asm.h,v 1.12 2005/07/16 00:56:20 ajax Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -43,10 +43,6 @@
  */
 #include "common_x86_features.h"
 
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
 #ifdef USE_X86_ASM
 #include "x86.h"
 #ifdef USE_3DNOW_ASM