From: Chow Loong Jin <hyperair@debian.org>
Date: Sat, 5 May 2012 08:42:56 +0800
Subject: Fix clutter library name detection

Bug-Debian: http://bugs.debian.org/670790
---
 clutter-gtk/clutter-gtk-sharp.dll.config.in |    2 +-
 clutter/clutter-sharp.dll.config.in         |    2 +-
 configure.ac                                |   13 +++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/clutter-gtk/clutter-gtk-sharp.dll.config.in b/clutter-gtk/clutter-gtk-sharp.dll.config.in
index ab6eb7c..85bb1bd 100644
--- a/clutter-gtk/clutter-gtk-sharp.dll.config.in
+++ b/clutter-gtk/clutter-gtk-sharp.dll.config.in
@@ -1,7 +1,7 @@
 <configuration>
   <dllmap 
     dll="libclutter-gtk-win32-0.10-0.dll"
-    target="libclutter-gtk-@CLUTTER_GTK_API_VERSION@.so.0"
+    target="@CLUTTER_LIBRARY@"
   />
   <dllmap 
     dll="libclutter-win32-1.0-0.dll"
diff --git a/clutter/clutter-sharp.dll.config.in b/clutter/clutter-sharp.dll.config.in
index d1ec02a..1b2b52a 100644
--- a/clutter/clutter-sharp.dll.config.in
+++ b/clutter/clutter-sharp.dll.config.in
@@ -1,7 +1,7 @@
 <configuration>
   <dllmap 
     dll="libclutter-win32-1.0-0.dll"
-    target="libclutter-@CLUTTER_BACKEND@-@CLUTTER_API_VERSION@.so.0"
+    target="@CLUTTER_LIBRARY@"
   />
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
diff --git a/configure.ac b/configure.ac
index 3d5ce4c..b13a505 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,11 +84,16 @@ PKG_CHECK_MODULES(CLUTTER_GTK, clutter-gtk-0.10 >= 0.10.3, enable_gtk=yes, enabl
 
 AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes")
 
-CLUTTER_API_VERSION=$(pkg-config --variable apiversion clutter-1.0)
-CLUTTER_GTK_API_VERSION=$(pkg-config --variable apiversion clutter-gtk-0.10)
-CLUTTER_BACKEND=$(pkg-config --variable backend clutter-1.0)
+CLUTTER_API_VERSION=$($PKG_CONFIG --variable apiversion clutter-1.0)
+CLUTTER_GTK_API_VERSION=$($PKG_CONFIG --variable apiversion clutter-gtk-0.10)
+CLUTTER_BACKEND=$($PKG_CONFIG --libs clutter-1.0 | egrep -o -- '-lclutter-[[^ ]]+' | sed -re 's/^-lclutter-//; s/-?'"$CLUTTER_API_VERSION"'$//;')
+if test -z "$CLUTTER_BACKEND"; then
+    CLUTTER_LIBRARY="libclutter-$CLUTTER_API_VERSION.so.0"
+else
+    CLUTTER_LIBRARY="libclutter-$CLUTTER_BACKEND-$CLUTTER_API_VERSION.so.0"
+fi
 AC_SUBST(CLUTTER_API_VERSION)
-AC_SUBST(CLUTTER_BACKEND)
+AC_SUBST(CLUTTER_LIBRARY)
 AC_SUBST(CLUTTER_GTK_API_VERSION)
 
 dnl check for monodoc
--