5 files changed, 8 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh
index c83ad8c0b397..7d57e13203f9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -57,7 +57,7 @@ sub invalid_distro($$)
 }
 
 my @cmdline_args = ();
-if (!@ARGV) {
+if (@ARGV == 0) {
     my $lastrun = "autogen.lastrun";
     @cmdline_args = read_args ($lastrun) if (-f $lastrun);
 } else {
@@ -91,12 +91,14 @@ $aclocal_flags = "-I ./m4/mac" if (($aclocal_flags eq "") && ($system eq 'Darwin
 $ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin'));
 
 system ("aclocal $aclocal_flags") && die "Failed to run aclocal";
+unlink ("configure");
 system ("autoconf") && die "Failed to run autoconf";
+die "failed to generate configure" if (! -x "configure");
 
 if (defined $ENV{NOCONFIGURE}) {
     print "Skipping configure process.";
 } else {
-    if ($#cmdline_args > 0) {
+    if (@ARGV > 0) {
     print "writing args to autogen.lastrun\n";
     my $fh;
     open ($fh, ">autogen.lastrun") || die "can't open autogen.lastrun: $!";
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index cbd1dc74f009..42a061b0cecc 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -1,4 +1,4 @@
---with-vendor=\"The Document Foundation\"
+--with-vendor="The Document Foundation"
 --with-system-dicts
 --without-unix-wrapper
 --without-system-zlib
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 70e052a2eae3..ee630b4a8847 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,4 +1,4 @@
---with-vendor=\"The Document Foundation\"
+--with-vendor="The Document Foundation"
 --enable-opengl
 --enable-hids
 --enable-binfilter
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 0ef5188006c6..bffb484603cd 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -1,4 +1,4 @@
---with-vendor=\"The Document Foundation\"
+--with-vendor="The Document Foundation"
 --without-system-mesa-headers
 --without-junit
 --without-helppack-integration
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index a186797027db..8e7d99ec5d67 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -1,4 +1,4 @@
---with-vendor=\"The Document Foundation\"
+--with-vendor="The Document Foundation"
 --without-agfa-monotype-fonts
 --with-java-target-version=1.5
 --enable-hids