build: fix incremental autogen.sh when no AUTHORS is present

Commit 71d1256 tried to fix a problem where rebasing an old
branch on top of newer libvirt.git resulted in automake failing
because of a missing AUTHORS file.  However, while the fix
worked for an incremental 'make', it did not work for someone
that directly reran './autogen.sh'.  Reported by Laine Stump.

* autogen.sh (autoreconf): Check for same conditions as cfg.mk.
* cfg.mk (_update_required): Add comments.
(cherry picked from commit 55dc872bd85e0756a13fc24693c4eed31d0c202f)

diff --git a/autogen.sh b/autogen.sh
index d18339768ed07111073083f203d88411174a902d..357fae958f5aef2526b9e7176b6ff7264518d2fe 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -70,8 +70,9 @@ if test -d .git; then
             echo "set env-var CLEAN_SUBMODULE to discard gnulib changes" 2>&1
             exit 1 ;;
     esac
+    # Keep this test in sync with cfg.mk:_update_required
     if test "$t" = "$(cat $curr_status 2>/dev/null)" \
-        && test -f "po/Makevars"; then
+        && test -f "po/Makevars" && test -f AUTHORS; then
         # good, it's up to date, all we need is autoreconf
         autoreconf -if
     else

diff --git a/cfg.mk b/cfg.mk
index cd33fcfa7298ea051d3c2ad80ef78ed90724469b..b49f9e63c20566f104e0ef8a684c77b75e173846 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -685,6 +685,8 @@ ifeq (0,$(MAKELEVEL))
   #  b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
   # $ cat .git-module-status
   # b653eda3ac4864de205419d9f41eec267cb89eeb
+  #
+  # Keep this logic in sync with autogen.sh.
   _submodule_hash = sed 's/^[ +-]//;s/ .*//'
   _update_required := $(shell                                          \
       cd '$(srcdir)';                                                  \