mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don't worry if there is no distro-configs/Foo.conf"

Browse Source 
This reverts commit 47bca2f064.  I worry very much
when some --with-distro=foo due to a typo doesn't do what I'd expect, and the
non-fatal error message scrolled by so quickly nobody would notice.

Conflicts:
	autogen.sh

Change-Id: I8e0938e28e5aa23b59c82bbd10db0018e32a44dd
Reviewed-on: https://gerrit.libreoffice.org/37701
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Stephan Bergmann
2017-05-17 10:28:07 +02:00
parent 6a84b2b5d0
commit d21f97659e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
autogen.sh
View File

@@ -123,9 +123,10 @@ sub show_distro_configs($$)
sub invalid_distro($$) sub invalid_distro($$)
{ {
my ($config, $distro) = @_; my ($config, $distro) = @_;
print STDERR "Can't find distro option set: $config\nThis is not necessarily a problem.\n"; print STDERR "Can't find distro option set: $config\n";
print STDERR "Distros with distro option sets are:\n"; print STDERR "Distros with distro option sets are:\n";
show_distro_configs("", "$src_path/distro-configs"); show_distro_configs("", "$src_path/distro-configs");
exit (1);
} }
# Avoid confusing "aclocal: error: non-option arguments are not accepted: '.../m4'." error message. # Avoid confusing "aclocal: error: non-option arguments are not accepted: '.../m4'." error message.
@@ -247,9 +248,8 @@ for my $arg (@cmdline_args) {
my $config = "$src_path/distro-configs/$1.conf"; my $config = "$src_path/distro-configs/$1.conf";
if (! -f $config) { if (! -f $config) {
invalid_distro ($config, $1); invalid_distro ($config, $1);
} else {
push @args, read_args ($config);
} }
push @args, read_args ($config);
} elsif ($arg =~ m/--best-effort$/) { } elsif ($arg =~ m/--best-effort$/) {
$option_checking = 'warn'; $option_checking = 'warn';
} else { } else {