aboutsummaryrefslogtreecommitdiff
path: root/xkbcomp
diff options
context:
space:
mode:
Diffstat (limited to 'xkbcomp')
-rw-r--r--xkbcomp/man/xkbcomp.man12
-rw-r--r--xkbcomp/utils.h4
2 files changed, 15 insertions, 1 deletions
diff --git a/xkbcomp/man/xkbcomp.man b/xkbcomp/man/xkbcomp.man
index 0486b7dd7..667c98506 100644
--- a/xkbcomp/man/xkbcomp.man
+++ b/xkbcomp/man/xkbcomp.man
@@ -47,6 +47,18 @@ Produce a C header file as output (.h extension).
.B \-dflts
Compute defaults for any missing components, such as key names.
.TP 8
+.B \-em1 \fImsg\fP
+Print \fImsg\fP before printing first error message.
+.TP 8
+.B \-emp \fImsg\fP
+Print \fImsg\fP at the start of each message line.
+.TP 8
+.B \-eml \fImsg\fP
+If there were any errors, print \fImsg\fP before exiting.
+.TP 8
+.B \-help, -?
+Show available options.
+.TP 8
.B \-I\fIdir\fP
Specifies top-level directories to be searched for files included by the
keymap description. After all directories specified by \-I options
diff --git a/xkbcomp/utils.h b/xkbcomp/utils.h
index 63eda3632..b00067d6e 100644
--- a/xkbcomp/utils.h
+++ b/xkbcomp/utils.h
@@ -35,7 +35,9 @@
#include <X11/Xfuncs.h>
#include <stddef.h>
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#ifndef NUL
#define NUL '\0'
@@ -247,7 +249,7 @@ extern
extern int uDebugIndentSize;
#define uDebugIndent(l) (uDebugIndentLevel+=(l))
#define uDebugOutdent(l) (uDebugIndentLevel-=(l))
-#ifdef DEBUG_ON
+#ifdef DEBUG
#define uDEBUG(f,s) { if (DEBUG_VAR&(f)) uDebug(s);}
#define uDEBUG1(f,s,a) { if (DEBUG_VAR&(f)) uDebug(s,a);}
#define uDEBUG2(f,s,a,b) { if (DEBUG_VAR&(f)) uDebug(s,a,b);}