autogen.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d21f97659e8ab8028deaa6d237caeeda088ddb1c
Author: Stephan Bergmann <[email protected]>
Date: Wed May 17 10:28:07 2017 +0200
Revert "Don't worry if there is no distro-configs/Foo.conf"
This reverts commit 47bca2f06434346b556d4aa14b16770e0ae990ab. 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 <[email protected]>
Tested-by: Jenkins <[email protected]>
diff --git a/autogen.sh b/autogen.sh
index bff17cd5b2b5..02c82a9708d0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -123,9 +123,10 @@ sub show_distro_configs($$)
sub invalid_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";
show_distro_configs("", "$src_path/distro-configs");
+ exit (1);
}
# 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";
if (! -f $config) {
invalid_distro ($config, $1);
- } else {
- push @args, read_args ($config);
}
+ push @args, read_args ($config);
} elsif ($arg =~ m/--best-effort$/) {
$option_checking = 'warn';
} else {
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
