gobject-introspection r852 - in trunk: . giscanner

[walters svn gnome org]

Author: walters
Date: Fri Oct 31 19:42:33 2008
New Revision: 852
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=852&view=rev

Log:
Bug 558109 â _g_typelib_init fails to find shared libraries

Modified:
   trunk/ChangeLog
   trunk/giscanner/girwriter.py

Modified: trunk/giscanner/girwriter.py
==============================================================================
--- trunk/giscanner/girwriter.py	(original)
+++ trunk/giscanner/girwriter.py	Fri Oct 31 19:42:33 2008
@@ -21,6 +21,7 @@
 from __future__ import with_statement
 
 import os
+from ctypes.util import find_library
 
 from .ast import (Callback, Class, Constant, Enum, Function, Interface, Member,
                   Array, Struct, Alias, Union, List, Map, Varargs)
@@ -54,7 +55,10 @@
     def _write_namespace(self, namespace, shlibs):
         libraries = []
         for l in shlibs:
-            libraries.append(os.path.basename(l))
+            found_libname = find_library(l)
+            if not found_libname:
+                found_libname = l
+            libraries.append(os.path.basename(found_libname))
 
         attrs = [('name', namespace.name),
                  ('version', namespace.version),