Hi Claudio,
> BlueZ 5 is the default option. If --enable-bluez4 is provided, oFono
> plugins based on BlueZ 4 are enabled prior to BlueZ 5.
> --disable-bluetooth configure option disables BlueZ 5 and BlueZ 4
> plugins.
> ---
> Makefile.am | 4 +++-
> configure.ac | 24 ++++++++++++++++--------
> 2 files changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 0d2ba9f..811a3f5 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -407,7 +407,7 @@ builtin_sources += plugins/samsung.c
> builtin_modules += sim900
> builtin_sources += plugins/sim900.c
>
> -if BLUETOOTH
> +if BLUEZ4
> builtin_modules += bluetooth
> builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
>
> @@ -742,6 +742,7 @@ tools_stktest_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
> endif
> endif
>
> +if BLUEZ4
> if DUNDEE
> sbin_PROGRAMS += dundee/dundee
>
> @@ -759,6 +760,7 @@ if SYSTEMD
> systemdunit_DATA += dundee/dundee.service
> endif
> endif
> +endif
>
> endif
>
> diff --git a/configure.ac b/configure.ac
> index 450352b..47b0600 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -173,15 +173,23 @@ AC_ARG_ENABLE(qmimodem,
> AC_HELP_STRING([--disable-qmimodem],
> AM_CONDITIONAL(QMIMODEM, test "${enable_qmimodem}" != "no")
>
> AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth],
> - [disable Bluetooth modem support]),
> - [enable_bluetooth=${enableval}])
> -if (test "${enable_bluetooth}" != "no"); then
> - PKG_CHECK_MODULES(BLUEZ, bluez >= 4.99, dummy=yes,
> - AC_MSG_ERROR(Bluetooth library >= 4.99 is required))
> + [disable BlueZ 4 and BlueZ 5 plugins support]),
> + [enable_bluez5=${enableval}])
> +
> +AC_ARG_ENABLE(bluez4, AC_HELP_STRING([--enable-bluez4],
> + [enable BlueZ 4 plugins support prior to BlueZ
> 5]),
> + [enable_bluez4=${enableval}])
> +
> +if (test "${enable_bluez4}" = "yes"); then
> + PKG_CHECK_MODULES(BLUEZ, bluez >= 4.99 bluez < 5,
> + enable_bluez4=yes enable_bluez5=no,
> + AC_MSG_ERROR(Bluetooth library >= 4.99 and < 5 is
> required))
> + AC_SUBST(BLUEZ_CFLAGS)
> + AC_SUBST(BLUEZ_LIBS)
> fi
> -AC_SUBST(BLUEZ_CFLAGS)
> -AC_SUBST(BLUEZ_LIBS)
> -AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no")
> +
> +AM_CONDITIONAL(BLUEZ4, test "${enable_bluez4}" = "yes")
> +AM_CONDITIONAL(BLUEZ5, test "${enable_bluez5}" != "no" && test
> "${enable_bluez4}" != "yes")
can we keep BLUETOOTH conditional for overall Bluetooth enabled/disabled
and just make BLUEZ4 the if-else statement for selecting which one.
Regards
Marcel
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
