Commit b1f0cd39 authored by Simon Marlow's avatar Simon Marlow

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?
parent 330e3bb7
...@@ -9,18 +9,19 @@ for dir in `cat libraries/core-packages`; do ...@@ -9,18 +9,19 @@ for dir in `cat libraries/core-packages`; do
fi fi
done done
# We don't recurse into the library packages with autoreconf anymore, so we # We don't recurse into the library packages with autoreconf anymore,
# have to do this manually. To avoid a strict dependency on autoreconf, we # so we have to do this manually. To avoid a strict dependency on
# are careful to call autoreconf only when configure does not exist yet or the # autoreconf, we are careful to call autoreconf only when configure
# corresponding configure.ac is newer. This would be dead easy if every shell # does not exist yet or the corresponding configure.ac/aclocal.m4 is
# supported the "-nt" option for "test", but this is not the case. The only # newer. This would be dead easy if every shell supported the "-nt"
# portable solution seems to be via find's "-newer" option or to basically give # 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 # up and replace find with perl: :-P
# #
# perl -e 'print "configure.ac\n" if -M "configure.ac" < -M "configure"' # perl -e 'print "configure.ac\n" if -M "configure.ac" < -M "configure"'
for dir in . libraries/*; do for dir in . libraries/*; do
if test -f $dir/configure.ac; then 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 fi
done done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment