From: Eric Blake <eblake@redhat.com>
Date: Wed, 14 Nov 2012 20:20:55 +0000 (-0700)
Subject: build: rerun bootstrap if AUTHORS is missing
X-Git-Tag: v0.10.2.2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74aaec03eb20ce76f50cc64148576c226427154c;p=thirdparty%2Flibvirt.git

build: rerun bootstrap if AUTHORS is missing

Ever since commit 7b21981c started generating AUTHORS, we now have
the situation that if you flip between two branches in the same
git repository that cross that commit boundary, then 'make' will
fail due to automake complaining about AUTHORS not existing.  The
simplest solution is to realize that if AUTHORS does not exist,
then we flipped branches so we will need to rerun bootstrap
anyways; and rerunning bootstrap ensures AUTHORS will exist in time.

* cfg.mk (_update_required): Also depend on AUTHORS.
(cherry picked from commit 71d125620d0d88f15288aa7c2570988cc908ed11)
---

diff --git a/cfg.mk b/cfg.mk
index 50e6a50c69..cd33fcfa72 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -690,6 +690,7 @@ ifeq (0,$(MAKELEVEL))
       cd '$(srcdir)';							\
       test -d .git || { echo 0; exit; };				\
       test -f po/Makevars || { echo 1; exit; };				\
+      test -f AUTHORS || { echo 1; exit; };				\
       actual=$$(git submodule status | $(_submodule_hash);		\
 		git hash-object bootstrap.conf;				\
 		git ls-tree -d HEAD gnulib/local | awk '{print $$3}';	\