* automake.in (am_macro_for_var): Add LIBTOOL. (ac_macro_for_var): Add RANLIB. (seen_libtool): Remove. (handle_libtool, lang_c_finish, define_compiler_variable, make_paragraphs): Use variable_defined ('LIBTOOL') instead of $seen_libtool. (handle_languages) <%transform>: Don't set 'LIBTOOL', it is already done in make_paragraphs. (handle_libraries): Simplify by requiring RANLIB with &require_variables_for_macro. (handle_ltlibraries): Simplify by requiring LIBTOOL with &require_variables_for_macro. (scan_autoconf_traces): Don't trace for AC_PROG_LIBTOOL and AM_PROG_LIBTOOL. * tests/libtool4.test, tests/library2.test: New files. * tests/Makefile.in (TESTS): Add libtool4.test and library2.test.