Yes I did it again ;)

added the following 3 lines to everything in the intern dir:
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

Kent
--
mein@cs.umn.edu

17 files changed, 68 insertions, 8 deletions

diff --git a/intern/bmfont/BMF_Api.h b/intern/bmfont/BMF_Api.h
index 001a9788920..608af5e536c 100644
--- a/intern/bmfont/BMF_Api.h
+++ b/intern/bmfont/BMF_Api.h
@@ -43,6 +43,10 @@
 #ifndef __BMF_API_H
 #define __BMF_API_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" { 
 #endif
diff --git a/intern/bmfont/BMF_Fonts.h b/intern/bmfont/BMF_Fonts.h
index bf7c370e47e..3a962bb9058 100644
--- a/intern/bmfont/BMF_Fonts.h
+++ b/intern/bmfont/BMF_Fonts.h
@@ -39,6 +39,10 @@
 #ifndef __BMF_FONTS_H
 #define __BMF_FONTS_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "BMF_Settings.h"
 
 typedef enum
diff --git a/intern/bmfont/BMF_Settings.h b/intern/bmfont/BMF_Settings.h
index 247f9e474fc..b4629511512 100644
--- a/intern/bmfont/BMF_Settings.h
+++ b/intern/bmfont/BMF_Settings.h
@@ -39,6 +39,10 @@
 #ifndef __BMF_SETTINGS_H
 #define __BMF_SETTINGS_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 /* This font is included always */
 #define BMF_INCLUDE_HELV10 1
 
diff --git a/intern/bmfont/intern/BMF_Api.cpp b/intern/bmfont/intern/BMF_Api.cpp
index 08e54f13174..46776b08ba0 100644
--- a/intern/bmfont/intern/BMF_Api.cpp
+++ b/intern/bmfont/intern/BMF_Api.cpp
@@ -37,6 +37,10 @@
  * Implementation of the API of the OpenGL bitmap font library.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "BMF_Api.h"
 
 #include "BMF_BitmapFont.h"
diff --git a/intern/bmfont/intern/BMF_BitmapFont.cpp b/intern/bmfont/intern/BMF_BitmapFont.cpp
index bd3fe0cb899..fbb5d5805af 100644
--- a/intern/bmfont/intern/BMF_BitmapFont.cpp
+++ b/intern/bmfont/intern/BMF_BitmapFont.cpp
@@ -37,6 +37,10 @@
 
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #if defined(WIN32) || defined(__APPLE__)
 	#ifdef WIN32
         #if !defined(__CYGWIN32__)
diff --git a/intern/bmfont/intern/BMF_BitmapFont.h b/intern/bmfont/intern/BMF_BitmapFont.h
index 30cfd650353..2a363166179 100644
--- a/intern/bmfont/intern/BMF_BitmapFont.h
+++ b/intern/bmfont/intern/BMF_BitmapFont.h
@@ -38,6 +38,10 @@
 #ifndef __BMF_BITMAP_FONT_H
 #define __BMF_BITMAP_FONT_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "BMF_FontData.h"
 
 /**
diff --git a/intern/bmfont/intern/BMF_FontData.h b/intern/bmfont/intern/BMF_FontData.h
index 512bdf1a53d..0f4f92318dd 100644
--- a/intern/bmfont/intern/BMF_FontData.h
+++ b/intern/bmfont/intern/BMF_FontData.h
@@ -38,6 +38,10 @@
 #ifndef __BMF_FONTDATA_H__
 #define __BMF_FONTDATA_H__
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 typedef struct {
 	signed char width, height;
 	signed char xorig, yorig;
diff --git a/intern/bmfont/intern/BMF_font_helv10.cpp b/intern/bmfont/intern/BMF_font_helv10.cpp
index b69796948c3..636ac78c5d6 100644
--- a/intern/bmfont/intern/BMF_font_helv10.cpp
+++ b/intern/bmfont/intern/BMF_font_helv10.cpp
@@ -29,6 +29,10 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "BMF_FontData.h"
 
 #include "BMF_Settings.h"
diff --git a/intern/bmfont/intern/BMF_font_helv12.cpp b/intern/bmfont/intern/BMF_font_helv12.cpp
index 45ab6531cdb..813d22475eb 100644
--- a/intern/bmfont/intern/BMF_font_helv12.cpp
+++ b/intern/bmfont/intern/BMF_font_helv12.cpp
@@ -29,8 +29,11 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#include "BMF_FontData.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include "BMF_FontData.h"
 #include "BMF_Settings.h"
 
 #if BMF_INCLUDE_HELV12
diff --git a/intern/bmfont/intern/BMF_font_helvb10.cpp b/intern/bmfont/intern/BMF_font_helvb10.cpp
index 4707abfeda2..66583767ffb 100644
--- a/intern/bmfont/intern/BMF_font_helvb10.cpp
+++ b/intern/bmfont/intern/BMF_font_helvb10.cpp
@@ -29,8 +29,11 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#include "BMF_FontData.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include "BMF_FontData.h"
 #include "BMF_Settings.h"
 
 #if BMF_INCLUDE_HELVB10
diff --git a/intern/bmfont/intern/BMF_font_helvb12.cpp b/intern/bmfont/intern/BMF_font_helvb12.cpp
index 7ae4f3b4dd5..69230d48ae8 100644
--- a/intern/bmfont/intern/BMF_font_helvb12.cpp
+++ b/intern/bmfont/intern/BMF_font_helvb12.cpp
@@ -29,8 +29,11 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#include "BMF_FontData.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include "BMF_FontData.h"
 #include "BMF_Settings.h"
 
 #if BMF_INCLUDE_HELVB12
diff --git a/intern/bmfont/intern/BMF_font_helvb14.cpp b/intern/bmfont/intern/BMF_font_helvb14.cpp
index d77697e74a8..e793295f295 100644
--- a/intern/bmfont/intern/BMF_font_helvb14.cpp
+++ b/intern/bmfont/intern/BMF_font_helvb14.cpp
@@ -29,8 +29,11 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#include "BMF_FontData.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include "BMF_FontData.h"
 #include "BMF_Settings.h"
 
 #if BMF_INCLUDE_HELVB14
diff --git a/intern/bmfont/intern/BMF_font_helvb8.cpp b/intern/bmfont/intern/BMF_font_helvb8.cpp
index 0dfefbeda95..79651b06519 100644
--- a/intern/bmfont/intern/BMF_font_helvb8.cpp
+++ b/intern/bmfont/intern/BMF_font_helvb8.cpp
@@ -29,8 +29,11 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#include "BMF_FontData.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include "BMF_FontData.h"
 #include "BMF_Settings.h"
 
 #if BMF_INCLUDE_HELVB8
diff --git a/intern/bmfont/intern/BMF_font_scr12.cpp b/intern/bmfont/intern/BMF_font_scr12.cpp
index a870ea91763..bcdb87fcc0b 100644
--- a/intern/bmfont/intern/BMF_font_scr12.cpp
+++ b/intern/bmfont/intern/BMF_font_scr12.cpp
@@ -29,8 +29,11 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#include "BMF_FontData.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include "BMF_FontData.h"
 #include "BMF_Settings.h"
 
 #if BMF_INCLUDE_SCR12
diff --git a/intern/bmfont/intern/BMF_font_scr14.cpp b/intern/bmfont/intern/BMF_font_scr14.cpp
index c060556c7e0..6a3ee9dd710 100644
--- a/intern/bmfont/intern/BMF_font_scr14.cpp
+++ b/intern/bmfont/intern/BMF_font_scr14.cpp
@@ -29,8 +29,11 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#include "BMF_FontData.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include "BMF_FontData.h"
 #include "BMF_Settings.h"
 
 #if BMF_INCLUDE_SCR14
diff --git a/intern/bmfont/intern/BMF_font_scr15.cpp b/intern/bmfont/intern/BMF_font_scr15.cpp
index 708420410c6..919db333e65 100644
--- a/intern/bmfont/intern/BMF_font_scr15.cpp
+++ b/intern/bmfont/intern/BMF_font_scr15.cpp
@@ -29,8 +29,11 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#include "BMF_FontData.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include "BMF_FontData.h"
 #include "BMF_Settings.h"
 
 #if BMF_INCLUDE_SCR15
diff --git a/intern/bmfont/test/BMF_Test.cpp b/intern/bmfont/test/BMF_Test.cpp
index 37d2f45d164..8dbd4b3ce75 100644
--- a/intern/bmfont/test/BMF_Test.cpp
+++ b/intern/bmfont/test/BMF_Test.cpp
@@ -40,6 +40,10 @@
 
 #include <iostream>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #if defined(WIN32) || defined(__APPLE__)
 #ifdef WIN32
 #include <windows.h>