Release-1.2.4-20010128

1 files changed, 23 insertions, 27 deletions

diff --git a/src/config.l b/src/config.l
index 1bbd0c1..77cff87 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1,4 +1,4 @@
-/* This file was generated by configgen on Sun Jan 14 14:24:47 2001
+/* This file was generated by configgen on Sat Jan 27 18:27:33 2001
  * from config_templ.l
  *
  * DO NOT EDIT!
@@ -107,6 +107,7 @@ QStrList Config::sectionFilterList;
 bool     Config::generateTodoList = TRUE;
 bool     Config::generateTestList = TRUE;
 QStrList Config::aliasList;
+bool     Config::optimizeForCFlag = FALSE;
 bool     Config::quietFlag = FALSE;
 bool     Config::warningFlag = TRUE;
 bool     Config::warningUndocFlag = TRUE;
@@ -153,7 +154,6 @@ QCString Config::rtfStylesheetFile;
 bool     Config::generateMan = TRUE;
 QCString Config::manOutputDir = "man";
 QCString Config::manExtension = ".3";
-bool     Config::generateXML = FALSE;
 bool     Config::preprocessingFlag = TRUE;
 bool     Config::macroExpansionFlag = FALSE;
 bool     Config::onlyPredefinedFlag = FALSE;
@@ -379,6 +379,7 @@ static void readIncludeFile(const char *incName)
 <Start>"GENERATE_TESTLIST"[ \t]*"="      { BEGIN(GetBool); b=&Config::generateTestList; }
 <Start>"ALIASES"[ \t]*"="                { BEGIN(GetStrList); l=&Config::aliasList; l->clear(); elemStr=""; }
 <Start>"ALIASES"[ \t]*"+="               { BEGIN(GetStrList); l=&Config::aliasList; elemStr=""; }
+<Start>"OPTIMIZE_OUTPUT_FOR_C"[ \t]*"="  { BEGIN(GetBool); b=&Config::optimizeForCFlag; }
 <Start>"QUIET"[ \t]*"="                  { BEGIN(GetBool); b=&Config::quietFlag; }
 <Start>"WARNINGS"[ \t]*"="               { BEGIN(GetBool); b=&Config::warningFlag; }
 <Start>"WARN_IF_UNDOCUMENTED"[ \t]*"="   { BEGIN(GetBool); b=&Config::warningUndocFlag; }
@@ -434,7 +435,6 @@ static void readIncludeFile(const char *incName)
 <Start>"GENERATE_MAN"[ \t]*"="           { BEGIN(GetBool); b=&Config::generateMan; }
 <Start>"MAN_OUTPUT"[ \t]*"="             { BEGIN(GetString); s=&Config::manOutputDir; s->resize(0); }
 <Start>"MAN_EXTENSION"[ \t]*"="          { BEGIN(GetString); s=&Config::manExtension; s->resize(0); }
-<Start>"GENERATE_XML"[ \t]*"="           { BEGIN(GetBool); b=&Config::generateXML; }
 <Start>"ENABLE_PREPROCESSING"[ \t]*"="   { BEGIN(GetBool); b=&Config::preprocessingFlag; }
 <Start>"MACRO_EXPANSION"[ \t]*"="        { BEGIN(GetBool); b=&Config::macroExpansionFlag; }
 <Start>"EXPAND_ONLY_PREDEF"[ \t]*"="     { BEGIN(GetBool); b=&Config::onlyPredefinedFlag; }
@@ -628,6 +628,7 @@ void dumpConfig()
       is=Config::aliasList.next();
     }
   }
+  printf("optimizeForCFlag=`%d'\n",Config::optimizeForCFlag);
   printf("# configuration options related to warning and progress messages\n");
   printf("quietFlag=`%d'\n",Config::quietFlag);
   printf("warningFlag=`%d'\n",Config::warningFlag);
@@ -744,8 +745,6 @@ void dumpConfig()
   printf("generateMan=`%d'\n",Config::generateMan);
   printf("manOutputDir=`%s'\n",Config::manOutputDir.data());
   printf("manExtension=`%s'\n",Config::manExtension.data());
-  printf("# configuration options related to the XML output\n");
-  printf("generateXML=`%d'\n",Config::generateXML);
   printf("# Configuration options related to the preprocessor   \n");
   printf("preprocessingFlag=`%d'\n",Config::preprocessingFlag);
   printf("macroExpansionFlag=`%d'\n",Config::macroExpansionFlag);
@@ -858,6 +857,7 @@ void Config::init()
   Config::generateTodoList = TRUE;
   Config::generateTestList = TRUE;
   Config::aliasList.clear();
+  Config::optimizeForCFlag = FALSE;
   Config::quietFlag = FALSE;
   Config::warningFlag = TRUE;
   Config::warningUndocFlag = TRUE;
@@ -904,7 +904,6 @@ void Config::init()
   Config::generateMan = TRUE;
   Config::manOutputDir = "man";
   Config::manExtension = ".3";
-  Config::generateXML = FALSE;
   Config::preprocessingFlag = TRUE;
   Config::macroExpansionFlag = FALSE;
   Config::onlyPredefinedFlag = FALSE;
@@ -1385,6 +1384,18 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
+    t << "# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources \n";
+    t << "# only. Doxygen will then generate output that is more tailored for C. \n";
+    t << "# For instance some of the names that are used will be different. The list \n";
+    t << "# of all members will be omitted, etc. \n";
+    t << "\n";
+  }
+  t << "OPTIMIZE_OUTPUT_FOR_C  = ";
+  writeBoolValue(t,Config::optimizeForCFlag);
+  t << "\n";
+  if (!sl)
+  {
+    t << "\n";
   }
   t << "#---------------------------------------------------------------------------\n";
   t << "# configuration options related to warning and progress messages\n";
@@ -1717,7 +1728,7 @@ void writeTemplateConfig(QFile *f,bool sl)
   if (!sl)
   {
     t << "\n";
-    t << "# If the GENERATE_TREEVIEW tag is set to YES, a side pannel will be\n";
+    t << "# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be\n";
     t << "# generated containing a tree-like index structure (just like the one that \n";
     t << "# is generated for HTML Help). For this to work a browser that supports \n";
     t << "# JavaScript and frames is required (for instance Netscape 4.0+ \n";
@@ -1953,25 +1964,6 @@ void writeTemplateConfig(QFile *f,bool sl)
     t << "\n";
   }
   t << "#---------------------------------------------------------------------------\n";
-  t << "# configuration options related to the XML output\n";
-  t << "#---------------------------------------------------------------------------\n";
-  if (!sl)
-  {
-    t << "\n";
-    t << "# If the GENERATE_XML tag is set to YES Doxygen will \n";
-    t << "# generate an XML file that captures the structure of \n";
-    t << "# the code including all documentation. Warning: This feature \n";
-    t << "# is still experimental and very incomplete.\n";
-    t << "\n";
-  }
-  t << "GENERATE_XML           = ";
-  writeBoolValue(t,Config::generateXML);
-  t << "\n";
-  if (!sl)
-  {
-    t << "\n";
-  }
-  t << "#---------------------------------------------------------------------------\n";
   t << "# Configuration options related to the preprocessor   \n";
   t << "#---------------------------------------------------------------------------\n";
   if (!sl)
@@ -2912,9 +2904,13 @@ void checkConfig()
     }
   }
 
+#undef PUTENV
 #if defined(_WIN32)
-  if (Config::haveDotFlag) _putenv("DOTFONTPATH=.");
+#define PUTENV _putenv
+#else
+#define PUTENV putenv
 #endif
+  if (Config::haveDotFlag) PUTENV("DOTFONTPATH=.");
   
 }