* Ralf Wildenhues wrote on Sat, Nov 20, 2010 at 10:30:37AM CET: > Avoid running installed automake from 'libtool --help'. > > * tests/subobj9.test: Export AUTOCONF and AUTOMAKE. > Together with fixed Libtool, this fixes check-coverage to not > invoke installed automake.
Pushed to Automake maint now. > diff --git a/tests/subobj9.test b/tests/subobj9.test > index 2045d58..83f3a31 100755 > --- a/tests/subobj9.test > +++ b/tests/subobj9.test > @@ -64,6 +64,9 @@ $AUTOMAKE -a > # Skip this test on configure errors (e.g., broken C++ compilers). > ./configure || Exit 77 > > +# Ensure './libtool --help' will use the right tool versions. > +export AUTOCONF AUTOMAKE > + > # Opportunistically check that --tag=CXX is used when supported. > if ./libtool --help | grep tag=TAG; then > $MAKE print >stdout || { cat stdout; Exit 1; } > Honor $AUTOCONF, $AUTOMAKE in --help output. > > * libltdl/config/getopt.m4sh (func_help): Use $AUTOCONF and > $AUTOMAKE if set, for --version outout. Pushed to Libtool now. > diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh > index 2196743..e9363bc 100644 > --- a/libltdl/config/getopt.m4sh > +++ b/libltdl/config/getopt.m4sh > @@ -592,8 +592,8 @@ func_help () > s*\$LTCFLAGS*'"$LTCFLAGS"'* > s*\$LD*'"$LD"'* > s/\$with_gnu_ld/'"$with_gnu_ld"'/ > - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ > - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ > + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null > |$SED 1q`"'/ > + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null > |$SED 1q`"'/ > p > d > }