build: Fix broken BlueZ configure check

The previous commit left an extra set of brackets, and missed removing
the explicit dbus check (which is no longer needed since we're using
gdbus).
This commit is contained in:
Arun Raghavan 2015-07-03 19:24:58 +05:30
parent 5ebde18f03
commit 0319013726

View file

@ -1615,21 +1615,16 @@ esac
dnl *** bluez *** dnl *** bluez ***
translit(dnm, m, l) AM_CONDITIONAL(USE_BLUEZ, true) translit(dnm, m, l) AM_CONDITIONAL(USE_BLUEZ, true)
AG_GST_CHECK_FEATURE(BLUEZ, [Bluez], bluez, [ AG_GST_CHECK_FEATURE(BLUEZ, [Bluez], bluez, [
PKG_CHECK_MODULES([BLUEZ5], [bluez >= 5.0], [ PKG_CHECK_MODULES([BLUEZ5], [bluez >= 5.0], [
PKG_CHECK_MODULES([GIO_UNIX], gio-unix-2.0 > 2.24, [ PKG_CHECK_MODULES([GIO_UNIX], gio-unix-2.0 > 2.24, [
AC_CHECK_PROG([GDBUS_CODEGEN],[gdbus-codegen],[gdbus-codegen]) AC_CHECK_PROG([GDBUS_CODEGEN],[gdbus-codegen],[gdbus-codegen])
HAVE_BLUEZ=yes HAVE_BLUEZ=yes
AC_DEFINE(HAVE_BLUEZ5,[1],[Bluez5 detected]) AC_DEFINE(HAVE_BLUEZ5,[1],[Bluez5 detected])
], [
HAVE_BLUEZ=no
])
], [ ], [
HAVE_BLUEZ=no HAVE_BLUEZ=no
]) ])
]) ], [
AS_IF([ test x$HAVE_BLUEZ = xyes ],[ HAVE_BLUEZ=no
dnl FIXME: we should be able to replace this with the GLib DBus stuff
PKG_CHECK_MODULES([DBUS], [dbus-1], [HAVE_BLUEZ=yes], [HAVE_BLUEZ=no])
]) ])
]) ])