--- psiconv/trunk/lib/psiconv/configuration.c	2004/01/04 22:07:02	182
+++ psiconv/trunk/lib/psiconv/configuration.c	2004/02/04 14:32:28	197
@@ -1,6 +1,6 @@
 /*
     configuration.c - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 1999, 2000,2003  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 1999-2004  Frodo Looijaard <frodol@dds.nl>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,13 +18,14 @@
 */
 
 #include "config.h"
-#include "error.h"
 #include "compat.h"
+#include "error.h"
 #include "unicode.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -37,7 +38,7 @@
 #endif
 
 #ifndef CONFIGURATION_SEARCH_PATH
-#define CONFIGURATION_SEARCH_PATH "/etc/psiconv.conf:~/.psiconv.conf"
+#define CONFIGURATION_SEARCH_PATH PSICONVETCDIR "/psiconv.conf:~/.psiconv.conf"
 #endif
 static struct psiconv_config_s default_config = 
     { PSICONV_VERB_WARN, 2, 0,0,0,psiconv_bool_false,NULL,'?' };
@@ -73,7 +74,7 @@
       (*config)->verbosity = value;
     else 
       psiconv_fatal(*config,0,0,"Configuration file %s, line %d: "
-	            "Verbosity should be between 1 and 4",filename,linenr);
+	            "Verbosity should be between 1 and 5",filename,linenr);
   } else if (!(strcasecmp(var,"color"))) {
     if ((value == 0) || (value == 1))
       (*config)->color = value;