dd git version to -v output

diff --git a/Makefile.am b/Makefile.am
index a118f8e6f7ee73debfba734da7b6076b94ebc4d3..9e63081337cd04f83ed01ddb16807ede4783272d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,4 +43,5 @@ mstflintincludedir = @includedir@/mtcr_ul
 
 EXTRA_DIST = \
        mstflint.spec \
-    hca_self_test.ofed
+       hca_self_test.ofed \
+       gitversion.h

diff --git a/autogen.sh b/autogen.sh
index 4827884ba1f127b060c8f7cdcf47018ed5588872..8abc1853d4dad7825b938665149fd5cd5ed7aa2c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,8 @@
 # create config dir if not exist
 test -d config || mkdir config
 
+sh gitversion.sh
+
 set -x
 aclocal -I config
 libtoolize --force --copy

diff --git a/gitversion.sh b/gitversion.sh
new file mode 100755 (executable)
index 0000000..a668328
--- /dev/null
+++ b/gitversion.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if git rev-parse --short HEAD > gitversion.tmp
+then
+    echo "#define TOOLS_SVN_VER \"`tr -d '\n' < gitversion.tmp`\"" > gitversion.h
+fi
+rm gitversion.tmp

diff --git a/tools_version.h b/tools_version.h
index 6e1eb37b432e545e316d74d65b94f035e3d768ae..e903cbcdc072de476708b748452a85b5189970f3 100644 (file)
--- a/tools_version.h
+++ b/tools_version.h
@@ -40,7 +40,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-// To be replaced by an external script:
+#include "gitversion.h"
+
 #ifndef TOOLS_SVN_VER
     #define TOOLS_SVN_VER "N/A"
 #endif