[jhbuild] autotools: finish killing off ACLOCAL_FLAGS

[Ryan Lortie <desrt src gnome org>]

commit 62a9cd179b6de5e808f9a7b6b45625bec952c38b
Author: Ryan Lortie <desrt desrt ca>
Date:   Sat Jan 17 14:45:07 2015 -0500

    autotools: finish killing off ACLOCAL_FLAGS
    
    We don't even set ACLOCAL_FLAGS anymore, so remove the special case from
    the autotools modtype for dealing with it being set.  Remove the mention
    from the doc as well.
    
    Finally, stop using it in our own Makefile.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=634617

 Makefile.am                   |    2 --
 doc/C/index.docbook           |    5 -----
 jhbuild/modtypes/autotools.py |   13 -------------
 3 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 62396cd..4c506da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
 SUBDIRS = po examples scripts triggers jhbuild buildbot
 
 if DOC_INSTALLATION_ENABLED
diff --git a/doc/C/index.docbook b/doc/C/index.docbook
index e82bda0..5053654 100644
--- a/doc/C/index.docbook
+++ b/doc/C/index.docbook
@@ -2296,11 +2296,6 @@ Optional packages: (JHBuild will build the missing packages)
               handle the case when the environment variable is initially empty
               (having a stray colon at the beginning or end of an environment
               variable can have unexpected consequences).</para>
-
-            <para><function>addpath</function> has special handling for the
-              <envar>ACLOCAL_FLAGS</envar> environment variable, which expects
-              paths to be listed in the form <literal>-I
-              <replaceable>pathname</replaceable></literal>.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index 2e7380a..60aff1b 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -219,19 +219,6 @@ class AutogenModule(MakeModule, DownloadableModule):
         except:
             pass
 
-        if self.autogen_sh == 'autoreconf':
-            # 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', '-fi'], cwd=srcdir,
-                    extra_env=extra_env)
-            os.chmod(os.path.join(srcdir, 'configure'), 0755)
-
         buildscript.execute(cmd, cwd = builddir, extra_env = self.extra_env)
     do_configure.depends = [PHASE_CHECKOUT]
     do_configure.error_phases = [PHASE_FORCE_CHECKOUT,