From 47bca2f06434346b556d4aa14b16770e0ae990ab Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 8 Apr 2011 13:28:48 +0300 Subject: Don't worry if there is no distro-configs/Foo.conf The --with-distro options might come from bin/build-ooo in a "build" style build, and in that case, the relevant configure options are already on the command line, too. --- autogen.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index 955d04ef5610..fcef75a5b2bf 100755 --- a/autogen.sh +++ b/autogen.sh @@ -44,8 +44,8 @@ sub read_args($) sub invalid_distro($$) { my ($config, $distro) = @_; - print STDERR "can't find distro option set: $config\n"; - print STDERR "valid values are:\n"; + print STDERR "Can't find distro option set: $config\nThis is not necessarily a problem.\n"; + print STDERR "Distros with distro option sets are:\n"; my $dirh; opendir ($dirh, "distro-configs"); while (($_ = readdir ($dirh))) { @@ -53,7 +53,6 @@ sub invalid_distro($$) print STDERR "\t$1\n"; } closedir ($dirh); - exit (1); } my @cmdline_args = (); @@ -72,8 +71,9 @@ for my $arg (@cmdline_args) { my $config = "distro-configs/$1.conf"; if (! -f $config) { invalid_distro ($config, $1); - } - push @args, read_args ($config); + } else { + push @args, read_args ($config); + } } else { push @args, $arg; } -- cgit