Revert earlier libtool change, there's no need

to execute through libtool since libtool would have
created a wrapper if it was found at link time

svn path=/trunk/; revision=969

diff --git a/ChangeLog b/ChangeLog
index 698d061..e6f8b29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,11 +2,6 @@
 
        * giscanner/ast.py: Define socklen_t as an alias for int32.
 
-       * giscanner/glibtransformer.py:
-       * tools/g-ir-scanner:
-       Execute the dumper program through libtool if it's installed,
-       so we avoid loading the installed version.
-
 2008-11-24  Johan Dahlin  <jdahlin@async.com.br>
 
        * girepository/gdump.c (dump_type): Remove a warning,

diff --git a/giscanner/glibtransformer.py b/giscanner/glibtransformer.py
index 33983e3..8aa34eb 100644 (file)
--- a/giscanner/glibtransformer.py
+++ b/giscanner/glibtransformer.py
@@ -82,10 +82,9 @@ class UnknownTypeError(Exception):
 
 class GLibTransformer(object):
 
-    def __init__(self, transformer, noclosure=False, nolibtool=False):
+    def __init__(self, transformer, noclosure=False):
         self._transformer = transformer
         self._noclosure = noclosure
-        self._nolibtool = nolibtool
         self._transformer.set_container_types(['GList*', 'GSList*'],
                                               ['GHashTable*'])
         self._namespace_name = None
@@ -214,19 +213,6 @@ class GLibTransformer(object):
         except KeyError, e:
             return Unresolved(gtype_name)
 
-    def _use_libtool_infection(self):
-        libtool_infection = not self._nolibtool
-        if not libtool_infection:
-            return False
-
-        try:
-            subprocess.check_call(['libtool', '--version'])
-        except subprocess.CalledProcessError, e:
-            # If libtool's not installed, assume we don't need it
-            return False
-
-        return True
-
     def _execute_binary(self):
         in_path = os.path.join(self._binary.tmpdir, 'types.txt')
         f = open(in_path, 'w')
@@ -237,8 +223,6 @@ class GLibTransformer(object):
         out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
 
         args = []
-        if self._use_libtool_infection():
-            args.extend(['libtool', '--mode=execute'])
         args.extend(self._binary.args)
         args.append('--introspect-dump=%s,%s' % (in_path, out_path))
 

diff --git a/tools/g-ir-scanner b/tools/g-ir-scanner
index 0e2d414..ba9d8a6 100755 (executable)
--- a/tools/g-ir-scanner
+++ b/tools/g-ir-scanner
@@ -305,8 +305,7 @@ def main(args):
     # Transform the C AST nodes into higher level
     # GLib/GObject nodes
     glibtransformer = GLibTransformer(transformer,
-                                      noclosure=options.noclosure,
-                                      nolibtool=options.nolibtool)
+                                      noclosure=options.noclosure)
     glibtransformer.set_introspection_binary(binary)
 
     namespace = glibtransformer.parse()