[gnome-bluetooth] [PATCH 03/12] build: do not build bluetooth plugin with newer gnome-bluetooth

Ladislav Michl ladis at linux-mips.org
Sun Jan 15 04:42:10 EST 2017


Since the plugin API no longer exists...

Signed-off-by: Ladislav Michl <ladis at linux-mips.org>
---
 configure.ac | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0db6c2a..0c9e64a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,6 @@ AC_PROG_CC
 AC_PROG_INSTALL
 
 GNOKII_REQS="gnokii >= 0.6.28"
-GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.3"
 
 # Initialize libtool
 LT_PREREQ([2.2.6])
@@ -48,7 +47,7 @@ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobject-2.0 $GNOKII_REQS gthread-2.0 bluez $e
 
 PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
 	libcanberra-gtk3 gconf-2.0
-	$GNOME_BLUETOOTH_REQS $evo_pc_file
+	gnome-bluetooth-1.0 >= 3.3 $evo_pc_file
 	gmodule-2.0 gthread-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
 )
 
@@ -97,7 +96,7 @@ AC_ARG_ENABLE(bluetooth-plugin,
 	[ENABLE_BLUETOOTH_PLUGIN=yes]) dnl Default value
 
 if test x$ENABLE_BLUETOOTH_PLUGIN = "xyes" ; then
-	PKG_CHECK_MODULES(BLUETOOTH_PLUGIN, gnome-bluetooth-1.0 >= 2.27.6 gconf-2.0,
+	PKG_CHECK_MODULES(BLUETOOTH_PLUGIN, gnome-bluetooth-1.0 >= 2.27.6 gnome-bluetooth-1.0 < 3.11.0 gconf-2.0,
 			[HAVE_BLUETOOTH_PLUGIN=yes], [HAVE_BLUETOOTH_PLUGIN=no])
 fi
 if test x$HAVE_BLUETOOTH_PLUGIN = "xyes"; then
-- 
2.11.0



More information about the gnome-bluetooth mailing list