[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
88-stricter-vars.patch
From: |
Akim Demaille |
Subject: |
88-stricter-vars.patch |
Date: |
Wed, 28 Feb 2001 11:01:35 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in ($am_relative_dir): Global.
(&initialize_per_input): Init it.
(%make_list, @make_input_list): My them from
(&scan_autoconf_files): here.
(&require_file_internal): Mying changes.
Index: automake.in
--- automake.in Tue, 27 Feb 2001 23:30:16 +0100 akim (am/f/39_automake.i 1.95
755)
+++ automake.in Tue, 27 Feb 2001 23:42:05 +0100 akim (am/f/39_automake.i 1.95
755)
@@ -469,6 +469,9 @@
# Eg for src/Makefile.in, this is "src".
my $relative_dir;
+# Same but wrt Makefile.am.
+my $am_relative_dir;
+
# This holds a list of files that are included in the
# distribution.
my %dist_common;
@@ -656,6 +659,9 @@ sub initialize_per_input ()
# Eg for src/Makefile.in, this is "src".
$relative_dir = '';
+ # Same but wrt Makefile.am.
+ $am_relative_dir = '';
+
# This holds a list of files that are included in the
# distribution.
%dist_common = ();
@@ -4381,6 +4387,8 @@ sub handle_minor_options
################################################################
+my %make_list;
+my @make_input_list;
# &scan_autoconf_config_files ($CONFIG-FILES)
# -------------------------------------------
# Study $CONFIG-FILES which is the first argument to AC_CONFIG_FILES
@@ -4833,10 +4841,6 @@ sub scan_autoconf_files
# that won't always be the case.
%libsources = ();
- # Watchout: these guys need dynamic scope!
- local %make_list;
- local @make_input_list;
-
warn "$me: both \`configure.ac' and \`configure.in' present:"
. " ignoring \`configure.in'\n"
if -f 'configure.ac' && -f 'configure.in';
@@ -7342,29 +7346,34 @@ sub maybe_push_required_file
}
}
-# Verify that the file must exist in the current directory. Usage:
-# require_file (isconfigure, line_number, strictness, file) strictness
-# is the strictness level at which this file becomes required. Must
-# set require_file_paths before calling this function.
+
+# &require_file_internal ($IS_CONFIGURE, $LINE, $MYSTRICT, @FILES)
+# ----------------------------------------------------------------
+# Verify that the file must exist in the current directory.
+# $MYSTRICT is the strictness level at which this file becomes required.
+#
+# Must set require_file_paths before calling this function.
# require_file_paths is set to hold a single directory (the one in
# which the first file was found) before return.
sub require_file_internal
{
my ($is_configure, $line, $mystrict, @files) = @_;
- my $fullfile;
- my ($found_it, $dangling_sym, $errfile, $errdir);
- my $save_dir;
foreach my $file (@files)
{
+ my $fullfile;
+ my $errfile;
+ my $save_dir;
+
# If we've already looked for it, we're done.
next if defined $require_file_found{$file};
$require_file_found{$file} = 1;
- $found_it = 0;
- $dangling_sym = 0;
+ my $found_it = 0;
+ my $dangling_sym = 0;
foreach my $dir (@require_file_paths)
{
+ my $errdir;
if ($dir eq '.')
{
$fullfile = $relative_dir . "/" . $file;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 88-stricter-vars.patch,
Akim Demaille <=