[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Problems with the new Var code
From: |
Alexandre Duret-Lutz |
Subject: |
Re: Problems with the new Var code |
Date: |
Tue, 03 Jun 2003 23:10:01 +0200 |
User-agent: |
Gnus/5.090016 (Oort Gnus v0.16) Emacs/21.3 (gnu/linux) |
>>> "Tim" == Tim Van Holder <address@hidden> writes:
[...]
Tim> Maybe 'find_*' for the optional find, and 'require_*' for the
Tim> non-optional find?
Ok, I'm installing the following patch.
[...]
2003-06-03 Alexandre Duret-Lutz <address@hidden>
* 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.
Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.80
diff -u -r1.80 aclocal.in
--- aclocal.in 2 Jun 2003 23:34:58 -0000 1.80
+++ aclocal.in 3 Jun 2003 21:03:36 -0000
@@ -236,7 +236,7 @@
sub scan_configure ()
{
- find_configure_ac;
+ require_configure_ac;
open (CONFIGURE, $configure_ac)
|| die "aclocal: couldn't open `$configure_ac': $!\n";
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1462
diff -u -r1.1462 automake.in
--- automake.in 2 Jun 2003 23:34:58 -0000 1.1462
+++ automake.in 3 Jun 2003 21:03:40 -0000
@@ -5079,7 +5079,7 @@
# 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)
Index: lib/Automake/Configure_ac.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Configure_ac.pm,v
retrieving revision 1.1
diff -u -r1.1 Configure_ac.pm
--- lib/Automake/Configure_ac.pm 2 Jun 2003 23:34:59 -0000 1.1
+++ lib/Automake/Configure_ac.pm 3 Jun 2003 21:03:40 -0000
@@ -25,7 +25,7 @@
use vars qw (@ISA @EXPORT);
@ISA = qw (Exporter);
address@hidden = qw ($configure_ac &search_configure_ac &find_configure_ac);
address@hidden = qw ($configure_ac &find_configure_ac &require_configure_ac);
=head1 NAME
@@ -37,10 +37,10 @@
# 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 @@
use vars '$configure_ac';
-sub search_configure_ac ()
+sub find_configure_ac ()
{
if (-f 'configure.ac')
{
@@ -68,10 +68,10 @@
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;
}
--
Alexandre Duret-Lutz