[gnome-shell] configure: Depend on gnome-bluetooth 3.1.0, fix linking issue



commit f71afa92480ca365c74b0a9160e44febc6eedbaa
Author: Colin Walters <walters verbum org>
Date:   Thu Jun 30 14:19:20 2011 -0400

    configure: Depend on gnome-bluetooth 3.1.0, fix linking issue
    
    Most importantly, the new variables include an rpath for the gnome-bluetooth
    directory which fixes a linking problem; introspetion needs to be able to find
    the library while running the introspected binary at build time.
    
    Also, this removes some hardcoding in the configure script.

 configure.ac |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f722c13..e42c027 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,9 +126,9 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
 PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
 
 AC_MSG_CHECKING([for bluetooth support])
-PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0],
-        [BLUETOOTH_DIR=`$PKG_CONFIG --variable=libdir gnome-bluetooth-1.0`/gnome-bluetooth
-	 BLUETOOTH_LIBS="-L'$BLUETOOTH_DIR' -lgnome-bluetooth-applet"
+PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+        [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
+	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
 	 AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
 	 AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
 	 AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]