From 1871822db52671d5b09f1702bfdef5c4c670ea50 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 2 Mar 2008 17:17:28 +0100 Subject: [PATCH] bootstrap: sync from coreutils again * build-aux/bootstrap: Remove dangling m4/*.m4 symlinks. Signed-off-by: Jim Meyering --- ChangeLog | 5 +++++ build-aux/bootstrap | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index b0040fb17..5bb4cd1d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-02 Jim Meyering + + bootstrap: sync from coreutils again + * build-aux/bootstrap: Remove dangling m4/*.m4 symlinks. + 2008-03-01 Jim Meyering bootstrap: sync from coreutils diff --git a/build-aux/bootstrap b/build-aux/bootstrap index d68d3f44f..cf6b73b16 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -546,6 +546,16 @@ if test -f $mam_template; then done fi +# Remove any dangling symlink matching "*.m4" in the gnulib-populated +# $m4_base directory, since such a file would cause aclocal to fail. +# The following requires GNU find 4.2.3 or newer. Considering the usual +# portability constraints of this script, that may seem a very demanding +# requirement, but it should be ok. Ignore any failure, which is fine, +# since this is only a convenience to help developers avoid the relatively +# unusual case in which a symlinked-to .m4 file is git-removed from gnulib +# between successive runs of this script. +find "$m4_base" -name '*.m4' -depth -type l -xtype l -delete > /dev/null 2>&1 + # Reconfigure, getting other files. for command in \ -- 2.11.0