From: Dylan Van Assche <me@dylanvanassche.be> To: linux-bluetooth@vger.kernel.org Cc: Dylan Van Assche <me@dylanvanassche.be> Subject: [PATCH 3/4] configure.ac: add libebook dependency Date: Sat, 17 Jul 2021 14:55:07 +0200 [thread overview] Message-ID: <20210717125508.29186-3-me@dylanvanassche.be> (raw) In-Reply-To: <20210717125508.29186-1-me@dylanvanassche.be> Require libebook when phonebook-ebook plugin is built. Signed-off-by: Dylan Van Assche <me@dylanvanassche.be> --- Makefile.am | 2 +- Makefile.obexd | 2 +- configure.ac | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 497f05f06..0fd405e8c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ pkgincludedir = $(includedir)/bluetooth pkginclude_HEADERS = -AM_CFLAGS = $(WARNING_CFLAGS) $(MISC_CFLAGS) $(UDEV_CFLAGS) $(ell_cflags) +AM_CFLAGS = $(WARNING_CFLAGS) $(MISC_CFLAGS) $(UDEV_CFLAGS) $(LIBEBOOK_CFLAGS) $(LIBEDATASERVER_CFLAGS) $(ell_cflags) AM_LDFLAGS = $(MISC_LDFLAGS) if DATAFILES diff --git a/Makefile.obexd b/Makefile.obexd index 285a56197..2c0d19518 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -80,7 +80,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ obexd/src/map_ap.h obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ gdbus/libgdbus-internal.la \ - $(ICAL_LIBS) $(DBUS_LIBS) $(GLIB_LIBS) -ldl + $(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic diff --git a/configure.ac b/configure.ac index 113ab0e0f..a5afaea6c 100644 --- a/configure.ac +++ b/configure.ac @@ -422,6 +422,15 @@ AC_ARG_WITH([phonebook], AC_HELP_STRING([--with-phonebook=PLUGIN], if (test -z "${plugin_phonebook}"); then plugin_phonebook=dummy fi + +if (test "${plugin_phonebook}" = "ebook"); then + PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 3.3], dummy=yes, AC_MSG_ERROR(libebook >= 3.3 is required)) + AC_SUBST(LIBEBOOK_CFLAGS) + AC_SUBST(LIBEBOOK_LIBS) + PKG_CHECK_MODULES(LIBEDATESERVER, [libedataserver-1.2 >= 3.3], dummy=yes, AC_MSG_ERROR(libedataserver >= 3.3 is required)) + AC_SUBST(LIBEDATESERVER_CFLAGS) + AC_SUBST(LIBEDATESERVER_LIBS) +fi AC_SUBST(PLUGIN_PHONEBOOK, [${plugin_phonebook}]) AC_OUTPUT(Makefile src/bluetoothd.rst lib/bluez.pc mesh/bluetooth-meshd.rst) -- 2.32.0
next prev parent 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 ` [PATCH 2/4] configure.ac: specify phonebook plugin at build time Dylan Van Assche 2021-07-17 12:55 ` Dylan Van Assche [this message] 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-3-me@dylanvanassche.be \ --to=me@dylanvanassche.be \ --cc=linux-bluetooth@vger.kernel.org \ --subject='Re: [PATCH 3/4] configure.ac: add libebook dependency' \ /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
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).