* 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 22caf44f9f3e86b14fbf06f151dd993914671c77..c54e58e88fc26c6222d447aa9ba23776f796f360 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+2006-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * 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  <eggert@cs.ucla.edu>
 
-       * 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 10c928fea2a22875daaa171f80d6c2882813fdbb..f64858505f5e56e8a27989449057b7cd0f8f1d69 100644 (file)
--- 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 62a7ed077993fca2959a9b99b59831f8b53b9128..096f4c0791ba952384fc2e057f5131d4517a568b 100644 (file)
--- 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