From 49582077a194fdb72bf867f5b57331ed35182daa Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Wed, 29 Aug 2001 23:51:51 +0000
Subject: [PATCH] make CONFIG_CONFIG=:configdbg=1 work

---
 dtool/src/dconfig/configTable.I | 15 ++++-----------
 dtool/src/dconfig/configTable.h |  1 +
 dtool/src/dconfig/dconfig.h     |  8 +++++---
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/dtool/src/dconfig/configTable.I b/dtool/src/dconfig/configTable.I
index cc0ce55c81..c812f360c2 100644
--- a/dtool/src/dconfig/configTable.I
+++ b/dtool/src/dconfig/configTable.I
@@ -18,22 +18,15 @@
 
 
 INLINE void ConfigTable::ConfigDbgDefault(void) {
-/*
 #ifdef NDEBUG
-*/
-
   configdbg = false;
   microconfig_cat->set_severity(NS_info);
   dconfig_cat->set_severity(NS_info);
-
-/*
-#else * NDEBUG *
-
+#else
   configdbg = true;
-  microconfig_cat->set_severity(NS_debug);
-  config_cat->set_severity(NS_debug);
-#endif * NDEBUG *
-*/
+  microconfig_cat->set_severity(NS_spam);
+  dconfig_cat->set_severity(NS_spam);
+#endif 
 }
 
 INLINE void ConfigTable::ReadArgsDefault(void) {
diff --git a/dtool/src/dconfig/configTable.h b/dtool/src/dconfig/configTable.h
index 5e1c98ace9..dfdea426ea 100644
--- a/dtool/src/dconfig/configTable.h
+++ b/dtool/src/dconfig/configTable.h
@@ -87,6 +87,7 @@ class EXPCL_DTOOLCONFIG ConfigTable {
       const Symbol& GetSym(const ConfigString& sym,
                            const ConfigString qual = "");
       INLINE ConfigString GetConfigPath(void) const;
+      INLINE bool IsConfigDbg(void) { return configdbg; };
 };
 
 #include "configTable.I"
diff --git a/dtool/src/dconfig/dconfig.h b/dtool/src/dconfig/dconfig.h
index fc2bbec8b1..1114ea5dc2 100644
--- a/dtool/src/dconfig/dconfig.h
+++ b/dtool/src/dconfig/dconfig.h
@@ -128,7 +128,7 @@ void Config<GetConfig>::Init(void)
       return;
    total_time_config_init -= clock();
    Flag(true);
-   ConfigTable::Instance();
+   ConfigTable* tab = ConfigTable::Instance();
 
    if (Defined("notify-level-config")) {
       ConfigString s = Get("notify-level-config");
@@ -141,8 +141,10 @@ void Config<GetConfig>::Init(void)
          dconfig_cat->set_severity(NS_info);
       }
    } else {
-      microconfig_cat->set_severity(NS_info);
-      dconfig_cat->set_severity(NS_info);
+      if(!tab->IsConfigDbg()) {
+          microconfig_cat->set_severity(NS_info);
+          dconfig_cat->set_severity(NS_info);
+      }
    }
 
    total_time_config_init += clock();