build: get the gnulib version via autogen.sh

This is useful for:
a) repeatibly generating the same tarball off git
b) diagnosing and tracking down (rare) gnulib bugs
c) 3rd parties verifying we do not put malicious code into our tarballs

3 files changed, 7 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 925e468..f633ea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 /*.cache
 /*.in
 /.version
+/.gnulib-version
 /ChangeLog*
 /NEWS*
 /_build
diff --git a/Makefile.am b/Makefile.am
index 157242f..499def1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,7 +112,7 @@ chunk_parser.c: chunk_parser.rl http_common.rl
 .rl.c:
         $(AM_V_GEN)$(RAGEL) $< -C $(RLFLAGS) -o $@
 
-BUILT_SOURCES = $(top_srcdir)/.version
+BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.gnulib-version
 bin_PROGRAMS = cmogstored
 cmogstored_SOURCES = $(mog_src) $(RL_CGEN) cmogstored.c probes.d
 
@@ -195,7 +195,7 @@ EXTRA_DIST = $(RB_TESTS) $(RL_CGEN) $(RL_ALL) $(PERL_TESTS) $(extra_doc) \
   cmogstored.x .ctags $(SLOW_RB_FILES) \
   build-aux/.gitignore build-aux/snippet/.gitignore \
   tests/.gitignore \
-  $(top_srcdir)/.version \
+  $(top_srcdir)/.version $(top_srcdir)/.gnulib-version \
   test/valgrind.supp nostd/README
 
 TESTS_ENVIRONMENT = PATH=$(top_builddir):$$PATH TMPDIR=$(test_tmpdir)
@@ -216,6 +216,8 @@ include $(top_srcdir)/build-aux/pgo.mk
 
 $(top_srcdir)/.version:
         echo $(VERSION) > $@-t && mv $@-t $@
+$(top_srcdir)/.gnulib-version:
+        cd $(top_srcdir) && ./autogen.sh
 dist-hook:
         echo $(VERSION) > $(distdir)/.tarball-version
 
diff --git a/autogen.sh b/autogen.sh
index 0908a26..4db469d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 >> test/slow.mk
+glver="$(gnulib-tool --version | head -n1)"
 if gnulib-tool --update && autoreconf -i
 then
+        echo "$glver" > .gnulib-version
         exit 0
 fi
 cat HACKING