[PATCH v2] build: network-manager-applet add rules for BlueZ 5 support



v2.
BlueZ 5 supported is default,disable the bluetooth plugin when BlueZ 5 is used.

v1.
From BlueZ 5.0 , dbus API org.bluez.Serial has been removed and others have changed.
So add option "--disable-bluez5" for applet to get bluetooth DUN (Dial-Up Networking)
support on BlueZ 4.X and remove it when using BlueZ 5.x.(Default is disable Bluez 5)

Signed-off-by: Cho, Yu-Chen <acho suse com>
---
 configure.ac                    | 16 ++++++++++++++++
 src/gnome-bluetooth/Makefile.am |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/configure.ac b/configure.ac
index d6ca9e6..297215f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,6 +128,22 @@ AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
 
+#### BlueZ 5 support ####
+AC_ARG_WITH([bluz5],
+            AS_HELP_STRING([--enable-bluez5|--disable-bluez5], [Enable Bluez 5 support]),
+            enable_bluez5="$withval",enable_bluez5=yes)
+have_bluez5=yes
+case "${enable_bluez5}" in
+        no)     AC_MSG_NOTICE(Bluez 5 support disabled)
+               ;;
+        *)      PKG_CHECK_MODULES(BLUEZ,
+                                 bluez >= 5.0,
+                                 have_bluez5=yes, have_bluez5=no)
+               ;;
+esac
+
+AM_CONDITIONAL(WITHOUT_BLUEZ5, test "x$have_bluez5" == "xno")
+
 dnl Check for gnome-bluetooth
 AC_ARG_WITH([bluetooth],
            AS_HELP_STRING([--with-bluetooth|--without-bluetooth], [Enable Bluetooth support]),
diff --git a/src/gnome-bluetooth/Makefile.am b/src/gnome-bluetooth/Makefile.am
index dbf5373..12fbb6d 100644
--- a/src/gnome-bluetooth/Makefile.am
+++ b/src/gnome-bluetooth/Makefile.am
@@ -15,6 +15,7 @@ BT_WIDGET_SOURCES = \
        nma-bt-device.c \
        nma-bt-device.h
 
+if WITHOUT_BLUEZ5
 if HAVE_GBT
 plugindir = $(libdir)/gnome-bluetooth/plugins
 
@@ -40,4 +41,6 @@ endif
 
 endif
 
+endif
+
 EXTRA_DIST = $(BT_WIDGET_SOURCES)
-- 
1.8.4.5



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