X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Freadconf.c;h=ce2853697bbbf37dd62398a66b81b70545259f05;hb=3d18b35078096b9fd1feb8e2d6fd7e9e48755ad5;hp=194317f5278e93ac801bf1ca2b3ea8a7ea0dceb7;hpb=762e0e6bf7324c38a001b7a14c41c4a1e98e9499;p=yaz-moved-to-github.git

diff --git a/util/readconf.c b/util/readconf.c
index 194317f..ce28536 100644
--- a/util/readconf.c
+++ b/util/readconf.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994-1999, Index Data
+ * Copyright (C) 1994-2000, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: readconf.c,v $
- * Revision 1.7  1999-06-30 09:10:32  adam
+ * Revision 1.10  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.9  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.8  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.7  1999/06/30 09:10:32  adam
  * Fixed reading of MS-DOS files.
  *
  * Revision 1.6  1998/10/13 16:09:55  adam
@@ -39,12 +48,15 @@
  *
  *
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <ctype.h>
 
-#include <log.h>
-#include <readconf.h>
+#include <yaz/log.h>
+#include <yaz/readconf.h>
 
 #define l_isspace(c) ((c) == '\t' || (c) == ' ' || (c) == '\n' || (c) == '\r')
 
@@ -95,7 +107,7 @@ int readconf(char *name, void *rprivate,
     
     if (!(f = fopen(name, "r")))
     {
-	logf(LOG_WARN|LOG_ERRNO, "readconf: %s", name);
+	yaz_log(LOG_WARN|LOG_ERRNO, "readconf: %s", name);
 	return -1;
     }
     for (;;)