mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Meeks
2011-04-07 13:27:23 +01:00
parent b9bc97d455
commit 396fd9fc61
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
autogen.sh
View File

@@ -57,7 +57,7 @@ sub invalid_distro($$)
} }
my @cmdline_args = (); my @cmdline_args = ();
if (!@ARGV) { if (@ARGV == 0) {
my $lastrun = "autogen.lastrun"; my $lastrun = "autogen.lastrun";
@cmdline_args = read_args ($lastrun) if (-f $lastrun); @cmdline_args = read_args ($lastrun) if (-f $lastrun);
} else { } 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')); $ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin'));
system ("aclocal $aclocal_flags") && die "Failed to run aclocal"; system ("aclocal $aclocal_flags") && die "Failed to run aclocal";
unlink ("configure");
system ("autoconf") && die "Failed to run autoconf"; system ("autoconf") && die "Failed to run autoconf";
die "failed to generate configure" if (! -x "configure");
if (defined $ENV{NOCONFIGURE}) { if (defined $ENV{NOCONFIGURE}) {
print "Skipping configure process."; print "Skipping configure process.";
} else { } else {
if ($#cmdline_args > 0) { if (@ARGV > 0) {
print "writing args to autogen.lastrun\n"; print "writing args to autogen.lastrun\n";
my $fh; my $fh;
open ($fh, ">autogen.lastrun") || die "can't open autogen.lastrun: $!"; open ($fh, ">autogen.lastrun") || die "can't open autogen.lastrun: $!";

2
distro-configs/LibreOfficeLinux.conf
View File

@@ -1,4 +1,4 @@
--with-vendor=\"The Document Foundation\" --with-vendor="The Document Foundation"
--with-system-dicts --with-system-dicts
--without-unix-wrapper --without-unix-wrapper
--without-system-zlib --without-system-zlib

2
distro-configs/LibreOfficeMacOSX.conf
View File

@@ -1,4 +1,4 @@
--with-vendor=\"The Document Foundation\" --with-vendor="The Document Foundation"
--enable-opengl --enable-opengl
--enable-hids --enable-hids
--enable-binfilter --enable-binfilter

2
distro-configs/LibreOfficeWin32.conf
View File

@@ -1,4 +1,4 @@
--with-vendor=\"The Document Foundation\" --with-vendor="The Document Foundation"
--without-system-mesa-headers --without-system-mesa-headers
--without-junit --without-junit
--without-helppack-integration --without-helppack-integration

2
distro-configs/LibreOfficeWin64.conf
View File

@@ -1,4 +1,4 @@
--with-vendor=\"The Document Foundation\" --with-vendor="The Document Foundation"
--without-agfa-monotype-fonts --without-agfa-monotype-fonts
--with-java-target-version=1.5 --with-java-target-version=1.5
--enable-hids --enable-hids