From: Ralf Wildenhues Date: Sat, 17 Jun 2006 08:08:19 +0000 (+0000) Subject: * bin/Makefile.am (autoconf.in): Use `--melt' for autom4te, X-Git-Tag: AUTOCONF-2.60~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14f332d20b5813b44286ba71133bde1d1827241a;p=thirdparty%2Fautoconf.git * bin/Makefile.am (autoconf.in): Use `--melt' for autom4te, in order to avoid picking up an older installed frozen m4sh.m4f. Besides an outdated shell startup, this could have been created by an earlier M4 version with incompatible frozen file format. --- diff --git a/ChangeLog b/ChangeLog index 22caf44f9..c54e58e88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ +2006-06-17 Ralf Wildenhues + + * bin/Makefile.am (autoconf.in): Use `--melt' for autom4te, + in order to avoid picking up an older installed frozen m4sh.m4f. + Besides an outdated shell startup, this could have been created + by an earlier M4 version with incompatible frozen file format. + 2006-06-16 Paul Eggert - * README: Recomment m4 1.4.4 instead of 1.4.3.. + * README: Recommend m4 1.4.4 instead of 1.4.3.. * doc/autoconf.texi: Likewise. (Special Chars in Names): Say that $(.FOO) is portable, as suggested by Stepan Kasal. diff --git a/bin/Makefile.am b/bin/Makefile.am index 10c928fea..f64858505 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -52,8 +52,11 @@ edit = sed \ -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' # autoconf is written in M4sh. +# FIXME: this target should depend on the frozen files below lib/m4sugar, +# otherwise autom4te may pick up a frozen m4sh.m4f from an earlier +# installation below the same $(prefix); work around this with --melt. autoconf.in: $(srcdir)/autoconf.as $(m4sh_m4f_dependencies) - $(MY_AUTOM4TE) --language M4sh --cache '' $(srcdir)/autoconf.as -o $@ + $(MY_AUTOM4TE) --language M4sh --cache '' --melt $(srcdir)/autoconf.as -o $@ ## All the scripts depend on Makefile so that they are rebuilt when the ## prefix etc. changes. It took quite a while to have the rule correct, diff --git a/bin/Makefile.in b/bin/Makefile.in index 62a7ed077..096f4c079 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -478,8 +478,11 @@ check-forbidden-patterns: fi # autoconf is written in M4sh. +# FIXME: this target should depend on the frozen files below lib/m4sugar, +# otherwise autom4te may pick up a frozen m4sh.m4f from an earlier +# installation below the same $(prefix); work around this with --melt. autoconf.in: $(srcdir)/autoconf.as $(m4sh_m4f_dependencies) - $(MY_AUTOM4TE) --language M4sh --cache '' $(srcdir)/autoconf.as -o $@ + $(MY_AUTOM4TE) --language M4sh --cache '' --melt $(srcdir)/autoconf.as -o $@ $(bin_SCRIPTS): Makefile rm -f $@ $@.tmp