From b64cf42d9015865539be58035585d16ad96d6cc3 Mon Sep 17 00:00:00 2001 From: Brice Videau Date: Wed, 13 Mar 2024 16:12:18 -0500 Subject: [PATCH] Consistency between VERSION and github tags. --- VERSION | 2 +- configure.ac | 1 + m4/ax_dynamic_version.m4 | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index f013069d..b82608c0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.1.0.0 +v0.1.0 diff --git a/configure.ac b/configure.ac index 68ecb046..5d984913 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ # see semver.org for version info m4_define([fallbackversion], m4_normalize(m4_include([VERSION]))) +m4_append([fallbackversion], [.0]) AC_INIT([cconfigspace], [m4_esyscmd([build-aux/git-version-gen --fallback fallbackversion .tarball-version])], [bvideau@anl.gov]) diff --git a/m4/ax_dynamic_version.m4 b/m4/ax_dynamic_version.m4 index 5f697e2c..9ee8435e 100644 --- a/m4/ax_dynamic_version.m4 +++ b/m4/ax_dynamic_version.m4 @@ -31,9 +31,9 @@ AC_DEFUN([AX_DYNAMIC_VERSION],[ [DYNAMIC_VERSION_RULES=' -GITVER = $$(cd $(top_srcdir) 2>/dev/null && sh build-aux/git-version-gen --fallback `cat VERSION` .tarball-version 2>/dev/null) +GITVER = $$(cd $(top_srcdir) 2>/dev/null && sh build-aux/git-version-gen --fallback `echo "\$(cat VERSION).0"` .tarball-version 2>/dev/null) OLDVER = $$(cat .version 2>/dev/null) -CURVER = $$(if [ -z "$(GITVER)" ]; then cat $(top_srcdir)/VERSION | cut -c2- 2>/dev/null; else echo "$(GITVER)"; fi) +CURVER = $$(if [ -z "$(GITVER)" ]; then echo "\$(cat $(top_srcdir)/VERSION).0" | cut -c2- 2>/dev/null; else echo "$(GITVER)"; fi) .PHONY: .version .version: $(top_srcdir)/VERSION