[Libreoffice-commits] .: autogen.sh

[Libreoffice Gerrit user]

 autogen.sh |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit c1caa1dca8dfca3f28a23e861a47a619753804ef
Author: Enrico Weigelt, metux ITS <metuxitservice at googlemail.com>
Date:   Sat Nov 17 11:12:31 2012 +0100

    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 at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/autogen.sh b/autogen.sh
index 663a4ed..c5fb99c 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') {