[Libreoffice-commits] .: autogen.sh

[Tor Lillqvist]

 autogen.sh |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 266cae22633a97758a3272b9564846505bcced21
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Jul 3 17:05:14 2011 +0300

    Include environment variables already in autogen.sh's environment

diff --git a/autogen.sh b/autogen.sh
index de4eb4a..d0348b2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,8 +11,7 @@ sub clean()
     print "cleaned the build tree\n";
 }
 
-# Alloc $ACLOCAL to specify which aclocal to use
-my $aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
+my $aclocal;
 
 # check we have various vital tools
 sub sanity_checks($)
@@ -108,6 +107,14 @@ for my $arg (@cmdline_args) {
         push @args, $arg;
     }
 }
+for my $arg (@args) {
+    if ($arg =~ /^([A-Z]+)=(.*)/) {
+        $ENV{$1} = $2;
+    }
+}
+
+# Alloc $ACLOCAL to specify which aclocal to use
+$aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
 
 system ("touch ChangeLog");