--- np2/x11/trace.h	2003/10/16 17:59:41	1.1
+++ np2/x11/trace.h	2004/08/07 19:06:01	1.5
@@ -1,29 +1,38 @@
-
-#ifndef TRACE
-
-#define	TRACEINIT()
-#define	TRACETERM()
-#define	TRACEOUT(a)
-#define	VERBOSE(a)
-
-#else
+#ifndef	NP2_X11_TRACE_H__
+#define	NP2_X11_TRACE_H__
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
+extern int trace_flag;
+
 void trace_init(void);
 void trace_term(void);
 void trace_fmt(const char *str, ...);
 
-#define	TRACEINIT()		trace_init()
-#define	TRACETERM()		trace_term()
+#ifndef TRACE
+
+#define	TRACEINIT()
+#define	TRACETERM()
+#define	TRACEOUT(a)
+#ifndef	VERBOSE
+#define	VERBOSE(s)
+#endif
+
+#else	/* TRACE */
+
+#define	TRACEINIT()	trace_init()
+#define	TRACETERM()	trace_term()
 #define	TRACEOUT(arg)	trace_fmt arg
-#define	VERBOSE(arg)	trace_fmt arg
+#ifndef	VERBOSE
+#define	VERBOSE(arg)	if (trace_flag) trace_fmt arg
+#endif
+
+#endif	/* !TRACE */
 
 #ifdef	__cplusplus
 };
 #endif
 
-#endif
-
+#endif	/* NP2_X11_TRACE_H__ */