NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Eric Blake 2012-12-03 13:12:09 -07:00
parent 60f0f55ee4
commit 55dc872bd8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autogen.sh
View File

@ -72,8 +72,9 @@ if test -d .git; then
echo "set env-var CLEAN_SUBMODULE to discard gnulib changes" 2>&1 echo "set env-var CLEAN_SUBMODULE to discard gnulib changes" 2>&1
exit 1 ;; exit 1 ;;
esac esac
# Keep this test in sync with cfg.mk:_update_required
if test "$t" = "$(cat $curr_status 2>/dev/null)" \ 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 # good, it's up to date, all we need is autoreconf
autoreconf -if autoreconf -if
else else

2
cfg.mk
View File

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