build: Use git-version-gen from Gnulib

diff --git a/Makefile.am b/Makefile.am
index be7750d..4d1b32a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,11 +18,17 @@ ja_docs =                                   \
        doc/ja/README                           \
        doc/ja/README-hacking
 
+BUILT_SOURCES = $(top_srcdir)/.version
+
 EXTRA_DIST =                                   \
        $(ja_docs)                              \
        $(changelog_etc)                        \
        bootstrap                               \
-       bootstrap.conf
+       bootstrap.conf                          \
+       $(BUILT_SOURCES)
+
+$(top_srcdir)/.version:
+       echo $(VERSION) > $@-t && mv $@-t $@
 
 # Arrange so that .tarball-version appears only in the distribution
 # tarball, and never in a checked-out repository.

diff --git a/bootstrap.conf b/bootstrap.conf
index fd3fa11..2df8e77 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -18,6 +18,7 @@
 
 # gnulib modules used by this package.
 gnulib_modules="
+git-version-gen
 gitlog-to-changelog
 "
 

diff --git a/configure.ac b/configure.ac
index ab40b2e..fce78aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,12 @@
-AC_INIT([riece], [9.0.0], [riece-discuss@nongnu.org])
+AC_PREREQ(2.63)
+
+AC_INIT([riece],
+       m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+       [riece-discuss@nongnu.org])
+
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_PREREQ(2.63)
+
 AM_INIT_AUTOMAKE
 
 AC_CHECK_EMACS