autoscan &wanted

[Jens Petersen]

Below is patch to improve wanted in `autoscan' so that it
uses "<filename>.in" instead of "<filename>" when
"<filename>.in" exists.

Jens


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

        * autoscan.in (wanted): If <filename>.in exists then use it
        instead of <filename>.  This 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.53
diff -u -r1.53 autoscan.in
--- autoscan.in 2001/06/25 06:15:07     1.53
+++ autoscan.in 2001/07/02 07:44:30
@@ -255,25 +255,23 @@
   # Strip a useless leading `./'.
   $name =~ s,^\./,,;
 
-  if (/^.*\.[chlymC]$/ || /^.*\.cc$/)
+  if (! -f "$_.in")
     {
-      push (@cfiles, $name);
-    }
-  elsif (/^[Mm]akefile$/ || /^GNUmakefile$/)
-    {
-      # Wanted only if there is no corresponding Makefile.in.
-      # Using Find, $_ contains the current filename with the current
-      # directory of the walk through.
-      push (@makefiles, $name)
-       if ! -f "$_.in";
-    }
-  elsif (/^[Mm]akefile\.in$/)
-    {
-      push (@makefiles, $name);
-    }
-  elsif (/^.*\.sh$/)
-    {
-      push (@shfiles, $name);
+     if (/^.*\.[chlymC](\.in)?$/ || /^.*\.cc$/)
+     {
+       push (@cfiles, $name);
+     }
+     elsif (/^[Mm]akefile(\.in)?$/ || /^GNUmakefile$/)
+     {
+       # Wanted only if there is no corresponding Makefile.in.
+       # Using Find, $_ contains the current filename with the current
+       # directory of the walk through.
+       push (@makefiles, $name);
+     }
+     elsif (/^.*\.sh(\.in)?$/)
+     {
+       push (@shfiles, $name);
+     }
     }
 }