* autoscan.pl (&find_configure_ac): New.

diff --git a/ChangeLog b/ChangeLog
index 5292188ec63cfd242e78562ac1bcc65f2ebcb03c..d2eaa62b663d0f3a04d317f02890d15b9befc53d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-21  Akim Demaille  <akim@epita.fr>
+
+       * autoscan.pl (&find_configure_ac): New.
+
 2001-02-20  Paul Martinolich <martinol@datasync.com>
 
        * autoscan.pl (check_configure_ac): Pretty missing macro warnings

diff --git a/autoscan.in b/autoscan.in
index 07cd709179e0f67da4720ad78f46a58db3f2d807..b5279ad0e25b8344fdde4c28790f942b9bf5e8e4 100644 (file)
--- a/autoscan.in
+++ b/autoscan.in
@@ -75,11 +75,11 @@ sub find_autoconf
   # We test "$dir/autoconf" in case we are in the build tree, in which case
   # the names are not transformed yet.
   foreach my $file ($ENV{"AUTOCONF"} || '',
-                "$dir/@autoconf-name@",
-                "$dir/autoconf",
-                "@bindir@/@autoconf-name@")
+                   "$dir/@autoconf-name@",
+                   "$dir/autoconf",
+                   "@bindir@/@autoconf-name@")
     {
-      if (-f $file)
+      if (-x $file)
        {
          $autoconf = $file;
          last;
@@ -88,6 +88,28 @@ sub find_autoconf
 }
 
 
+# $CONFIGURE_AC
+# &find_configure_ac ()
+# ---------------------
+sub find_configure_ac ()
+{
+  if (-f 'configure.ac')
+    {
+      if (-f 'configure.in')
+       {
+         warn "warning: `configure.ac' and `configure.in' both present.\n";
+         warn "warning: proceeding with `configure.ac'.\n";
+       }
+      return 'configure.ac';
+    }
+  elsif (-f 'configure.in')
+    {
+      return 'configure.in';
+    }
+  return;
+}
+
+
 # print_usage ()
 # --------------
 # Display usage (--help).
@@ -632,25 +654,15 @@ sub check_configure_ac ($)
 
 # Find the lib files and autoconf.
 find_autoconf;
-
+my $configure_ac = find_configure_ac;
 parse_args;
 init_tables;
 find ('.');
 scan_files;
 output ('configure.scan');
-
-if (-f 'configure.ac')
-  {
-    if (-f 'configure.in')
-      {
-       warn "warning: `configure.ac' and `configure.in' both present.\n";
-       warn "warning: proceeding with `configure.ac'.\n";
-      }
-    check_configure_ac ('configure.ac');
-  }
-elsif (-f 'configure.in')
+if ($configure_ac)
   {
-    check_configure_ac ('configure.in');
+    check_configure_ac ($configure_ac);
   }
 
 exit 0;

diff --git a/autoscan.pl b/autoscan.pl
index 07cd709179e0f67da4720ad78f46a58db3f2d807..b5279ad0e25b8344fdde4c28790f942b9bf5e8e4 100644 (file)
--- a/autoscan.pl
+++ b/autoscan.pl
@@ -75,11 +75,11 @@ sub find_autoconf
   # We test "$dir/autoconf" in case we are in the build tree, in which case
   # the names are not transformed yet.
   foreach my $file ($ENV{"AUTOCONF"} || '',
-                "$dir/@autoconf-name@",
-                "$dir/autoconf",
-                "@bindir@/@autoconf-name@")
+                   "$dir/@autoconf-name@",
+                   "$dir/autoconf",
+                   "@bindir@/@autoconf-name@")
     {
-      if (-f $file)
+      if (-x $file)
        {
          $autoconf = $file;
          last;
@@ -88,6 +88,28 @@ sub find_autoconf
 }
 
 
+# $CONFIGURE_AC
+# &find_configure_ac ()
+# ---------------------
+sub find_configure_ac ()
+{
+  if (-f 'configure.ac')
+    {
+      if (-f 'configure.in')
+       {
+         warn "warning: `configure.ac' and `configure.in' both present.\n";
+         warn "warning: proceeding with `configure.ac'.\n";
+       }
+      return 'configure.ac';
+    }
+  elsif (-f 'configure.in')
+    {
+      return 'configure.in';
+    }
+  return;
+}
+
+
 # print_usage ()
 # --------------
 # Display usage (--help).
@@ -632,25 +654,15 @@ sub check_configure_ac ($)
 
 # Find the lib files and autoconf.
 find_autoconf;
-
+my $configure_ac = find_configure_ac;
 parse_args;
 init_tables;
 find ('.');
 scan_files;
 output ('configure.scan');
-
-if (-f 'configure.ac')
-  {
-    if (-f 'configure.in')
-      {
-       warn "warning: `configure.ac' and `configure.in' both present.\n";
-       warn "warning: proceeding with `configure.ac'.\n";
-      }
-    check_configure_ac ('configure.ac');
-  }
-elsif (-f 'configure.in')
+if ($configure_ac)
   {
-    check_configure_ac ('configure.in');
+    check_configure_ac ($configure_ac);
   }
 
 exit 0;

diff --git a/bin/autoscan.in b/bin/autoscan.in
index 07cd709179e0f67da4720ad78f46a58db3f2d807..b5279ad0e25b8344fdde4c28790f942b9bf5e8e4 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -75,11 +75,11 @@ sub find_autoconf
   # We test "$dir/autoconf" in case we are in the build tree, in which case
   # the names are not transformed yet.
   foreach my $file ($ENV{"AUTOCONF"} || '',
-                "$dir/@autoconf-name@",
-                "$dir/autoconf",
-                "@bindir@/@autoconf-name@")
+                   "$dir/@autoconf-name@",
+                   "$dir/autoconf",
+                   "@bindir@/@autoconf-name@")
     {
-      if (-f $file)
+      if (-x $file)
        {
          $autoconf = $file;
          last;
@@ -88,6 +88,28 @@ sub find_autoconf
 }
 
 
+# $CONFIGURE_AC
+# &find_configure_ac ()
+# ---------------------
+sub find_configure_ac ()
+{
+  if (-f 'configure.ac')
+    {
+      if (-f 'configure.in')
+       {
+         warn "warning: `configure.ac' and `configure.in' both present.\n";
+         warn "warning: proceeding with `configure.ac'.\n";
+       }
+      return 'configure.ac';
+    }
+  elsif (-f 'configure.in')
+    {
+      return 'configure.in';
+    }
+  return;
+}
+
+
 # print_usage ()
 # --------------
 # Display usage (--help).
@@ -632,25 +654,15 @@ sub check_configure_ac ($)
 
 # Find the lib files and autoconf.
 find_autoconf;
-
+my $configure_ac = find_configure_ac;
 parse_args;
 init_tables;
 find ('.');
 scan_files;
 output ('configure.scan');
-
-if (-f 'configure.ac')
-  {
-    if (-f 'configure.in')
-      {
-       warn "warning: `configure.ac' and `configure.in' both present.\n";
-       warn "warning: proceeding with `configure.ac'.\n";
-      }
-    check_configure_ac ('configure.ac');
-  }
-elsif (-f 'configure.in')
+if ($configure_ac)
   {
-    check_configure_ac ('configure.in');
+    check_configure_ac ($configure_ac);
   }
 
 exit 0;