From: Akim Demaille <akim@epita.fr>
Date: Mon, 8 Oct 2001 11:53:16 +0000 (+0000)
Subject: * automake.in (scan_autoconf_files): Use find_configure_ac from
X-Git-Tag: Release-1-5b~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b678699ccf60f892ee017f0a821aba9c120fb662;p=thirdparty%2Fautomake.git

* automake.in (scan_autoconf_files): Use find_configure_ac from
General.
---

diff --git a/ChangeLog b/ChangeLog
index 23670a4b7..547c47230 100644
--- 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 14c15543d..66af8d8cf 100755
--- 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;