[Libreoffice-commits] core.git: autogen.sh

[Norbert Thiebaud]

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

New commits:
commit 4c23184a115b607f19a32134f8c91d6f9df61ade
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Dec 29 13:32:18 2015 -0600

    lode: make sure LODE_HOME/opt/bin is in the PATH for aclocal
    
    When using a LODE setup, LODE_HOME must be defined in the environment
    but setting LODE_HOME/opt/bin in the PATH is optional
    and really only necessary as a convinience to get the right
    'make' in the PATH.
    configure.ac has code do deal with the absence of LODE_HOME/opt/bin
    in the PATH but autogen.sh did not hence was failing in this
    case, not finding aclocal.
    
    Change-Id: I7a4449504dc539bb055798a6e1aea5268c5fb046
    Reviewed-on: https://gerrit.libreoffice.org/21003
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/autogen.sh b/autogen.sh
index f208f35..6c3856a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -127,6 +127,18 @@ chomp $system;
 
 sanity_checks ($system) unless($system eq 'Darwin');
 
+# If we are running in a LODE env, make sure we find the right aclocal
+# by making sure that LODE_HOME/opt/bin is in the PATH
+if (defined $ENV{LODE_HOME})
+{
+    my $lode_path = quotemeta "$ENV{LODE_HOME}/opt/bin";
+    if($ENV{PATH} !~ $lode_path)
+    {
+        $ENV{PATH}="$ENV{LODE_HOME}/opt/bin:$ENV{PATH}";
+        print STDERR "add LODE_HOME/opt/bin in PATH\n";
+    }
+}
+
 my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
 
 $aclocal_flags .= " -I $src_path/m4";