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.

1 files changed, 5 insertions, 2 deletions

diff --git a/autogen.sh b/autogen.sh
index 4d5037062c36..de4eb4afe5c1 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");