From 23a95de2bd66e4a40387cbe2a05e132ccb07bf49 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 9 Jun 2017 14:12:27 +0200 Subject: Fix autotools issues (#4463) Add ACLOCAL_PATH to libtool and pkg-config. Without this, aclocal can not find the .m4 files. --- var/spack/repos/builtin/packages/libtool/package.py | 4 ++++ var/spack/repos/builtin/packages/pkg-config/package.py | 2 ++ 2 files changed, 6 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libtool/package.py b/var/spack/repos/builtin/packages/libtool/package.py index ae706089c9..f0a7de3798 100644 --- a/var/spack/repos/builtin/packages/libtool/package.py +++ b/var/spack/repos/builtin/packages/libtool/package.py @@ -41,6 +41,10 @@ class Libtool(AutotoolsPackage): def _make_executable(self, name): return Executable(join_path(self.prefix.bin, name)) + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.append_path('ACLOCAL_PATH', + join_path(self.prefix.share, 'aclocal')) + def setup_dependent_package(self, module, dependent_spec): # Automake is very likely to be a build dependency, # so we add the tools it provides to the dependent module diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py index 0aa4bb9969..2e23aae3fe 100644 --- a/var/spack/repos/builtin/packages/pkg-config/package.py +++ b/var/spack/repos/builtin/packages/pkg-config/package.py @@ -51,6 +51,8 @@ class PkgConfig(AutotoolsPackage): files.""" spack_env.append_path('PKG_CONFIG_PATH', '/usr/lib64/pkgconfig') spack_env.append_path('PKG_CONFIG_PATH', '/usr/local/lib64/pkgconfig') + spack_env.append_path('ACLOCAL_PATH', + join_path(self.prefix.share, 'aclocal')) def configure_args(self): config_args = ['--enable-shared'] -- cgit v1.2.3-70-g09d2