[Sblim-commit] gather/util gathercfg.c,1.2,1.3 mtrace.c,1.4,1.5 mtracetest.c,1.1,1.2 reposcfg.c,1.2,1.3 makefile,1.5,NONE

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/gather/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24670/util

Modified Files:
	gathercfg.c mtrace.c mtracetest.c reposcfg.c 
Removed Files:
	makefile 
Log Message:
Updated for Autoconf/Automake.


--- makefile DELETED ---

Index: gathercfg.c
===================================================================
RCS file: /cvsroot/sblim/gather/util/gathercfg.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gathercfg.c	20 Oct 2004 14:08:58 -0000	1.2
+++ gathercfg.c	24 Jun 2005 12:09:37 -0000	1.3
@@ -20,6 +20,10 @@
 #include "gathercfg.h"
 #include "mcfg.h"
 
+#ifndef GATHER_CONFDIR
+#define GATHER_CONFDIR "/etc"
+#endif
+
 static int gathercfg_handle;
 
 int gathercfg_init()
@@ -32,7 +36,7 @@
     "TraceComponents",
     NULL
   };
-  gathercfg_handle=set_configfile("/etc/gatherd.conf",allowed);
+  gathercfg_handle=set_configfile(GATHER_CONFDIR "/gatherd.conf",allowed);
   return gathercfg_handle > 0 ? 0 : 1;
 }
 

Index: reposcfg.c
===================================================================
RCS file: /cvsroot/sblim/gather/util/reposcfg.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- reposcfg.c	21 Oct 2004 13:55:11 -0000	1.2
+++ reposcfg.c	24 Jun 2005 12:09:37 -0000	1.3
@@ -20,6 +20,10 @@
 #include "reposcfg.h"
 #include "mcfg.h"
 
+#ifndef GATHER_CONFDIR
+#define GATHER_CONFDIR "/etc"
+#endif
+
 static int reposcfg_handle;
 
 int reposcfg_init()
@@ -32,7 +36,7 @@
     "TraceComponents",
     NULL
   };
-  reposcfg_handle=set_configfile("/etc/reposd.conf",allowed);
+  reposcfg_handle=set_configfile(GATHER_CONFDIR "/reposd.conf",allowed);
   return reposcfg_handle > 0 ? 0 : 1;
 }
 

Index: mtracetest.c
===================================================================
RCS file: /cvsroot/sblim/gather/util/mtracetest.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mtracetest.c	20 Oct 2004 12:49:15 -0000	1.1
+++ mtracetest.c	24 Jun 2005 12:09:37 -0000	1.2
@@ -17,6 +17,8 @@
  *
  */
 
+#undef NOTRACE
+
 #include "mtrace.h"
 #include <stdio.h>
 

Index: mtrace.c
===================================================================
RCS file: /cvsroot/sblim/gather/util/mtrace.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mtrace.c	30 Nov 2004 13:16:51 -0000	1.4
+++ mtrace.c	24 Jun 2005 12:09:37 -0000	1.5
@@ -18,6 +18,8 @@
  * Trace Support based on the SBLIM OSBASE Providers
  */
 
+#undef NOTRACE
+
 #include "mtrace.h"
 #include <stdio.h>
 #include <unistd.h>