forked from pool/automake
c7783a2275
Bugs fixed: - Vala files with '.vapi' extension are now recognized and handled correctly again. See automake bug#11222. - Vala support again works for projects that contain some program built from '.vala' (and possibly '.c') sources and some other program built from '.c' sources *only*. New in 1.11.4: * WARNING: Future backward-incompatibilities! - The support for the "obscure" multilib feature has been deprecated, and will be moved out of the automake core in the next major Automake release (1.12). - The support for ".log -> .html" conversion and the check-html and recheck-html targets will be removed in the next major Automake release (1.12). - The obsolescent AM_WITH_REGEX macro has been deprecated (since the GNU rx library has been decommissioned), and will be removed in the next major Automake release (1.12). - The 'lzma' compression format for distribution archives has been deprecated in favor of `xz' and `lzip', and will be removed in the next major Automake release (1.12). - The '--acdir' option of aclocal is deprecated, and will probably be removed in the next major Automake release (1.12). - The exact order in which the directories in the aclocal macro search path are looked up is probably going to be changed in the next Automake release (1.12). - The Automake support for automatic de-ANSI-fication will be removed in the next major Automake release (1.12). - Starting from the next Automake release (1.12), warnings in the `extra-portability' category will be enabled by `-Wall' (right OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=10
21 lines
703 B
Diff
21 lines
703 B
Diff
Index: automake.in
|
|
===================================================================
|
|
--- automake.in.orig 2012-04-13 16:46:00.000000000 +0200
|
|
+++ automake.in 2012-04-18 11:35:58.420388812 +0200
|
|
@@ -7878,12 +7878,14 @@ sub require_file_internal ($$$@)
|
|
my $fullfile = "$dir/$file";
|
|
my $found_it = 0;
|
|
my $dangling_sym = 0;
|
|
+ my $thisdir = dirname ($fullfile);
|
|
+ my $thisfile = basename ($fullfile);
|
|
|
|
if (-l $fullfile && ! -f $fullfile)
|
|
{
|
|
$dangling_sym = 1;
|
|
}
|
|
- elsif (dir_has_case_matching_file ($dir, $file))
|
|
+ elsif (dir_has_case_matching_file ($thisdir, $thisfile))
|
|
{
|
|
$found_it = 1;
|
|
maybe_push_required_file ($dir, $file, $fullfile);
|