diff options
| author | Eric Blake <eblake@redhat.com> | 2010-02-22 17:01:33 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-02-23 21:31:21 +0100 |
| commit | 38c9440a15055a693252aaa5cce615b8b9d26860 (patch) | |
| tree | 0edbc809375839a9d9330ad632d1bd7508cca4e2 /autogen.sh | |
| parent | 1a51d05f8b417da05cdd74360ad3c1a15d87306b (diff) | |
| download | libvirt-38c9440a15055a693252aaa5cce615b8b9d26860.tar.gz | |
maint: import modern bootstrap
Copy the latest gnulib bootstrap, which runs autoreconf and
generates po/Makevars for us. Other improvements include some
improved prerequisite tool checking.
This also fixes a bug in the .pot files, regarding the copyright holder.
* bootstrap: Update to version in .gnulib/build-aux.
* bootstrap.conf (MSGID_BUGS_ADDRESS, COPYRIGHT_HOLDER, SKIP_PO)
(gnulib_mk, ACLOCAL, bootstrap_epilogue): Provide overrides.
* autogen.sh (autoreconf): Avoid redundant autoreconf if bootstrap
was run.
* po/Makevars: Delete, now that bootstrap creates it.
* po/.gitignore: Update.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh index 93538f9055..833b1d18d0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -67,7 +67,8 @@ fi curr_status=.git-module-status t=$(git submodule status) if test "$t" = "$(cat $curr_status 2>/dev/null)"; then - : # good, it's up to date + : # good, it's up to date, all we need is autoreconf + autoreconf -if else echo running bootstrap... ./bootstrap && echo "$t" > $curr_status || { @@ -76,11 +77,6 @@ else } fi -# Automake requires that ChangeLog exist. -touch ChangeLog - -autoreconf -if - cd "$THEDIR" if test "x$OBJ_DIR" != x; then |