From e03ca7eba0eb855d40871e6862f6abe19f9f0039 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sun, 7 Sep 2003 10:14:25 +0000 Subject: [PATCH] * aclocal.in (add_file): Remove useless filling of $output, probably left a after CVS conflict. This code is now in write_aclocal. --- ChangeLog | 3 +++ aclocal.in | 13 ------------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96da2053d..810244c3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-09-07 Alexandre Duret-Lutz + * aclocal.in (add_file): Remove useless filling of $output, probably + left a after CVS conflict. This code is now in write_aclocal. + * aclocal.in (configure_ac): Do not call require_configure_ac before parsing the options. * automake.in (configure_ac): Likewise. diff --git a/aclocal.in b/aclocal.in index c047ada2e..96e19685c 100644 --- a/aclocal.in +++ b/aclocal.in @@ -381,19 +381,6 @@ sub add_file ($) my $mtime = mtime $file; $greatest_mtime = $mtime if $greatest_mtime < $mtime; - # If the file to add looks like path outside the project, - # copy it to the output. - # The regex catches filenames starting with things like - # / \ c:\ ../ ./../ etc. - if ($file =~ m,^(?:(?:\w:)?[\\/]|(?:\.[\\/]+)*\.\.[\\/]),) - { - $output .= $file_contents{$file} . "\n"; - } - else - { - # Otherwise, simply include the file. - $output .= "m4_include([$file])\n"; - } my (@rlist); foreach (split ("\n", $file_contents{$file})) { -- 2.47.2