diff --git a/compiler.h b/compiler.h
index ec62aff60..6e6ce1ebc 100644
--- a/compiler.h
+++ b/compiler.h
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: compiler.h,v 1.24 2004/09/10 23:51:42 steve Exp $"
+#ident "$Id: compiler.h,v 1.25 2004/09/25 01:58:44 steve Exp $"
 #endif
 
 # include  <list>
@@ -83,6 +83,7 @@ extern bool verbose_flag;
 
 extern bool debug_scopes;
 extern bool debug_eval_tree;
+extern bool debug_elaborate;
 
 /* Path to a directory useful for finding subcomponents. */
 extern const char*basedir;
@@ -135,6 +136,9 @@ extern int load_sys_func_table(const char*path);
 
 /*
  * $Log: compiler.h,v $
+ * Revision 1.25  2004/09/25 01:58:44  steve
+ *  Add a debug_elaborate flag
+ *
  * Revision 1.24  2004/09/10 23:51:42  steve
  *  Fix the evaluation of constant ternary expressions.
  *
diff --git a/main.cc b/main.cc
index 191fe115f..d2309d2ef 100644
--- a/main.cc
+++ b/main.cc
@@ -19,7 +19,7 @@ const char COPYRIGHT[] =
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: main.cc,v 1.84 2004/09/10 23:51:42 steve Exp $"
+#ident "$Id: main.cc,v 1.85 2004/09/25 01:58:44 steve Exp $"
 #endif
 
 # include "config.h"
@@ -111,6 +111,7 @@ bool error_implicit = false;
  */
 bool debug_scopes = false;
 bool debug_eval_tree = false;
+bool debug_elaborate = false;
 /*
  * Verbose messages enabled.
  */
@@ -310,6 +311,9 @@ static void read_iconfig_file(const char*ipath)
 		  } else if (strcmp(cp,"eval_tree") == 0) {
 			debug_eval_tree = true;
 			cerr << "debug: Enable eval_tree debug" << endl;
+		  } else if (strcmp(cp,"elaborate") == 0) {
+			debug_elaborate = true;
+			cerr << "debug: Enable elaborate debug" << endl;
 		  } else {
 		  }
 
@@ -740,6 +744,9 @@ int main(int argc, char*argv[])
 
 /*
  * $Log: main.cc,v $
+ * Revision 1.85  2004/09/25 01:58:44  steve
+ *  Add a debug_elaborate flag
+ *
  * Revision 1.84  2004/09/10 23:51:42  steve
  *  Fix the evaluation of constant ternary expressions.
  *