From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wFetDfAp7mDAegAAgWs5BA (envelope-from ) for ; Wed, 14 Jul 2021 02:04:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id poVpCfAp7mBPSQAA1q6Kng (envelope-from ) for ; Wed, 14 Jul 2021 00:04:00 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DE030CCA5 for ; Wed, 14 Jul 2021 02:03:59 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 5CFAC292FB; Tue, 13 Jul 2021 20:03:19 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 8DD4A290D4 for ; Tue, 13 Jul 2021 20:02:54 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 83EA15FD21; Tue, 13 Jul 2021 20:02:54 -0400 (EDT) Received: (nullmailer pid 804648 invoked by uid 1000); Wed, 14 Jul 2021 00:02:42 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 01/11] configure: optional library sfsexp Date: Tue, 13 Jul 2021 21:02:29 -0300 Message-Id: <20210714000239.804384-2-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714000239.804384-1-david@tethera.net> References: <20210714000239.804384-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: TYAYFPZSJH5WFODNBTORG2WAIRHIUKPD X-Message-ID-Hash: TYAYFPZSJH5WFODNBTORG2WAIRHIUKPD X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626221040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6rUbZbzC5wK8n+xJmYWoljiLupf7pOwOEeZFvQ266Ns=; b=do2i2vOY3yWzoz4xJiUF4UZkbjhnOsIDxKhasZkCSjzxXrB0ezkuoVgrXaYs78CzbFMwW+ fmwkCiF+WdHUE/16oDyiiu2poyYu/ECLDCPi6oCTRDDRpPog3XgtorF8hrwHv/4g+aHkkH 3HgqRAtENAmw/SBKxp/qufWM/8b4e1XZhV4yAs5HAZEqEVI6zeqhmo3NsSvnlJQnM9jgy8 +eu46wvkGZnjfK4+Wna4qkOFfyin5hUE2mVsQQUykN2CGAcHPBuex0uWrZt5OmEiaHg5VS vFW9EKxYHvl2eIx/6ZrWrOsPKzlNoP1myWfeVfN5UO4555uuB2Fh0s2g0uFXhA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626221040; a=rsa-sha256; cv=none; b=BOGWSZZOOcSAVP5lyZXG5zII2fkTA97sbn0f6S6DHTWqlB6KA6uRZ04WrDNkTMkHq3GQSa 9olEcENqHx2GoC9ZzrDLEPeZfJkESl/QQFjt5/WVPQWlKSfAZsEsG81gmu5ru9ENac/SQJ 1S2eOR4ruO0+Hddtp+u9mvYXBaRWDPHNlCbZKFGj3b4kW7JFmy/9X+l/2V8Ta7Lbwi8gzd SWS+jZR+SlUDe2kOkTZqOfCuIdE24Vzb0SsH8Vb1n8mXH3oDXkm8m/i1esu3jDgRCwIk9/ LdRE4DT892HhoAf1yEuWQTrEVNXGJzvClrND1Ki75iMZ9HMAM4Q/NeIe/HHkJg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.08 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: DE030CCA5 X-Spam-Score: -1.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: e/jn4H8+nSnW This is essentially the same as the other checks using pkg-config. --- configure | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/configure b/configure index cfa9c09b..15c1924f 100755 --- a/configure +++ b/configure @@ -820,6 +820,19 @@ else WITH_BASH=0 fi +printf "Checking for sfsexp... " +if pkg-config --exists sfsexp; then + printf "Yes.\n" + have_sfsexp=1 + sfsexp_cflags=$(pkg-config --cflags sfsexp) + sfsexp_ldflags=$(pkg-config --libs sfsexp) +else + printf "No (will not enable s-expression queries).\n" + have_sfsexp=0 + sfsexp_cflags= + sfsexp_ldflags= +fi + if [ -z "${EMACSLISPDIR-}" ]; then EMACSLISPDIR="\$(prefix)/share/emacs/site-lisp" fi @@ -1443,6 +1456,13 @@ HAVE_VALGRIND = ${have_valgrind} # And if so, flags needed at compile time for valgrind macros VALGRIND_CFLAGS = ${valgrind_cflags} +# Whether the sfsexp library is available +HAVE_SFSEXP = ${have_sfsexp} + +# And if so, flags needed at compile/link time for sfsexp +SFSEXP_CFLAGS = ${sfsexp_cflags} +SFSEXP_LDFLAGS = ${sfsexp_ldflags} + # Support for emacs WITH_EMACS = ${WITH_EMACS} @@ -1459,6 +1479,7 @@ WITH_ZSH = ${WITH_ZSH} COMMON_CONFIGURE_CFLAGS = \\ \$(GMIME_CFLAGS) \$(TALLOC_CFLAGS) \$(ZLIB_CFLAGS) \\ -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \$(VALGRIND_CFLAGS) \\ + -DHAVE_SFSEXP=\$(HAVE_SFSEXP) \$(SFSEXP_CFLAGS) \\ -DHAVE_GETLINE=\$(HAVE_GETLINE) \\ -DWITH_EMACS=\$(WITH_EMACS) \\ -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\ @@ -1475,7 +1496,7 @@ CONFIGURE_CFLAGS = \$(COMMON_CONFIGURE_CFLAGS) CONFIGURE_CXXFLAGS = \$(COMMON_CONFIGURE_CFLAGS) \$(XAPIAN_CXXFLAGS) -CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(XAPIAN_LDFLAGS) +CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(XAPIAN_LDFLAGS) \$(SFSEXP_LDFLAGS) EOF # construct the sh.config -- 2.30.2