strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lode: make sure LODE_HOME/opt/bin is in the PATH for aclocal

Browse source 
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@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Norbert Thiebaud 2015-12-29 13:32:18 -06:00
parent fe37d93a11
commit 4c23184a11
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
autogen.sh
View file

@ -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";