linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dylan Van Assche <me@dylanvanassche.be>
To: linux-bluetooth@vger.kernel.org
Cc: Juho Hamalainen <juho.hamalainen@jolla.com>,
	Dylan Van Assche <me@dylanvanassche.be>
Subject: [PATCH 2/4] configure.ac: specify phonebook plugin at build time
Date: Sat, 17 Jul 2021 14:55:06 +0200	[thread overview]
Message-ID: <20210717125508.29186-2-me@dylanvanassche.be> (raw)
In-Reply-To: <20210717125508.29186-1-me@dylanvanassche.be>

From: Juho Hamalainen <juho.hamalainen@jolla.com>

Various phonebook plugins are available, by default
phonebook-dummy is always built. Allow to specify
which plugin to use at build time.

Cherry-picked from https://github.com/sailfishos/bluez5/commit/d39ed9e2db8d4f9ab239a859c777e5504459b9dd

Co-authored-by: Dylan Van Assche <me@dylanvanassche.be>
Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
---
 Makefile.obexd | 2 +-
 configure.ac   | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.obexd b/Makefile.obexd
index 6f5dc04c0..285a56197 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -41,7 +41,7 @@ obexd_builtin_modules += pbap
 obexd_builtin_sources += obexd/plugins/pbap.c \
 				obexd/plugins/vcard.h obexd/plugins/vcard.c \
 				obexd/plugins/phonebook.h \
-				obexd/plugins/phonebook-dummy.c
+				obexd/plugins/phonebook-@PLUGIN_PHONEBOOK@.c
 
 obexd_builtin_modules += mas
 obexd_builtin_sources += obexd/plugins/mas.c obexd/src/map_ap.h \
diff --git a/configure.ac b/configure.ac
index be32782a6..113ab0e0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -416,4 +416,12 @@ fi
 AC_DEFINE_UNQUOTED(ANDROID_STORAGEDIR, "${storagedir}/android",
 			[Directory for the Android daemon storage files])
 
+AC_ARG_WITH([phonebook], AC_HELP_STRING([--with-phonebook=PLUGIN],
+				[obexd phonebook plugin (default=dummy)]),
+					[plugin_phonebook=${withval}])
+if (test -z "${plugin_phonebook}"); then
+	plugin_phonebook=dummy
+fi
+AC_SUBST(PLUGIN_PHONEBOOK, [${plugin_phonebook}])
+
 AC_OUTPUT(Makefile src/bluetoothd.rst lib/bluez.pc mesh/bluetooth-meshd.rst)
-- 
2.32.0


  reply	other threads:[~2021-07-17 12:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-17 12:55 [PATCH 1/4] obexd: phonebook-ebook: modernize Dylan Van Assche
2021-07-17 12:55 ` Dylan Van Assche [this message]
2021-07-17 12:55 ` [PATCH 3/4] configure.ac: add libebook dependency Dylan Van Assche
2021-07-17 12:55 ` [PATCH 4/4] obexd: phonebook: Workaround for PTS client not sending mandatory apparams Dylan Van Assche
2021-07-17 13:15 ` [1/4] obexd: phonebook-ebook: modernize bluez.test.bot

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=20210717125508.29186-2-me@dylanvanassche.be \
    --to=me@dylanvanassche.be \
    --cc=juho.hamalainen@jolla.com \
    --cc=linux-bluetooth@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).