From: Mathieu Lirzin <mthl@gnu.org>
Date: Sat, 8 Jul 2017 20:32:19 +0000 (+0200)
Subject: maint: Define API version manually
X-Git-Tag: v1.16~35^2~2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=20e898dc2b2c6cf0f22dc25d33a2f258f0423e9c;p=thirdparty%2Fautomake.git

maint: Define API version manually

* configure.ac (APIVERSION): Define it to 1.15a.
* bootstrap (APIVERSION): Parse 'configure.ac' to get it.
---

diff --git a/bootstrap b/bootstrap
index 1382a9fe8..82f3859a2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -37,6 +37,7 @@ export AUTOM4TE  # ditto
 
 # Variables to substitute.
 VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac`
+APIVERSION=`sed -n 's/^APIVERSION=//p' configure.ac`
 PACKAGE=automake
 datadir=.
 # This should be automatically updated by the 'update-copyright'
@@ -52,10 +53,6 @@ else
   BOOTSTRAP_SHELL=/bin/sh
 fi
 
-# Read the rule for calculating APIVERSION and execute it.
-apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.ac`
-eval "$apiver_cmd"
-
 # Sanity checks.
 if test -z "$VERSION"; then
   echo "$me: cannot find VERSION" >&2
diff --git a/configure.ac b/configure.ac
index 7f91f9609..806dcce43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,12 +49,7 @@ AC_SUBST([RELEASE_YEAR])
 
 # The API version is the base version.  We must guarantee
 # compatibility for all releases with the same API version.
-# Our current rule is that:
-# * All releases, including the prereleases, in an X.Y series
-#   are compatible.  So 1.5.1c is compatible with 1.5.
-# * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c
-#   aren't the same.
-APIVERSION=`echo "$VERSION" | sed -e 's/^\([[0-9]]*\.[[0-9]]*[[a-z]]*\).*$/\1/'`
+APIVERSION=1.15a
 AC_SUBST([APIVERSION])
 
 AC_SUBST([pkgvdatadir], ["\${datadir}/$PACKAGE-$APIVERSION"])