Moved config.h.in away to defs.h.in, need to rely on autoheader to generate it.

refs #296

9 files changed, 8 insertions, 2 deletions

diff --git a/autogen.sh b/autogen.sh
index 381fc8df..a9444153 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,6 @@
 
 libtoolize --copy --force
 aclocal
-# autoheader 
+autoheader 
 automake --foreign --add-missing 
 autoconf
diff --git a/colm/colm.h b/colm/colm.h
index 069862cc..69aa5740 100644
--- a/colm/colm.h
+++ b/colm/colm.h
@@ -29,6 +29,7 @@
 #include <string>
 
 #include "config.h"
+#include "defs.h"
 #include "avltree.h"
 #include "keyops.h"
 
diff --git a/colm/config.h.in b/colm/defs.h.in
index 06a3f9df..06a3f9df 100644
--- a/colm/config.h.in
+++ b/colm/defs.h.in
diff --git a/colm/fsmap.cc b/colm/fsmap.cc
index 33c9e12e..521a0338 100644
--- a/colm/fsmap.cc
+++ b/colm/fsmap.cc
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "defs.h"
 #include "fsmgraph.h"
 #include <iostream>
 
diff --git a/colm/fsmcodegen.cc b/colm/fsmcodegen.cc
index 6d6bd2f6..59f35ce0 100644
--- a/colm/fsmcodegen.cc
+++ b/colm/fsmcodegen.cc
@@ -1053,6 +1053,7 @@ void FsmCodeGen::writeCode()
 		"#include <string.h>\n"
 		"#include <assert.h>\n"
 		"#include <colm/config.h>\n"
+		"#include <colm/defs.h>\n"
 		"#include <colm/input.h>\n"
 		"#include <colm/tree.h>\n"
 		"\n"
diff --git a/colm/fsmexec.cc b/colm/fsmexec.cc
index e7f776f9..d6c28f2f 100644
--- a/colm/fsmexec.cc
+++ b/colm/fsmexec.cc
@@ -23,6 +23,7 @@
 #include <iostream>
 
 #include "config.h"
+#include "defs.h"
 #include "fsmrun.h"
 #include "redfsm.h"
 #include "parsedata.h"
diff --git a/colm/fsmgraph.cc b/colm/fsmgraph.cc
index 7dedda04..1017fd51 100644
--- a/colm/fsmgraph.cc
+++ b/colm/fsmgraph.cc
@@ -23,6 +23,7 @@
 #include <iostream>
 
 #include "config.h"
+#include "defs.h"
 #include "fsmgraph.h"
 #include "mergesort.h"
 
diff --git a/colm/pdarun.h b/colm/pdarun.h
index 99b34627..211402bf 100644
--- a/colm/pdarun.h
+++ b/colm/pdarun.h
@@ -25,6 +25,7 @@
 #include "input.h"
 #include "fsmrun.h"
 #include "config.h"
+#include "defs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/configure.in b/configure.in
index 92e7ee7d..a24c8568 100644
--- a/configure.in
+++ b/configure.in
@@ -24,7 +24,7 @@ PUBDATE="May 2011"
 AM_INIT_AUTOMAKE([foreign])
 
 AC_SUBST(PUBDATE)
-AC_CONFIG_HEADER(colm/config.h)
+AC_CONFIG_HEADER([colm/config.h colm/defs.h])
 
 dnl Choose defaults for the build_parsers and build_manual vars. If the dist
 dnl file is present in the root then default to no, otherwise go for it.