Re: autoscan &wanted

[Jens Petersen]

Akim Demaille <address@hidden> writes:

> Sorry, autoscan has changed :(  Could you submit your patch wrt this
> updated version?

Ok.  Here's a new version.

Jens


2001-07-04  Jens Petersen  <address@hidden>

        * autoscan.in (scan_file): If <filename>.in exists then use it
        instead of <filename>.  This also avoids for example getting
        AC_CONFIG_SRCDIR([config.h]) when config.h.in also exists.

Index: autoscan.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/autoscan.in,v
retrieving revision 1.55
diff -u -r1.55 autoscan.in
--- autoscan.in 2001/07/03 14:11:06     1.55
+++ autoscan.in 2001/07/04 03:04:21
@@ -392,23 +392,21 @@
   # Strip a useless leading `./'.
   $File::Find::name =~ s,^\./,,;
 
-  if (/^.*\.[chlymC]$/ || /^.*\.cc$/)
+  if (! -f "$_.in")
     {
-      scan_c_file ($_);
-    }
-  elsif (/^[Mm]akefile$/ || /^GNUmakefile$/)
-    {
-      # Wanted only if there is no corresponding Makefile.in.
-      scan_makefile ($_)
-       if ! -f "$_.in";
-    }
-  elsif (/^[Mm]akefile\.in$/)
-    {
-      scan_makefile ($_);
-    }
-  elsif (/^.*\.sh$/)
-    {
-      scan_sh_file ($_);
+      if (/^.*\.[chlymC](\.in)?$/ || /^.*\.cc(\.in)?$/)
+       {
+         scan_c_file ($_);
+       }
+      elsif (/^[Mm]akefile(\.in)?$/ || /^GNUmakefile$/)
+       {
+         # Wanted only if there is no corresponding Makefile.in.
+         scan_makefile ($_);
+       }
+      elsif (/^.*\.sh(\.in)?$/)
+       {
+         scan_sh_file ($_);
+       }
     }
 
   $_ = $underscore;