[jhbuild] config: set ACLOCAL_PATH

[Ryan Lortie <ryanl src gnome org>]

commit b89b1beef1c753ae0d054646ee5e9c25565a0e23
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Feb 13 13:31:56 2012 -0500

    config: set ACLOCAL_PATH
    
    automake 1.11.2 supports ACLOCAL_PATH.  This will eventually allow us to
    drop our use of ACLOCAL_FLAGS (which causes us much awkwardness).
    
    For now, we support both.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=634617

 jhbuild/commands/sanitycheck.py |   12 +++---------
 jhbuild/config.py               |    4 ++++
 2 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/jhbuild/commands/sanitycheck.py b/jhbuild/commands/sanitycheck.py
index 9cc51a1..3af80fa 100644
--- a/jhbuild/commands/sanitycheck.py
+++ b/jhbuild/commands/sanitycheck.py
@@ -26,16 +26,10 @@ from jhbuild.utils.cmds import get_output, check_version
 from jhbuild.errors import UsageError, CommandError
 
 def get_aclocal_path():
+    # drop empty paths, including the case where ACLOCAL_PATH is unset
+    path = [x for x in os.environ.get('ACLOCAL_PATH', '').split(':') if x]
     data = get_output(['aclocal', '--print-ac-dir'])
-    path = [data[:-1]]
-    env = os.environ.get('ACLOCAL_FLAGS', '').split()
-    i = 0
-    while i < len(env):
-        if env[i] == '-I':
-            path.append(env[i+1])
-            i = i + 2
-        else:
-            i = i + 1
+    path.append(data[:-1])
     return path
 
 def inpath(filename, path):
diff --git a/jhbuild/config.py b/jhbuild/config.py
index c5b5e5f..e32d862 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -421,6 +421,10 @@ class Config:
         gstregistry = os.path.join(self.prefix, '_jhbuild', 'gstreamer.registry')
         addpath('GST_REGISTRY', gstregistry)
 
+        # ACLOCAL_PATH
+        aclocalpath = os.path.join(self.prefix, 'share', 'aclocal')
+        addpath('ACLOCAL_PATH', aclocalpath)
+
         # ACLOCAL_FLAGS
         aclocaldir = os.path.join(self.prefix, 'share', 'aclocal')
         if not os.path.exists(aclocaldir):