Sorry. This was hidden by the sh.test failure -- I did try testing Libtool, but it didn't run the Autotest-based testsuite.
I didn't investigate it very much, but this fixes it and is conceptually correct: we're expanding stuff in place in _AS_PREPARE, and we're taking care of the ordering manually, so it's bad to add stuff in diversions other than the one we're working on. I'll run the Autoconf testsuite and then push it. Paolo 2008-10-15 Paolo Bonzini <[EMAIL PROTECTED]> * lib/m4sugar/m4sh.m4 (_AS_PREPARE): Disable AS_REQUIRE while running it. diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 index 64cc8db..acdaa80 100644 --- a/lib/m4sugar/m4sh.m4 +++ b/lib/m4sugar/m4sh.m4 @@ -257,7 +257,8 @@ fi # there are so many _AS_PREPARE_* below, and that's also why it is # important not to forget some: config.status needs them. m4_defun([_AS_PREPARE], -[as_func_mkdir_p () +[m4_pushdef([AS_REQUIRE], [])dnl +as_func_mkdir_p () { _AS_MKDIR_P } @@ -274,6 +275,7 @@ _AS_TEST_PREPARE _AS_TR_CPP_PREPARE _AS_TR_SH_PREPARE _AS_UNSET_PREPARE +m4_popdef([AS_REQUIRE])dnl ]) # AS_PREPARE