From 7f339b6fd71bdd7697cd4b6f538b6261a653a8c2 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 29 Jul 2002 16:57:38 +0000 Subject: [PATCH] * aclocal.in (write_aclocal): Don't write the filename ($output_file) in the aclocal.m4 header. --- ChangeLog | 3 +++ aclocal.in | 9 ++++++++- aclocal.m4 | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3ff3c5..d20e599 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-07-29 Alexandre Duret-Lutz + * aclocal.in (write_aclocal): Don't write the filename ($output_file) + in the aclocal.m4 header. + * configure.in: Require Autoconf 2.53b. 2002-07-28 Alexandre Duret-Lutz diff --git a/aclocal.in b/aclocal.in index 6684f34..7f37916 100644 --- a/aclocal.in +++ b/aclocal.in @@ -406,8 +406,15 @@ sub write_aclocal print STDERR "aclocal: writing $output_file\n" if $verbose; my $out = new Automake::XFile "> $output_file"; + +# We used to print `# $output_file generated automatically etc.' But +# this creates spurious differences when using autoreconf. Autoreconf +# creates aclocal.m4t and then rename it to aclocal.m4, but the +# rebuild rules generated by Automake create aclocal.m4 directly -- +# this would gives two ways to get the same file, with a different +# name in the header. print $out -"# $output_file generated automatically by aclocal $VERSION -*- Autoconf -*- +"# generated automatically by aclocal $VERSION -*- Autoconf -*- # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. diff --git a/aclocal.m4 b/aclocal.m4 index 3de5ce6..d836fce 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# aclocal.m4 generated automatically by aclocal 1.6c -*- Autoconf -*- +# generated automatically by aclocal 1.6c -*- Autoconf -*- # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. -- 2.7.4