[Libreoffice-commits] .: autogen.sh

[Tor Lillqvist]

 autogen.sh |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 924a077cb78b94896a2c6ac294d35e95e4b963e8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Jul 3 10:52:21 2011 +0300

    Allow use of $ACLOCAL to override the name aclocal
    
    Useful for instance when only aclocal-1.10 exists. But, systems that
    are broken like that will have lots of more problems, too. It is just
    a (sad?) fact that building LO on anything except those platforms that
    people work on constantly will require lots of tweaks. Many of the
    assumptions in various solenv .mk files for rare platforms are rather
    outdated and/or arbitrary, assuming a certain mix of more or less
    "official" additional tools.

diff --git a/autogen.sh b/autogen.sh
index 4d50370..de4eb4a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,6 +11,9 @@ sub clean()
     print "cleaned the build tree\n";
 }
 
+# Alloc $ACLOCAL to specify which aclocal to use
+my $aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
+
 # check we have various vital tools
 sub sanity_checks($)
 {
@@ -20,7 +23,7 @@ sub sanity_checks($)
       (
        'pkg-config' => "pkg-config is required to be installed",
        'autoconf'   => "autoconf is required",
-       'aclocal'    => "aclocal is required",
+       $aclocal     => "$aclocal is required",
       );
 
     for my $elem (@path) {
@@ -119,7 +122,7 @@ $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";
+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");