remove obsolete config include branches

dune/stuff/CMakeLists.txt

@@ -8,7 +8,7 @@ dune_add_library("dunestuff"  common/filesystem.cc
   common/signals.cc
   common/math.cc
   fem/femeoc.cc
-  function/expression/mathexpr.cc
+  functions/expression/mathexpr.cc
   ADD_LIBS ${DUNE_LIBS})
 target_link_dune_default_libraries(dunestuff)
 

dune/stuff/common/math.hh

 #ifndef DUNE_STUFF_COMMON_MATH_HH
 #define DUNE_STUFF_COMMON_MATH_HH
 
-#ifdef HAVE_CMAKE_CONFIG
-#include "cmake_config.h"
-#else
-#include "config.h"
-#endif // ifdef HAVE_CMAKE_CONFIG
-
+#include <config.h>
 #include <vector>
 #include <limits>
 #include <algorithm>

dune/stuff/common/misc.hh

@@ -9,11 +9,7 @@
 #include <map>
 #include <assert.h>
 #include <algorithm>
-#ifdef HAVE_CMAKE_CONFIG
-#include "cmake_config.h"
-#else
-#include "config.h"
-#endif // ifdef HAVE_CMAKE_CONFIG
+#include <config.h>
 #include <dune/common/version.hh>
 #include <dune/common/array.hh>
 #include <dune/common/static_assert.hh>

dune/stuff/common/parameter/configcontainer.hh

 #ifndef DUNE_STUFF_CONFIGCONTAINER_HH_INCLUDED
 #define DUNE_STUFF_CONFIGCONTAINER_HH_INCLUDED
 
-#ifdef HAVE_CMAKE_CONFIG
-#include "cmake_config.h"
-#elif defined(HAVE_CONFIG_H)
 #include <config.h>
-#endif // ifdef HAVE_CMAKE_CONFIG
 
 #include <dune/common/deprecated.hh>
 #include <dune/common/parametertree.hh>

dune/stuff/common/string.hh

@@ -5,11 +5,7 @@
 #ifndef DUNE_STUFF_COMMON_STRING_HH
 #define DUNE_STUFF_COMMON_STRING_HH
 
-#ifdef HAVE_CMAKE_CONFIG
-#include "cmake_config.h"
-#else
-#include "config.h"
-#endif // ifdef HAVE_CMAKE_CONFIG
+#include <config.h>
 
 #include <cstring>
 #include <ctime>