* automake.in (scan_autoconf_files): Use find_configure_ac from

General.

diff --git a/ChangeLog b/ChangeLog
index 23670a4b771297b06461823d27aee49de469bcd4..547c47230a30d4dcb01aa9c57c9cc93789dc3865 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-05  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (scan_autoconf_files): Use find_configure_ac from
+       General.
+
 2001-10-02  Akim Demaille  <akim@epita.fr>
 
        * lib/Automake/Struct.pm: Update from Autoconf.

diff --git a/automake.in b/automake.in
index 14c15543d6b7e4ba57801732afca6555a9e2f1ec..66af8d8cfc57a93ea34a075c65127ed70a8b572f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4851,13 +4851,7 @@ sub scan_autoconf_files
     # that won't always be the case.
     %libsources = ();
 
-    warn "$me: both `configure.ac' and `configure.in' present:"
-         . " ignoring `configure.in'\n"
-        if -f 'configure.ac' && -f 'configure.in';
-    $configure_ac = 'configure.in'
-        if -f 'configure.in';
-    $configure_ac = 'configure.ac'
-        if -f 'configure.ac';
+    $configure_ac = find_configure_ac;
     die "$me: `configure.ac' or `configure.in' is required\n"
         if !$configure_ac;