2021-07-23 14:00:28

by Dylan Van Assche

[permalink] [raw]
Subject: [PATCH BlueZ 3/4] configure.ac: add libebook dependency

Require libebook when phonebook-ebook plugin is built.
---
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