[gobject-introspection/wip/nonrecursive-make: 5/5] scanner: When running uninstalled, import from current directory

[Colin Walters <walters src gnome org>]

commit 19469123e25c95084a606930021397f7d5c7bd54
Author: Colin Walters <walters verbum org>
Date:   Tue Nov 9 10:12:48 2010 -0500

    scanner: When running uninstalled, import from current directory
    
    The _giscanner.so will be dropped in the toplevel builddir, not
    giscanner/.

 giscanner/xmlwriter.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py
index 6ba1e6a..a418cc4 100755
--- a/giscanner/xmlwriter.py
+++ b/giscanner/xmlwriter.py
@@ -20,6 +20,8 @@
 
 from __future__ import with_statement
 
+import os
+
 from contextlib import contextmanager
 from cStringIO import StringIO
 from xml.sax.saxutils import escape, quoteattr
@@ -68,7 +70,10 @@ def collect_attributes(tag_name, attributes, self_indent,
 
 
 with LibtoolImporter(None, None):
-    from giscanner._giscanner import collect_attributes
+    if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
+        from _giscanner import collect_attributes
+    else:
+        from giscanner._giscanner import collect_attributes
 
 
 class XMLWriter(object):