From b1f0cd397d4cc0e9bf178bbe2774a9b7c1595b34 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 5 Sep 2007 10:14:19 +0000 Subject: [PATCH] Fix boot: it was avoiding autoreconfing Two problems here: find needs to dereference symbolic links (-L option, I really hope that's portable), and we need to notice when aclocal.m4 is updated. Somehow I think this was easier when it just always ran autoreconf... what was wrong with that? --- boot | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/boot b/boot index 1889e8c..a21691f 100644 --- a/boot +++ b/boot @@ -9,18 +9,19 @@ 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 -- 1.7.10.4