bootstrap: sync from coreutils again

[pspp] / build-aux / bootstrap

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index d68d3f44f1ba6054ff6685890b38b4e18273f326..cf6b73b16488123f46069095e545496e7d5101cb 100755 (executable)
--- 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 \