From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 9 Jul 2009 14:31:51 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v3.0.48~14
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=0046d7d79f79cbf9d03de7272d5069159aa92c24;hp=70db3b5fb3e8310c587dd8ba95866f1cadf69608

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
---

diff --git a/doc/yaz-config-man.xml b/doc/yaz-config-man.xml
index 022df82..5170b15 100644
--- a/doc/yaz-config-man.xml
+++ b/doc/yaz-config-man.xml
@@ -33,6 +33,7 @@
    <arg choice="opt"><option>--lalibs</option></arg>
    <arg choice="opt"><option>--cflags</option></arg>
    <arg choice="opt"><option>--comp</option></arg>
+   <arg choice="opt"><option>-V</option></arg>
    <arg choice="opt" rep="repeat">libraries</arg>
   </cmdsynopsis>
  </refsynopsisdiv>
@@ -104,6 +105,13 @@
      </para></listitem>
    </varlistentry>
 
+   <varlistentry>
+    <term>-V</term>
+    <listitem><para>
+      veturns YAZ SHA1 ID (from Git) and version.
+     </para></listitem>
+   </varlistentry>
+
   </variablelist>
  </refsect1>
  
diff --git a/yaz-config.in b/yaz-config.in
index e04767b..57886b6 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -31,6 +31,7 @@ Options:
 	[--lalibs]
 	[--cflags]
 	[--comp]
+        [-V]
 Libraries:
 	threads icu server
 EOF