Consistency in handling HTML and LaTeX in respect to header and footer

There was a discrepancy in the handling of the header and footer files between HTML and LaTeX.
Also the wrong error / warning routine was called and the config_err and config_warn have been made more consistent with the messages(.cpp)

1 files changed, 5 insertions, 2 deletions

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index e127b8e..2a28744 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10323,16 +10323,19 @@ void readConfiguration(int argc, char **argv)
         }
         else if (qstricmp(formatName,"latex")==0)
         {
-          if (optind+4<argc) // use config file to get settings
+          if (optind+4<argc || QFileInfo("Doxyfile").exists())
           {
-            if (!Config::instance()->parse(argv[optind+4]))
+            QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile");
+            if (!Config::instance()->parse(df))
             {
               err("error opening or reading configuration file %s!\n",argv[optind+4]);
+              cleanUpDoxygen();
               exit(1);
             }
             Config::instance()->substituteEnvironmentVars();
             Config::instance()->convertStrToVal();
             Config_getString("LATEX_HEADER")="";
+            Config_getString("LATEX_FOOTER")="";
             Config::instance()->check();
           }
           else // use default config