[jhbuild] [autotools] craft ACLOCAL and pass it to autoreconf

[Frederic Peters <fpeters src gnome org>]

commit 0d58c65887bb779b054b564eaa5764dc56d719fd
Author: Frédéric Péters <fpeters 0d be>
Date:   Sat Aug 8 12:03:44 2009 +0200

    [autotools] craft ACLOCAL and pass it to autoreconf
    
    autoreconf doesn't honour ACLOCAL_FLAGS, so we craft an ACLOCAL environment
    variable and pass it to autoreconf when called. (GNOME bug 590064)

 jhbuild/modtypes/autotools.py |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index f55c15f..e5b17a4 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -148,8 +148,16 @@ class AutogenModule(Package, DownloadableModule):
         cmd = template % vars
 
         if self.autogen_sh == 'autoreconf':
-            buildscript.execute(['autoreconf', '-i'], cwd = builddir,
-                    extra_env = self.extra_env)
+            # autoreconf doesn't honour ACLOCAL_FLAGS, therefore we pass
+            # a crafted ACLOCAL variable.  (GNOME bug 590064)
+            extra_env = {}
+            if self.extra_env:
+                extra_env = self.extra_env.copy()
+            extra_env['ACLOCAL'] = ' '.join((
+                extra_env.get('ACLOCAL', os.environ.get('ACLOCAL', 'aclocal')),
+                extra_env.get('ACLOCAL_FLAGS', os.environ.get('ACLOCAL_FLAGS', ''))))
+            buildscript.execute(['autoreconf', '-i'], cwd=builddir,
+                    extra_env=extra_env)
             cmd = cmd.replace('autoreconf', 'configure')
             cmd = cmd.replace('--enable-maintainer-mode', '')