Bootstrapping Redux.

[Scott James Remnant]

Bootstrapping the new stuff with Automake 1.8 and an older
/usr/share/aclocal/libtool.m4 still causes the contents of that to be
dumped into aclocal.m4 as well as the new m4_include line.

This is (still) because at least some of the following m4_defines used
to be AC_DEFUNs:

        AC_LIBTOOL_CONFIG
        AC_LIBTOOL_LINKER_OPTION
        _LT_AC_LANG_C_CONFIG
        _LT_AC_LANG_GCJ_CONFIG
        _LT_AC_LANG_RC_CONFIG
        _LT_AC_PROG_ECHO_BACKSLASH
        _LT_AC_SHELL_INIT
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR

As well as the whole AC_PROG_EGREP debacle.

However I've come up with a fairly evil, hacky but nonetheless amusing
solution ... *cackle*  Add this to the bottom of bootstrap:

----8<--------8<--------8<--------8<--------8<--------8<--------8<--------8<----
for dir in $reconfdirs; do
        if grep '^m4_include.*libtool\.m4' $dir/aclocal.m4 >/dev/null && \
           grep '^# serial .* AC_PROG_LIBTOOL' $dir/aclocal.m4 >/dev/null
        then
                echo "Fixing aclocal.m4 in $dir"
                sed -e '/^# libtool.m4/,/^AC_MSG_RESULT(\[$$SED])/{N;d}' \
                        < $dir/aclocal.m4 > $dir/aclocal.m4_
                mv $dir/aclocal.m4_ $dir/aclocal.m4
                (cd $dir && autoconf)
        fi
done
---->8-------->8-------->8-------->8-------->8-------->8-------->8-------->8----

Scott
-- 
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?

signature.asc
Description: This is a digitally signed message part