From patchwork Sat Jul 17 12:55:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dylan Van Assche X-Patchwork-Id: 12383647 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48752C636CA for ; Sat, 17 Jul 2021 12:55:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 21FAF613E8 for ; Sat, 17 Jul 2021 12:55:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233125AbhGQM6Y (ORCPT ); Sat, 17 Jul 2021 08:58:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbhGQM6Y (ORCPT ); Sat, 17 Jul 2021 08:58:24 -0400 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [IPv6:2001:67c:2050::465:201]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8FC4C06175F for ; Sat, 17 Jul 2021 05:55:27 -0700 (PDT) Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4GRp4F4GgnzQk4K; Sat, 17 Jul 2021 14:55:25 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dylanvanassche.be; s=MBO0001; t=1626526525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4/HL/pRQJjqZXhDXUmy8k7UfbCmaLE3tVePMYbO1NB8=; b=gTjfRgAUYYdr9ERcVxIN4p5QODGQ+Jn0sb5bgYA++KDqRPf9cHlDgTfSCu4tXpyW22Mipy IZVdwgrJb+1FUIVGqMKwJXSTt51Fk9YBH2rJvNXx6l4dKB0m8IYS8RY4L0jjtugHmsV86d kBShf/ZCdkNyTs9r1gdK3hM3rBRcoMTmJ3ukolgO6AV62QvCEfViHp6g8ZmSjpQGXH0FZo kS2/hFfo2QEokeYYuqcA5KULJCm+R4q/T8Iax6y+1esj8D5wyPW5PiwZiRKRX7Q+nWXugA x+RXgihIngvwVhhruJl26ag5F5Vyi8rxyIwWeWc1d3oMbM6nzv8ius1fntPPMg== Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id 8FHU0lH1bjrM; Sat, 17 Jul 2021 14:55:24 +0200 (CEST) From: Dylan Van Assche To: linux-bluetooth@vger.kernel.org Cc: Dylan Van Assche Subject: [PATCH 3/4] configure.ac: add libebook dependency Date: Sat, 17 Jul 2021 14:55:07 +0200 Message-Id: <20210717125508.29186-3-me@dylanvanassche.be> In-Reply-To: <20210717125508.29186-1-me@dylanvanassche.be> References: <20210717125508.29186-1-me@dylanvanassche.be> MIME-Version: 1.0 X-Rspamd-Queue-Id: F14931847 X-Rspamd-UID: 7f27ef Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Require libebook when phonebook-ebook plugin is built. Signed-off-by: Dylan Van Assche --- 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)