* aclocal.in (write_aclocal): Don't write the filename ($output_file)

in the aclocal.m4 header.

diff --git a/ChangeLog b/ChangeLog
index a3ff3c5f791f385779795b1710577469cf780d5f..d20e59983296ace1393af2e2db0a93cfbb3ffbcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-07-29  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
+       * 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  <duret_g@epita.fr>

diff --git a/aclocal.in b/aclocal.in
index 6684f34d94fdb9ab8384d7a7b2f6a866fdc4fe66..7f37916eda884caf63d9d2ca63531d1addeac181 100644 (file)
--- 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 3de5ce614d8c338cdec30e39e3ee76ee9114265b..d836fce4b56a72d184f687063238554ae8d4dd1d 100644 (file)
--- 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.