Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
	Makefile.in
	Repository.mk
	autogen.sh
	bin/lo-commit-stat
	configure.in
	distro-configs/LibreOfficeOpenBSD.conf
	distro-configs/LibreOfficeWin32.conf
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	scp2/source/ooo/module_langpack.ulf
	set_soenv.in
	solenv/bin/ooinstall
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/unxgcc.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/minor.mk
	solenv/inc/settings.mk
	tail_build/prj/makefile.mk

1 files changed, 9 insertions, 9 deletions

diff --git a/autogen.sh b/autogen.sh
index 7d57e13203f9..444d970e51d9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -44,20 +44,19 @@ 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)) {
+    while (($_ = readdir ($dirh))) {
     /(.*)\.conf$/ || next;
     print STDERR "\t$1\n";
     }
     closedir ($dirh);
-    exit (1);
 }
 
 my @cmdline_args = ();
-if (@ARGV == 0) {
+if (!@ARGV) {
     my $lastrun = "autogen.lastrun";
     @cmdline_args = read_args ($lastrun) if (-f $lastrun);
 } else {
@@ -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;
     }
@@ -98,8 +98,8 @@ die "failed to generate configure" if (! -x "configure");
 if (defined $ENV{NOCONFIGURE}) {
     print "Skipping configure process.";
 } else {
-    if (@ARGV > 0) {
-    print "writing args to autogen.lastrun\n";
+    if ($#cmdline_args > 0) {
+#   print "writing args to autogen.lastrun\n";
     my $fh;
     open ($fh, ">autogen.lastrun") || die "can't open autogen.lastrun: $!";
     for my $arg (@cmdline_args) {