Changed intermediate version numbers to be git-style, eg 7.0.0-39 instead of 7.1.0-PRE

* Changed datastore modstate to be last in file, as prior to 7.0

lib/clixon/clixon.h.in

@@ -60,8 +60,8 @@ extern "C" {
 /*
  * CLIXON version macros, set in configure and resolved when expanding to 
  * clixon.h
+ * XXX: use github versioning: CLIXON_GITHASH[] instead
  */
-#undef CLIXON_VERSION_STRING
 #undef CLIXON_VERSION_MAJOR
 #undef CLIXON_VERSION_MINOR
 #undef CLIXON_VERSION_PATCH
@@ -122,6 +122,7 @@ extern "C" {
  * Global variables generated by Makefile
  */
 extern const char CLIXON_BUILDSTR[];
+extern const char CLIXON_GITHASH[];
 extern const char CLIXON_VERSION[];
 
 #ifdef __cplusplus

lib/clixon/clixon_plugin.h

@@ -340,7 +340,7 @@ typedef int (errmsg_t)(clixon_handle h, const char *fn, const int line,
  *
  * A plugin can customize a version (or banner) output on stdout.
  * Several version strings can be printed if there are multiple callbacks.
- * If not registered plugins exist, clixon prints CLIXON_VERSION_STRING
+ * If no registered plugins exist, clixon prints CLIXON_GITHASH
  * Typically invoked by command-line option -V
  * @param[in]  h   Clixon handle
  * @param[in]  f   Output file

lib/src/Makefile.in

@@ -299,6 +299,7 @@ DATELEN = $(shell date +"%Y.%m.%d %H:%M by `whoami` on `hostname`XXXX"|wc -c)
 build.c:	
 	echo "/* This file is generated from the Clixon Makefile */" > $@;
 	date +"const char CLIXON_BUILDSTR[$(DATELEN)]=\"%Y.%m.%d %H:%M by `whoami` on `hostname`"\"\; >> $@;
+	echo "const char CLIXON_GITHASH[64]=\"$(shell git log --pretty="format:%(describe) %ci" -n1)\""\; >> $@;
 	echo "const char CLIXON_VERSION[64]=\"$(CLIXON_VERSION)\""\; >> $@;
 
 # Note: will always be remade since GENOBS is date dependent