From: Jim Meyering <meyering@redhat.com>
Date: Wed, 20 Feb 2008 07:16:38 +0000 (+0100)
Subject: * bootstrap: Remove dangling symlinks before invoking aclocal.
X-Git-Tag: v6.11~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1ec12dad6e5c68948551b6b34ecae4c7ebbe7b6;p=thirdparty%2Fcoreutils.git

* bootstrap: Remove dangling symlinks before invoking aclocal.
---

diff --git a/bootstrap b/bootstrap
index 7dacfe6be1..1c0b97ebc8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -538,6 +538,13 @@ if test -f $mam_template; then
   done
 fi
 
+# Remove dangling symlinks in gnulib-populated directories, since
+# a dangling m4/*.m4 symlink would cause aclocal to fail.
+# This depends on GNU find, and a relatively recent version at that.
+# Ignore any failure for now, since it's only to avoid the relatively
+# unusual case in which a symlinked-to file in gnulib/ or gl/ is removed.
+find m4 lib build-aux -depth -type l -xtype l -delete > /dev/null 2>&1
+
 # Reconfigure, getting other files.
 
 for command in \