A small bug of automake-1.4-p3

[Masaki WAKABAYASHI]

Dear automake maintainers,

I found a small bug of automake-1.4-p3.  automake-1.4-p3 cannot
process `configure.ac', because there are some fixed filename
`configure.in' in 3 source files ---

 (1) remake-hdr.am
 (2) remake.am
 (3) texi-vers.am

So, I wrote the patch to fix this bug.  The patch is included in the
end of this e-mail.

Best wishes,
----
Masaki WAKABAYASHI <address@hidden>

--- automake-1.4-p3.configure_ac.patch ---

diff -Naru automake-1.4-p3.orig/automake.in automake-1.4-p3/automake.in
--- automake-1.4-p3.orig/automake.in    Fri Jun  8 04:18:18 2001
+++ automake-1.4-p3/automake.in Sun Jun 10 05:48:07 2001
@@ -1962,7 +1962,8 @@
                    ('s/address@hidden@/' . $info_cursor . '/g; '
                     . 's/address@hidden@/' . $vti . '/g; '
                     . 's/address@hidden@/' . $vtexi . '/g;'
-                    . 's,address@hidden@,' . $conf_pat . ',g;',
+                    . 's,address@hidden@,' . $conf_pat . ',g;'
+                    . 's,address@hidden@,' . $configure_ac . ',g;',
                     'texi-vers')
             unless $done > 1;
 
@@ -2998,7 +2999,10 @@
     else
     {
        &handle_aclocal_m4;
-       $output_rules .= &file_contents ('remake');
+       $output_rules .= &file_contents_with_transform ('s,address@hidden@,'
+                                                       . $configure_ac
+                                                       . ',;',
+                                                       'remake');
        &examine_variable ('CONFIG_STATUS_DEPENDENCIES');
        &examine_variable ('CONFIGURE_DEPENDENCIES');
        $top_reldir = '';
@@ -3124,6 +3128,7 @@
            $xform .= 's,address@hidden@,' . "${ch_sans_dir}" . ',;';
            $xform .= 's,address@hidden@,' . "${one_fullname}" . ',;';
            $xform .= 's,address@hidden@,' . "${stamp_dir}${stamp_name}" . ',;';
+           $xform .= 's,address@hidden@,' . "${configure_ac}" . ',;';
 
            $output_rules .= &file_contents_with_transform ($xform,
                                                            'remake-hdr');
diff -Naru automake-1.4-p3.orig/remake-hdr.am automake-1.4-p3/remake-hdr.am
--- automake-1.4-p3.orig/remake-hdr.am  Mon Jan 11 22:46:49 1999
+++ automake-1.4-p3/remake-hdr.am       Sun Jun 10 05:48:40 2001
@@ -36,7 +36,7 @@
                rm -f $(srcdir)/@address@hidden; \
                $(MAKE) $(srcdir)/@address@hidden; \
        else :; fi
-$(srcdir)/@address@hidden: $(top_srcdir)/configure.in $(ACLOCAL_M4) @FILES@
+$(srcdir)/@address@hidden: $(top_srcdir)/@CONFIGURE_AC@ $(ACLOCAL_M4) @FILES@
        cd $(top_srcdir) && $(AUTOHEADER)
 ## We used to try to get a real timestamp here.  But the fear is that
 ## that will cause unnecessary cvs conflicts
diff -Naru automake-1.4-p3.orig/remake.am automake-1.4-p3/remake.am
--- automake-1.4-p3.orig/remake.am      Sun Oct  4 03:26:51 1998
+++ automake-1.4-p3/remake.am   Sun Jun 10 05:56:36 2001
@@ -17,8 +17,8 @@
 ## 02111-1307, USA.
 
 ## Explicitly look in srcdir for benefit of non-GNU makes.
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+config.status: $(srcdir)/@CONFIGURE_AC@ $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
 ## Explicitly look in srcdir for benefit of non-GNU makes.
-$(srcdir)/configure: @address@hidden(srcdir)/configure.in $(ACLOCAL_M4) 
$(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: @address@hidden(srcdir)/@CONFIGURE_AC@ $(ACLOCAL_M4) 
$(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
diff -Naru automake-1.4-p3.orig/texi-vers.am automake-1.4-p3/texi-vers.am
--- automake-1.4-p3.orig/texi-vers.am   Fri Jan 15 02:54:37 1999
+++ automake-1.4-p3/texi-vers.am        Sun Jun 10 05:49:05 2001
@@ -18,9 +18,9 @@
 $(srcdir)/@VTEXI@: @address@hidden@VTI@
        @:
 
-## Depend on configure.in so that version number updates cause a
+## Depend on configure.(ac|in) so that version number updates cause a
 ## rebuild.
-$(srcdir)/address@hidden@: @TEXI@ $(top_srcdir)/configure.in
+$(srcdir)/address@hidden@: @TEXI@ $(top_srcdir)/@CONFIGURE_AC@
        @echo "@set UPDATED `$(SHELL) @address@hidden 
$(srcdir)/@address@hidden" > @address@hidden
        @echo "@set EDITION $(VERSION)" >> @address@hidden
        @echo "@set VERSION $(VERSION)" >> @address@hidden