X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=build-aux%2Fbootstrap;h=9a85762014de6d765dd61918b846522ab6c8ff26;hb=3f5a64015c34e525c73ccda17d5e300c58ee7505;hp=d68d3f44f1ba6054ff6685890b38b4e18273f326;hpb=2e6c567d27487c3117604f83e5a8efcf4a01551d;p=gnulib.git

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index d68d3f44f..9a8576201 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -415,6 +415,8 @@ version_controlled_file() {
 	     grep '^/[^/]*/[0-9]' > /dev/null && found=yes
   elif test -d .git; then
     git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+  elif test -d .svn; then
+    svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
   else
     echo "$0: no version control for $dir/$file?" >&2
   fi
@@ -546,6 +548,18 @@ if test -f $mam_template; then
   done
 fi
 
+# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
+# gnulib-populated directories.  Such .m4 files 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" "$source_base" \
+  -depth \( -name '*.m4' -o -name '*.[ch]' \) \
+  -type l -xtype l -delete > /dev/null 2>&1
+
 # Reconfigure, getting other files.
 
 for command in \