[PATCH xkbcomp v2] Print version number on -version.

[Peter Hutterer]

This commit isn't playing the WARN/M/M1 macro game. Version numbers to to
stdout, full stop.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
changes to v1:
- add man page entry

 man/xkbcomp.man |    3 +++
 xkbcomp.c       |    7 ++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/man/xkbcomp.man b/man/xkbcomp.man
index 9b380a0..0486b7d 100644
--- a/man/xkbcomp.man
+++ b/man/xkbcomp.man
@@ -88,6 +88,9 @@ Specifies the root directory for relative path names.
 .B -synch
 Force synchronization for X requests.
 .TP 8
+.B -version
+Print version number.
+.TP 8
 .B \-w\ \fIlvl\fP
 Controls the reporting of warnings during compilation.  A warning level
 of 0 disables all warnings; a warning level of 10 enables them all.
diff --git a/xkbcomp.c b/xkbcomp.c
index 892062f..2a3e8f4 100644
--- a/xkbcomp.c
+++ b/xkbcomp.c
@@ -119,6 +119,7 @@ Usage(int argc, char *argv[])
         M1("Usage: %s [options] file[(map)] ...\n", argv[0]);
     M("Legal options:\n");
     M("-?,-help             Print this message\n");
+    M("-version             Print the version number\n");
     if (!xkblist)
     {
         M("-a                   Show all actions\n");
@@ -252,7 +253,11 @@ parseArgs(int argc, char *argv[])
             Usage(argc, argv);
             exit(0);
         }
-        else if ((strcmp(argv[i], "-a") == 0) && (!xkblist))
+        else if (strcmp(argv[i], "-version") == 0)
+        {
+            printf("xkbcomp %s\n", PACKAGE_VERSION);
+            exit(0);
+        } else if ((strcmp(argv[i], "-a") == 0) && (!xkblist))
         {
             showImplicit = True;
         }
-- 
1.7.5.4