From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Tue, 3 Jun 2003 21:09:22 +0000 (+0000)
Subject: * lib/Automake/Configure_ac.pm
X-Git-Tag: Release-1-7b~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7be4b03a76a4cb39327f5e5ec137fc880528e11f;p=thirdparty%2Fautomake.git

* lib/Automake/Configure_ac.pm
(search_configure_ac, find_configure_ac): Rename as ...
(find_configure_ac, require_configure_ac): ... these.
* aclocal.in (scan_configure): Adjust call to require_configure_ac.
* automake.in (scan_autoconf_files): Likewise.
Suggested by Tim Van Holder.
---

diff --git a/ChangeLog b/ChangeLog
index 5ca59d88a..773d09ada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-06-03  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* lib/Automake/Configure_ac.pm
+	(search_configure_ac, find_configure_ac): Rename as ...
+	(find_configure_ac, require_configure_ac): ... these.
+	* aclocal.in (scan_configure): Adjust call to require_configure_ac.
+	* automake.in (scan_autoconf_files): Likewise.
+	Suggested by Tim Van Holder.
+
 	* alocal.in: Use Automake::Configure_ac.
 	($configure_ac): Delete.
 	(scan_configure): Adjust use of find_configure_ac;
diff --git a/aclocal.in b/aclocal.in
index a74d72803..3c87fdc12 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -236,7 +236,7 @@ sub parse_arguments (@)
 
 sub scan_configure ()
 {
-    find_configure_ac;
+    require_configure_ac;
 
     open (CONFIGURE, $configure_ac)
 	|| die "aclocal: couldn't open `$configure_ac': $!\n";
diff --git a/automake.in b/automake.in
index 2808db0b2..1a3b800ff 100755
--- a/automake.in
+++ b/automake.in
@@ -5079,7 +5079,7 @@ sub scan_autoconf_files
     # that won't always be the case.
     %libsources = ();
 
-    scan_autoconf_traces (find_configure_ac);
+    scan_autoconf_traces (require_configure_ac);
 
     # Set input and output files if not specified by user.
     if (! @input_files)
diff --git a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm
index 52d40b865..6798ba181 100644
--- a/lib/Automake/Configure_ac.pm
+++ b/lib/Automake/Configure_ac.pm
@@ -25,7 +25,7 @@ use Automake::ChannelDefs;
 use vars qw (@ISA @EXPORT);
 
 @ISA = qw (Exporter);
-@EXPORT = qw ($configure_ac &search_configure_ac &find_configure_ac);
+@EXPORT = qw ($configure_ac &find_configure_ac &require_configure_ac);
 
 =head1 NAME
 
@@ -37,10 +37,10 @@ Automake::Configure_ac - Locate configure.ac or configure.in.
 
   # Try to locate configure.in or configure.ac in the current
   # directory.  It may be absent.  Complain if both files exist.
-  my $filename = search_configure_ac;
+  my $filename = find_configure_ac;
 
   # Likewise, but bomb out if the file does not exist.
-  my $filename = find_configure_ac;
+  my $filename = require_configure_ac;
 
 In both cases, the name of the file found is also put in the
 C<$configure_ac> global variable.
@@ -49,7 +49,7 @@ C<$configure_ac> global variable.
 
 use vars '$configure_ac';
 
-sub search_configure_ac ()
+sub find_configure_ac ()
 {
   if (-f 'configure.ac')
     {
@@ -68,10 +68,10 @@ sub search_configure_ac ()
   return $configure_ac;
 }
 
-sub find_configure_ac ()
+sub require_configure_ac ()
 {
   fatal "`configure.ac' or `configure.in' is required"
-    unless search_configure_ac;
+    unless find_configure_ac;
   return $configure_ac;
 }