diff --git a/ChangeLog b/ChangeLog index 4c9bb9c5..fd8c77e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,21 +1,19 @@ 2004-02-12 Scott James Remnant + * bootstrap, m4/libtool.m4: Argh, Gary went crazy after cvsapply + went crazy and backed out more than he should've. This patch puts + some of it back again. + * ltmain.in, libtoolize.in, commit, config/mailnotify: Remove $SED from definitions of $dirname and $basename and prefix each use with it instead. Some shells (zsh) treat the expansion as a single command instead of a command with arguments. -2004-02-12 Scott James Remnant - * config/mailnotify (func_sendmail): Look for sendmail in a couple of common non-PATH locations as well. -2004-02-12 Scott James Remnant - * ltmain.in: Fix typo: macro's -> macros. -2004-02-12 Scott James Remnant - * ltmain.in: Correct definition of basename sed expression to not include single quotes. diff --git a/bootstrap b/bootstrap index 07c3e5bd..e1495e9e 100755 --- a/bootstrap +++ b/bootstrap @@ -67,6 +67,6 @@ for file in $fakes; do done # These files con cause an infinite configure loop if left behind. -rm -f Makefile libltdl/Makefile libtool +rm -f Makefile libltdl/Makefile libtool vcl.tmp exit 0 diff --git a/m4/libtool.m4 b/m4/libtool.m4 index bb28a408..a155d873 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -97,6 +97,7 @@ dnl Autoconf doesn't catch unexpanded LT_ macros by default: m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW)$])dnl AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl _LT_DECL([], [host_alias], [0], [The host system])dnl