Added GRAPHVIZ_VERSION_COMMIT to autogen.sh

There are a few places in autogen.sh and configure.ac where a value
called GRAPHVIZ_VERSION_COMMIT is used. However this value was set to
unknown in autogen.sh. This commit solved this assigning the abbreviated
hash of last commit to this value.

diff --git a/autogen.sh b/autogen.sh
index c437ee9c3de65a413e13d0c89304ab3b6b68b7c0..5b9ad095780b700ed171a485a0e0e8c3e802caa9 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,12 +10,15 @@ else
             echo "Warning: we do not know how to invoke date correctly." >&2
         fi    
     fi
-    echo "Graphviz version date is based on time of last commit: $GRAPHVIZ_VERSION_DATE"
+    echo "Graphviz: version date is based on time of last commit: $GRAPHVIZ_VERSION_DATE"
+
+    GRAPHVIZ_VERSION_COMMIT=$( git log -n 1 --format=%h )
+    echo "Graphviz: abbreviated hash of last commit: $GRAPHVIZ_VERSION_COMMIT"
 fi
 
 # initialize version for a "stable" build
 cat >./version.m4 <<EOF
-dnl graphviz package version number, (as distinct from shared library version)
+dnl Graphviz package version number, (as distinct from shared library version)
 dnl For the minor number: odd => unstable series
 dnl                       even => stable series
 dnl For the micro number: 0 => in-progress development
@@ -26,7 +29,7 @@ dnl NB: the next line gets changed to a date/time string for development release
 m4_define(graphviz_version_micro, $GRAPHVIZ_VERSION_DATE)
 m4_define(graphviz_version_date, $GRAPHVIZ_VERSION_DATE)
 m4_define(graphviz_collection, test)
-m4_define(graphviz_version_commit, unknown)
+m4_define(graphviz_version_commit, $GRAPHVIZ_VERSION_COMMIT)
 EOF
 
 # attempt to suppress ar messages for 'u' when 'D' present.

diff --git a/configure.ac b/configure.ac
index 7afaa0950d63b13aed57ee413a2c4cfa2f1e0728..7396bfcf0360e29447d72d1f360ccb8e6e728bec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,9 @@
 # Try to use version available on FC8
 AC_PREREQ(2.61)
 
+dnl ===========================================================================
+dnl Set Graphviz version information
+
 # set:
 #      graphviz_version_major
 #      graphviz_version_minor
@@ -19,13 +22,13 @@ GRAPHVIZ_VERSION_MAJOR=graphviz_version_major()
 GRAPHVIZ_VERSION_MINOR=graphviz_version_minor()
 GRAPHVIZ_VERSION_MICRO=graphviz_version_micro()
 
-#NB: "stable" or "development"
+# NB: "stable" or "development"
 GRAPHVIZ_COLLECTION=graphviz_collection()
 
-#NB: date/time of last commit - or "0"
+# NB: date/time of last commit - or "0"
 GRAPHVIZ_VERSION_DATE=graphviz_version_date()
 
-#NB: git commit hash of last commit
+# NB: git commit hash of last commit
 GRAPHVIZ_VERSION_COMMIT=graphviz_version_commit()
 
 GRAPHVIZ_SOURCES=graphviz/$GRAPHVIZ_COLLECTION/SOURCES