summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Weigelt, metux ITS <metuxitservice@googlemail.com>2012-11-17 11:12:31 +0100
committerAndras Timar <atimar@suse.com>2012-11-17 10:21:56 +0000
commitc1caa1dca8dfca3f28a23e861a47a619753804ef (patch)
tree45f5631fdbbd6fa5919b0658f4927bdada2ac893
parent30bd9fbd9317aeee15edbf98e50be59236c60a67 (diff)
autogen.sh: support for default distro config
Always try to read distro-configs/default.conf (if existing) before any option parsing. That way, downstreams (distros, etc) can just place there site config into the tree without having to pass any additional options to autogen.sh, and even automatic invocations will always have the right parameters. Change-Id: Ic5bf68adc719476d374cf03e31e054b69c931b72 Reviewed-on: https://gerrit.libreoffice.org/1096 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
-rwxr-xr-xautogen.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/autogen.sh b/autogen.sh
index 663a4ed408ba..c5fb99c30144 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -103,6 +103,12 @@ if (!@ARGV) {
@cmdline_args = @ARGV;
}
+my $default_config = "distro-configs/default.conf";
+if (-f $default_config) {
+ print STDERR "Reading default config file: $default_config\n";
+ push @args, read_args ($default_config);
+}
+
my @args;
for my $arg (@cmdline_args) {
if ($arg eq '--clean') {