From: Marcel Holtmann <marcel@holtmann.org>
To: ofono@ofono.org
Subject: Re: [PATCH v1 1/6] Makefile: Add configure option for BlueZ 4 and 5
Date: Tue, 15 Jan 2013 11:01:44 -0800 [thread overview]
Message-ID: <1358276504.2445.3.camel@aeonflux> (raw)
In-Reply-To: <1358274288-24857-2-git-send-email-claudio.takahasi@openbossa.org>
[-- Attachment #1: Type: text/plain, Size: 2627 bytes --]
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
next prev parent reply other threads:[~2013-01-15 19:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-10 14:44 [PATCH v0 0/6] HFP HF: External Profile Claudio Takahasi
2013-01-10 14:44 ` [PATCH v0 1/6] Makefile: Enable BlueZ 4 and BlueZ 5 Claudio Takahasi
2013-01-10 14:44 ` [PATCH v0 2/6] bluetooth: Add versioning information to BlueZ plugins Claudio Takahasi
2013-01-10 14:44 ` [PATCH v0 3/6] bluetooth: Initial files for BlueZ 5 Claudio Takahasi
2013-01-10 14:44 ` [PATCH v0 4/6] hfp_hf: Add initial file for external HFP Claudio Takahasi
2013-01-10 14:44 ` [PATCH v0 5/6] hfp_hf: Add hfp_driver Claudio Takahasi
2013-01-10 14:44 ` [PATCH v0 6/6] hfp_hf: Add BlueZ Profile handler Claudio Takahasi
2013-01-11 9:27 ` [PATCH v0 0/6] HFP HF: External Profile Mikel Astiz
2013-01-11 14:26 ` Claudio Takahasi
2013-01-11 16:05 ` Mikel Astiz
2013-01-15 18:24 ` [PATCH v1 " Claudio Takahasi
2013-01-15 18:24 ` [PATCH v1 1/6] Makefile: Add configure option for BlueZ 4 and 5 Claudio Takahasi
2013-01-15 19:01 ` Marcel Holtmann [this message]
2013-01-15 18:24 ` [PATCH v1 2/6] bluetooth: Add versioning information to BlueZ plugins Claudio Takahasi
2013-01-15 18:24 ` [PATCH v1 3/6] bluetooth: Initial files for BlueZ 5 Claudio Takahasi
2013-01-15 18:24 ` [PATCH v1 4/6] hfp_hf: Add initial file for external HFP Claudio Takahasi
2013-01-15 18:24 ` [PATCH v1 5/6] hfp_hf: Add hfp_driver Claudio Takahasi
2013-01-15 18:24 ` [PATCH v1 6/6] hfp_hf: Add BlueZ Profile handler Claudio Takahasi
2013-01-16 13:31 ` [PATCH v2 0/6] HFP HF: External Profile Claudio Takahasi
2013-01-16 13:31 ` [PATCH v2 1/6] Makefile: Add configure option for BlueZ 4 and 5 Claudio Takahasi
2013-01-16 13:31 ` [PATCH v2 2/6] bluetooth: Add versioning information to BlueZ plugins Claudio Takahasi
2013-01-16 13:31 ` [PATCH v2 3/6] bluetooth: Initial files for BlueZ 5 Claudio Takahasi
2013-01-16 13:31 ` [PATCH v2 4/6] hfp_hf: Add initial file for external HFP Claudio Takahasi
2013-01-16 13:31 ` [PATCH v2 5/6] hfp_hf: Add hfp_driver Claudio Takahasi
2013-01-16 13:31 ` [PATCH v2 6/6] hfp_hf: Add BlueZ Profile handler Claudio Takahasi
2013-01-16 20:16 ` [PATCH v2 0/6] HFP HF: External Profile Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358276504.2445.3.camel@aeonflux \
--to=marcel@holtmann.org \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.