This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU M4 source repository".
http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=815b5191f5a984d8d5c62d94dbb6e1f5768d2adf The branch, master has been updated via 815b5191f5a984d8d5c62d94dbb6e1f5768d2adf (commit) from f34670cd27a43e50989558c33fc0cb5f6429efb7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 815b5191f5a984d8d5c62d94dbb6e1f5768d2adf Author: Eric Blake <[email protected]> Date: Mon Jun 15 22:13:40 2009 -0600 Document why bootstrap might touch state of tree. * bootstrap: Fix typos. Add comment. * HACKING: Add notes about this scenario. * gnulib: Update to latest version. * .gitignore: Track gnulib changes. Signed-off-by: Eric Blake <[email protected]> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + ChangeLog | 6 ++++++ HACKING | 10 ++++++++++ bootstrap | 9 ++++++--- gnulib | 2 +- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b624fd4..d65437e 100644 --- a/.gitignore +++ b/.gitignore @@ -92,6 +92,7 @@ libtool /ltdl/m4/stdint_h.m4 /ltdl/m4/uintmax_t.m4 /ltdl/m4/ulonglong.m4 +/ltdl/m4/version-etc.m4 /ltdl/m4/visibility.m4 /ltdl/m4/wchar_t.m4 /ltdl/m4/wint_t.m4 diff --git a/ChangeLog b/ChangeLog index b4b2517..40d8111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-06-15 Eric Blake <[email protected]> + Document why bootstrap might touch state of tree. + * bootstrap: Fix typos. Add comment. + * HACKING: Add notes about this scenario. + * gnulib: Update to latest version. + * .gitignore: Track gnulib changes. + Drop .cvsignore and redundant .gitignore files. * .cvsignore: Delete. We are moving further away from CVS. * build-aux/.cvsignore: Likewise. diff --git a/HACKING b/HACKING index ef04820..3b9c045 100644 --- a/HACKING +++ b/HACKING @@ -124,6 +124,14 @@ and is not part of a release distribution. from their respective upstream source, rather than the version that shipped with the automake release. +* Normally, after running bootstrap, 'git status' should not show any + differences; if things changed, please provide a patch or at least + report it as a bug. One case where things are changed is if the + gnulib submodule comes from an older date than the current installed + libtool, such that libtoolize will replace the symlinks to an older + version of build-aux files with their newer counterpart; the fix to + this is updating the submodule to a newer gnulib version. + 4. Test Suite ============= @@ -245,6 +253,8 @@ yyyy-mm-dd Name of Author <em...@address> (tiny change) the gnulib submodule. If necessary to update to the latest, run: git submodule foreach git pull origin master git commit -m 'Update gnulib submodule to latest.' gnulib + In particular, ensure that the gnulib version is at least as new as + the latest stable libtool release. * Update the version number in configure.ac. See http://www.gnu.org/software/libtool/contribute.html for details of diff --git a/bootstrap b/bootstrap index 43b55fb..c243ba3 100755 --- a/bootstrap +++ b/bootstrap @@ -333,11 +333,11 @@ if test -d .git && (git --version) >/dev/null 2>/dev/null ; then if test -d "$GNULIB_SRCDIR" ; then rmdir gnulib 2>/dev/null git clone --reference "$GNULIB_SRCDIR" git://git.sv.gnu.org/gnulib.git \ - && git submodule init && git submodule update \ - || func_fatal_error "Unable to update gnulib" + && git submodule init && git submodule update \ + || func_fatal_error "Unable to update gnulib" else git submodule update --init \ - || func_fatal_error "Unable to update gnulib" + || func_fatal_error "Unable to update gnulib" fi fi else @@ -362,6 +362,9 @@ $AUTOPOINT --force # (or worse out-of-date) macro directory. func_echo "running: $LIBTOOLIZE --copy --install" ${LIBTOOLIZE} --copy --install +# Note that if libtoolize has newer auxiliary files than the current +# gnulib submodule, then this will result in a typechange. See +# HACKING for details. ## ---------------------- ## ## Import Gnulib modules. ## diff --git a/gnulib b/gnulib index abb53db..dcc2f67 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit abb53db0ac56280d00b2cb8a67f61caff622ea89 +Subproject commit dcc2f67b6ffab6e9def088ccbf7627edcda4bbac hooks/post-receive -- GNU M4 source repository
