[Libreoffice-commits] .: autogen.sh distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf

[Michael Meeks]

 autogen.sh                            |    6 ++++--
 distro-configs/LibreOfficeLinux.conf  |    2 +-
 distro-configs/LibreOfficeMacOSX.conf |    2 +-
 distro-configs/LibreOfficeWin32.conf  |    2 +-
 distro-configs/LibreOfficeWin64.conf  |    2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit fb4d138b60b2bfd0f7164a2070eb50cb99dbb6e2
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Apr 7 13:27:23 2011 +0100

    check more carefully for configure generation, and fix quoting of vendors

diff --git a/autogen.sh b/autogen.sh
index 642d523..7642e54 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 cbd1dc7..42a061b 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 70e052a..ee630b4 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 0ef5188..bffb484 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 a186797..8e7d99e 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