[folks] Bug 658002 â defective typelib

[Philip Withnall <pwithnall src gnome org>]

commit 554d96c18d4309b5e8169c68b8bb747502161a8e
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Sep 14 18:34:57 2011 +0100

    Bug 658002 â defective typelib
    
    Pass the libtool dlname for libfolks.so to g-ir-compiler rather than
    libfolks.la.
    
    Closes: bgo#658002

 NEWS              |    1 +
 folks/Makefile.am |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index eab9b70..fb1a0e5 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Bugs fixed:
 * Bug 633781 â Allow to set avatar on individuals
 * Bug 657142 â Automatically link e-d-s contacts with their contacts from
   telepathy
+* Bug 658002 â defective typelib
 
 API changes:
 * Individual.avatar is now settable using Individual.change_avatar() (not new
diff --git a/folks/Makefile.am b/folks/Makefile.am
index cf3cfc2..e5980e8 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -115,10 +115,15 @@ GITIGNOREFILES = \
 	libfolks_la_vala.stamp \
 	$(NULL)
 
+# We have to extract our own dlname from libfolks.la; see bgo#658002.
+# This is what g-ir-scanner does.
+libfolks_dlname = \
+	`$(SED) -n "s/^dlname='\([A-Za-z0-9.-+]\+\)'/\1/p" libfolks.la`
+
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS =
-INTROSPECTION_COMPILER_ARGS = -l libfolks.so
+INTROSPECTION_COMPILER_ARGS = -l $(libfolks_dlname)
 
 if HAVE_INTROSPECTION
 Folks-$(API_VERSION).gir: libfolks.la