X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=boot;h=a21691ff21d87bc5337f92290e21bf6f41126eff;hb=d3b882ae7fc0d4b499f194cc1914cc4562ebbd7c;hp=be9291d979f3fac98a0b9690c528b61250f05aaf;hpb=2d2393de269d8c5c9043a047e6ca652f64358610;p=ghc-hetmet.git

diff --git a/boot b/boot
index be9291d..a21691f 100644
--- a/boot
+++ b/boot
@@ -9,20 +9,23 @@ for dir in `cat libraries/core-packages`; do
   fi
 done
 
-# We don't recurse into the library packages with autoreconf anymore, so we
-# have to do this manually. To avoid a strict dependency on autoreconf, we
-# are careful to call autoreconf only when configure does not exist yet or the
-# corresponding configure.ac is newer. This would be dead easy if every shell
-# supported the "-nt" option for "test", but this is not the case. The only
-# portable solution seems to be via find's "-newer" option or to basically give
-# up and replace find with perl:   :-P
+# We don't recurse into the library packages with autoreconf anymore,
+# so we have to do this manually. To avoid a strict dependency on
+# autoreconf, we are careful to call autoreconf only when configure
+# does not exist yet or the corresponding configure.ac/aclocal.m4 is
+# newer. This would be dead easy if every shell supported the "-nt"
+# option for "test", but this is not the case. The only portable
+# solution seems to be via find's "-newer" option or to basically give
+# up and replace find with perl: :-P
 #
 #   perl -e 'print "configure.ac\n" if -M "configure.ac" < -M "configure"'
 for dir in . libraries/*; do
   if test -f $dir/configure.ac; then
-    ( cd $dir ; { test ! -f configure || test -n "`find configure.ac -newer configure`"; } && autoreconf )
+    ( cd $dir ; { test ! -f configure || test -n "`find -L configure.ac -newer configure`" || (test -f aclocal.m4 && test -n "`find -L aclocal.m4 -newer configure`"); } && autoreconf )
   fi
 done
 
 # Alas, darcs doesn't handle file permissions, so fix a few of them.
-chmod +x boot darcs-all push-all
+for f in boot darcs-all push-all validate; do
+  test -f $f && chmod +x $f
+done