19 files changed, 1 insertions, 73 deletions

diff --git a/src/FbTk/FbString.hh b/src/FbTk/FbString.hh
index 4f3e792..750014d 100644
--- a/src/FbTk/FbString.hh
+++ b/src/FbTk/FbString.hh
@@ -25,7 +25,6 @@
 
 #include <string>
 
-#include "config.h"
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif // HAVE_ICONV
diff --git a/src/FbTk/FbTime.hh b/src/FbTk/FbTime.hh
index 3d80b12..42ee912 100644
--- a/src/FbTk/FbTime.hh
+++ b/src/FbTk/FbTime.hh
@@ -22,12 +22,6 @@
 #ifndef FBTK_FBTIME_HH
 #define FBTK_FBTIME_HH
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif // HAVE_INTTYPES_H
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 257447f..4582574 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -28,10 +28,6 @@
 #include "App.hh"
 #include "Transparent.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
diff --git a/src/FbTk/FileUtil.hh b/src/FbTk/FileUtil.hh
index d031a6e..fbc8ceb 100644
--- a/src/FbTk/FileUtil.hh
+++ b/src/FbTk/FileUtil.hh
@@ -22,9 +22,6 @@
 #ifndef FBTK_FILEUTIL_HH
 #define FBTK_FILEUTIL_HH
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
 #ifdef HAVE_CTIME
   #include <ctime>
 #else
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index 544ddc2..5987134 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -25,10 +25,6 @@
 #include "FontImp.hh"
 #include "App.hh"
 
-#ifdef    HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 // for antialias
 #ifdef USE_XFT
 #include "XftFontImp.hh"
diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh
index 6ea2571..8a0f05d 100644
--- a/src/FbTk/Font.hh
+++ b/src/FbTk/Font.hh
@@ -24,10 +24,6 @@
 
 #include <X11/Xlib.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "FbString.hh"
 #include "Color.hh"
 #include "Orientation.hh"
diff --git a/src/FbTk/I18n.hh b/src/FbTk/I18n.hh
index 0413f74..4ff4b77 100644
--- a/src/FbTk/I18n.hh
+++ b/src/FbTk/I18n.hh
@@ -30,11 +30,6 @@
 
 #include "FbString.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif // HAVE_LOCALE_H
diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc
index 1cf94fa..f1bca2c 100644
--- a/src/FbTk/Image.cc
+++ b/src/FbTk/Image.cc
@@ -23,10 +23,6 @@
 #include "StringUtil.hh"
 #include "FileUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XPM
 #include "ImageXPM.hh"
 #endif // HAVE_XPM
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index c99ef9a..8b5f23d 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -35,11 +35,6 @@
 #define _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif // HAVE_SYS_TYPES_H
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index d54eaae..3c34b22 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libFbTk.a
 
-AM_CPPFLAGS=@CPPFLAGS@
+AM_CPPFLAGS=-include $(top_builddir)/config.h
 
 if XFT
 xft_SOURCE= XftFontImp.hh XftFontImp.cc
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 3632fc9..3e3481f 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -29,10 +29,6 @@
 
 #include "Menu.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #include "MenuItem.hh"
 #include "MenuSeparator.hh"
 #include "ImageControl.hh"
diff --git a/src/FbTk/RegExp.hh b/src/FbTk/RegExp.hh
index 47d2cd5..b3106c0 100644
--- a/src/FbTk/RegExp.hh
+++ b/src/FbTk/RegExp.hh
@@ -26,10 +26,6 @@
 
 #include "NotCopyable.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <string>
 
 /*
diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index 32745af..806828f 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -26,10 +26,6 @@
 #include "GContext.hh"
 #include "FbPixmap.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else
diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc
index 774a14d..b1f9a60 100644
--- a/src/FbTk/ThemeItems.cc
+++ b/src/FbTk/ThemeItems.cc
@@ -24,10 +24,6 @@
 #ifndef THEMEITEMS_HH
 #define THEMEITEMS_HH
 
-#ifdef    HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "Theme.hh"
 #include "Color.hh"
 #include "Texture.hh"
diff --git a/src/FbTk/Timer.hh b/src/FbTk/Timer.hh
index b4ce55e..4bdd13a 100644
--- a/src/FbTk/Timer.hh
+++ b/src/FbTk/Timer.hh
@@ -29,10 +29,6 @@
 #include "Command.hh"
 #include "FbTime.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #include <string>
 
 namespace FbTk {
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc
index 04fee67..7db207a 100644
--- a/src/FbTk/Transparent.cc
+++ b/src/FbTk/Transparent.cc
@@ -23,10 +23,6 @@
 #include "App.hh"
 #include "I18n.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XRENDER
 #include <X11/extensions/Xrender.h>
 #endif // HAVE_XRENDER
diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc
index 15c8212..6568457 100644
--- a/src/FbTk/XftFontImp.cc
+++ b/src/FbTk/XftFontImp.cc
@@ -25,10 +25,6 @@
 
 #include <math.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 namespace FbTk {
 
 XftFontImp::XftFontImp(const char *name, bool utf8):
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc
index 34abee9..6370d86 100644
--- a/src/FbTk/XmbFontImp.cc
+++ b/src/FbTk/XmbFontImp.cc
@@ -27,10 +27,6 @@
 #include "FbPixmap.hh"
 #include "GContext.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #ifdef HAVE_SETLOCALE
 #include <locale.h>
 #endif // HAVE_SETLOCALE
diff --git a/src/FbTk/stringstream.hh b/src/FbTk/stringstream.hh
index 54bd6f0..31560c9 100644
--- a/src/FbTk/stringstream.hh
+++ b/src/FbTk/stringstream.hh
@@ -22,10 +22,6 @@
 #ifndef FBTK_STRINGSTREAM_HH
 #define FBTK_STRINGSTREAM_HH
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SSTREAM
 #include <sstream>
 #define FbTk_istringstream std::istringstream