bootstrap: Ship git-version-gen with the tarball.

bootstrap.sh is already shipped and when rebootstrapping, it will call git-version-gen
internally when processing configure.ac.

In order to know when someone has rebootstrapped, we modify the tarball version to mark it
as rebootstrapped. Not 100% sure this later stage is desired or if we should remove
the .tarball-version file instead.

diff --git a/Makefile.am b/Makefile.am
index 4d45a07d0966d1d0c647b049534eb31ffa1a2f5b..5967f2ce7b334603d08500d5ac1e2693376054eb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
+EXTRA_DIST = bootstrap.sh git-version-gen LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
 SUBDIRS = src doxygen man po
 
 MAINTAINERCLEANFILES =

diff --git a/bootstrap.sh b/bootstrap.sh
index d5025db61a06056b6a4ca22224cc7ab84b98e520..aa9755faacf8d462249830a5563d935f136e39e5 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -46,6 +46,11 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     chmod -c +x  .git/hooks/pre-commit
 fi
 
+if [ -f .tarball-version ]; then
+    echo "Marking tarball version as modified."
+    echo -n `cat .tarball-version | sed 's/-rebootstrapped$//'`-rebootstrapped >.tarball-version
+fi
+
 # We check for this here, because if pkg-config is not found in the
 # system, it's likely that the pkg.m4 macro file is also not present,
 # which will make PKG_PROG_PKG_CONFIG be undefined and the generated