Turns out the whole config-kmail.h is no longer needed.

svn path=/branches/work/akonadi-ports/kdepim/; revision=1075838

CMakeLists.txt

@@ -1,11 +1,6 @@
 project(kmail)
 
 include(CheckIncludeFiles)
-check_include_files(fcntl.h HAVE_FCNTL_H)
-check_include_files(byteswap.h HAVE_BYTESWAP_H)
-check_include_files(paths.h HAVE_PATHS_H)
-check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
-macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${KDE4_DATA_DIR}/cmake/modules)
 
@@ -34,7 +29,6 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
   endif (KdeSubversion_FOUND)
 endif (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
 
-configure_file(config-kmail.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmail.h)
 configure_file(version-kmail.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version-kmail.h)
 
 qt4_generate_dbus_interface(kmkernel.h org.kde.kmail.kmail.xml OPTIONS -a)

config-kmail.h.cmake

@@ -1,10 +0,0 @@
-/* Define to 1 if you have the <byteswap.h> header file. */
-#cmakedefine HAVE_BYTESWAP_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#cmakedefine HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the <paths.h> header file. */
-#cmakedefine HAVE_PATHS_H 1
-
-#cmakedefine HAVE_SYS_INOTIFY_H 1

configuredialog.cpp

@@ -27,8 +27,6 @@
 #include "configuredialog_p.h"
 #include "ui_accountspagereceivingtab.h"
 
-#include <config-kmail.h>
-
 #include "globalsettings.h"
 #include "templatesconfiguration_kfg.h"
 #include "configuredialoglistview.h"

kmcommands.cpp

@@ -41,7 +41,6 @@
 // of messages from an IMAP server.
 
 #include "kmcommands.h"
-#include "config-kmail.h"
 
 #include <unistd.h> // link()
 #include <errno.h>

kmfilteraction.cpp

@@ -1,7 +1,6 @@
 // kmfilteraction.cpp
 
 #include "kmfilteraction.h"
-#include "config-kmail.h"
 
 // other KMail headers:
 #include "customtemplates.h"

kmkernel.cpp

@@ -2,8 +2,6 @@
 
 #include "kmkernel.h"
 
-#include <config-kmail.h>
-
 #include "globalsettings.h"
 #include "broadcaststatus.h"
 using KPIM::BroadcastStatus;

kmmainwidget.cpp

@@ -21,7 +21,6 @@
 
 //#define TEST_DOCKWIDGETS 1
 
-#include <config-kmail.h>
 #include <assert.h>
 #include <QByteArray>
 #include <QLabel>

kmreaderwin.cpp

@@ -22,8 +22,6 @@
 // filehtmlwriter.out in the current working directory
 #include "kmreaderwin.h"
 
-#include <config-kmail.h>
-
 #include "globalsettings.h"
 #include "kmversion.h"
 #include "kmmainwidget.h"
@@ -72,7 +70,6 @@ using namespace MessageViewer;
 // for the click on attachment stuff (dnaber):
 #include <kcharsets.h>
 #include <kmenu.h>
-#include <kstandarddirs.h>  // Sven's : for access and getpid
 #include <kdebug.h>
 #include <kfiledialog.h>
 #include <klocale.h>
@@ -112,12 +109,6 @@ using namespace MessageViewer;
 #include <ctype.h>
 #include <string.h>
 
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#include <kvbox.h>
-#include <QTextDocument>
-#endif
-
 using namespace KMail;
 
 //-----------------------------------------------------------------------------