* autoscan.in (&scan_file): Skip FILE if there is FILE.in.

From Jens Petersen.

diff --git a/ChangeLog b/ChangeLog
index bd21b45178dc44d1cc456fcaac191389cbaa5dc0..d3dd325f5a2b2ef5e9e6c3ed24b883a9a824715a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+2001-07-04  Akim Demaille  <akim@epita.fr>
+
+       * autoscan.in (&scan_file): Skip FILE if there is FILE.in.
+       From Jens Petersen.
+
 2001-07-03  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Specify CONFIG_FILES
        etc. in the log.
-       
+
 2001-07-03  Akim Demaille  <akim@epita.fr>
 
        * acheaders.m4 (AC_CHECK_HEADER): When INCLUDES are set, use the

diff --git a/autoscan.in b/autoscan.in
index d12dea70e23b93b220fe4addccf25fa05c7a221d..c65e0a866c48d85252eee3c3f822a64a53264fb8 100644 (file)
--- a/autoscan.in
+++ b/autoscan.in
@@ -386,27 +386,25 @@ sub scan_sh_file ($)
 # the current directory of the walk through.
 sub scan_file ()
 {
+  # Wanted only if there is no corresponding FILE.in.
+  return
+    if -f "$_.in";
+
   # Save $_ as Find::File requires it to be preserved.
   my $underscore = $_;
 
   # Strip a useless leading `./'.
   $File::Find::name =~ s,^\./,,;
 
-  if (/^.*\.[chlymC]$/ || /^.*\.cc$/)
+  if (/\.[chlymC](\.in)?$/ || /\.cc(\.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$/)
+  elsif (/^[Mm]akefile(\.in)?$/ || /^GNUmakefile(\.in)?$/)
     {
       scan_makefile ($_);
     }
-  elsif (/^.*\.sh$/)
+  elsif (/\.sh(\.in)?$/)
     {
       scan_sh_file ($_);
     }

diff --git a/bin/autoscan.in b/bin/autoscan.in
index d12dea70e23b93b220fe4addccf25fa05c7a221d..c65e0a866c48d85252eee3c3f822a64a53264fb8 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -386,27 +386,25 @@ sub scan_sh_file ($)
 # the current directory of the walk through.
 sub scan_file ()
 {
+  # Wanted only if there is no corresponding FILE.in.
+  return
+    if -f "$_.in";
+
   # Save $_ as Find::File requires it to be preserved.
   my $underscore = $_;
 
   # Strip a useless leading `./'.
   $File::Find::name =~ s,^\./,,;
 
-  if (/^.*\.[chlymC]$/ || /^.*\.cc$/)
+  if (/\.[chlymC](\.in)?$/ || /\.cc(\.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$/)
+  elsif (/^[Mm]akefile(\.in)?$/ || /^GNUmakefile(\.in)?$/)
     {
       scan_makefile ($_);
     }
-  elsif (/^.*\.sh$/)
+  elsif (/\.sh(\.in)?$/)
     {
       scan_sh_file ($_);
     }