From ccaf3f5e08df49370a06efa9731e166de681a371 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Wed, 14 Dec 2011 19:41:07 +0000
Subject: [PATCH] Move config.h out of the main directory

---
 Cantera/clib/src/ct.h                             |  2 +-
 Cantera/clib/src/ctonedim.h                       |  2 +-
 Cantera/clib/src/ctsurf.h                         |  2 +-
 Cantera/clib/src/ctxml.h                          |  2 +-
 Cantera/python/src/pycantera.cpp                  |  2 +-
 config.h.in.scons => Cantera/src/base/config.h.in |  0
 SConstruct                                        | 12 ++++++------
 tools/testtools/csvdiff.cpp                       |  2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename config.h.in.scons => Cantera/src/base/config.h.in (100%)
 mode change 100755 => 100644

diff --git a/Cantera/clib/src/ct.h b/Cantera/clib/src/ct.h
index bb608f809..8f543f7e5 100755
--- a/Cantera/clib/src/ct.h
+++ b/Cantera/clib/src/ct.h
@@ -13,7 +13,7 @@
 #ifdef CANTERA_USE_INTERNAL
 #include "config.h"
 #else
-#include "cantera/config.h"
+#include "cantera/kernel/config.h"
 #endif
 
 
diff --git a/Cantera/clib/src/ctonedim.h b/Cantera/clib/src/ctonedim.h
index 8bf95e442..6d374de5f 100644
--- a/Cantera/clib/src/ctonedim.h
+++ b/Cantera/clib/src/ctonedim.h
@@ -13,7 +13,7 @@
 #ifdef CANTERA_USE_INTERNAL
 #include "config.h"
 #else
-#include "cantera/config.h"
+#include "cantera/kernel/config.h"
 #endif
 
 extern "C" {
diff --git a/Cantera/clib/src/ctsurf.h b/Cantera/clib/src/ctsurf.h
index 610422696..a995304ea 100755
--- a/Cantera/clib/src/ctsurf.h
+++ b/Cantera/clib/src/ctsurf.h
@@ -14,7 +14,7 @@
 #ifdef CANTERA_USE_INTERNAL
 #include "config.h"
 #else
-#include "cantera/config.h"
+#include "cantera/kernel/config.h"
 #endif
 
 extern "C" {
diff --git a/Cantera/clib/src/ctxml.h b/Cantera/clib/src/ctxml.h
index 7629c8465..a03961eb0 100644
--- a/Cantera/clib/src/ctxml.h
+++ b/Cantera/clib/src/ctxml.h
@@ -13,7 +13,7 @@
 #ifdef CANTERA_USE_INTERNAL
 #include "config.h"
 #else
-#include "cantera/config.h"
+#include "cantera/kernel/config.h"
 #endif
 
 extern "C" {  
diff --git a/Cantera/python/src/pycantera.cpp b/Cantera/python/src/pycantera.cpp
index c33c44707..34cb561cf 100644
--- a/Cantera/python/src/pycantera.cpp
+++ b/Cantera/python/src/pycantera.cpp
@@ -11,7 +11,7 @@
 #pragma warning(disable:4503)
 #endif
 
-#include "cantera/config.h"
+#include "cantera/kernel/config.h"
 
 #include "Python.h"
 
diff --git a/config.h.in.scons b/Cantera/src/base/config.h.in
old mode 100755
new mode 100644
similarity index 100%
rename from config.h.in.scons
rename to Cantera/src/base/config.h.in
diff --git a/SConstruct b/SConstruct
index a94e8c667..dd0a2685b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -668,7 +668,9 @@ if not env['HAS_MATH_H_ERF']:
 else:
     configh['USE_BOOST_MATH'] = None
 
-config_h = env.Command('config.h', 'config.h.in.scons', ConfigBuilder(configh))
+config_h = env.Command('build/include/cantera/kernel/config.h',
+                       'Cantera/src/base/config.h.in',
+                       ConfigBuilder(configh))
 env.AlwaysBuild(config_h)
 
 # *********************
@@ -682,8 +684,7 @@ demoTargets = []
 
 env.SConsignFile()
 
-env.Append(CPPPATH=[Dir(os.getcwd()),
-                    Dir('build/include/cantera/kernel'),
+env.Append(CPPPATH=[Dir('build/include/cantera/kernel'),
                     Dir('build/include/cantera'),
                     Dir('build/include')],
            LIBPATH=[Dir('build/lib')],
@@ -725,9 +726,8 @@ else:
 
 env['cantera_libs'] = linkLibs
 
-configh = env.Command('build/include/cantera/config.h', 'config.h', Copy('$TARGET', '$SOURCE'))
-inst = env.Install('$ct_incdir', configh)
-installTargets.extend(inst)
+#inst = env.Install('$ct_incdir/kernel', 'build/include/cantera/kernel/config.h')
+#installTargets.extend(inst)
 
 # Add targets from the SConscript files in the various subdirectories
 Export('env', 'buildDir', 'buildTargets', 'installTargets', 'demoTargets')
diff --git a/tools/testtools/csvdiff.cpp b/tools/testtools/csvdiff.cpp
index 3ea8e1183..ba6c057dd 100644
--- a/tools/testtools/csvdiff.cpp
+++ b/tools/testtools/csvdiff.cpp
@@ -36,7 +36,7 @@
 #include <math.h>
 #include <float.h>
 #include <limits.h>
-#include "../../config.h"
+#include "kernel/config.h"
 #ifndef WINMSVC
 #include <unistd.h>
 #else