From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QATjD+oOJWGI4wAAgWs5BA (envelope-from ) for ; Tue, 24 Aug 2021 17:23:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MACNC+oOJWEnbwAAB5/wlQ (envelope-from ) for ; Tue, 24 Aug 2021 15:23:22 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AB943BC32 for ; Tue, 24 Aug 2021 17:23:21 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 5059726BFE; Tue, 24 Aug 2021 11:21:38 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id BD53D26BE0 for ; Tue, 24 Aug 2021 11:21:33 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id B590A5FD5C; Tue, 24 Aug 2021 11:21:33 -0400 (EDT) Received: (nullmailer pid 2942830 invoked by uid 1000); Tue, 24 Aug 2021 15:17:51 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 02/36] configure: optional library sfsexp Date: Tue, 24 Aug 2021 08:17:11 -0700 Message-Id: <20210824151745.2941868-3-david@tethera.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210824151745.2941868-1-david@tethera.net> References: <20210824151745.2941868-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: QTURAYRR65NBHU2CU4DD5DQF6H4DOYJ4 X-Message-ID-Hash: QTURAYRR65NBHU2CU4DD5DQF6H4DOYJ4 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=1629818602; 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=bdWBDWtlcwoBtNAp1hUxRQy1Ctb9oCSW7xqx6DgDk6A=; b=AktEcW0ymXep13ciljyWdg3MsDf2+xWlkkIQ62oTwYeGO2Qzgsirog8+bgnqsyTWvQiM4n 4ZoJQRbbgDshDik1Dmes606UQQoa4Z1SA1PUjEkOrZUS5AH/5Jq9alBU+sp2paFVfFq7H3 PiRZsQo3LYqo3SFe0s9E+naZ1LHAEOwD4HIXDIfbE9t9Ih8W4rO75un2p/pCrDtWevSMa3 wfntaVo1b5WXgBeUAqa3nyhqkwWtpCcraVv5jzWr1a+9iiZ6tV3U3uO+oqjz6H4aPMF1xS F7Vqn6c05umRKLRuqJ2VrQUcGZG4+L+fwJJlgDMZQ38t/LbC59uqr1z11iEn0w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629818602; a=rsa-sha256; cv=none; b=fKJi4JpCj1BGD2/IacV0grDDYBBrEqSzoxa0xXSeac/k7LMhoeKrjkdmKdWnCD3HAnClIW cyoINojMQJQ/60wn27hj2VrmesiO9CI1JiOyOr557XuW/oTIXaFfT/bUizEp6xvoH+JJgX ISpqASahqtCvefDtb3Zu5ouWX0VWWXT/O94oiqz4kCHYfuyQtlxe3F42/nUvmoPAD4e4+e BY640ysp2Eql7/1BDI01PPsBe+qGzyYoBulIV62oYAVxaYXHNsI8Wvss4AkskjD3D4gnt2 adPfa3sl7zxd4S/fk/mRhYV+gB3BVdo00jnLjyFWMs/0GKFQZ1p/AxNfvtdbkA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.93 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: AB943BC32 X-Spam-Score: -0.93 X-Migadu-Scanner: scn0.migadu.com X-TUID: CL4h7FVkECdG The configure part is essentially the same as the other checks using pkg-config. Since the optional inclusion of this feature changes what options are available to the user, include it in the "built_with" pseudo-configuration keys. --- configure | 26 +++++++++++++++++++++++++- lib/built-with.c | 2 ++ notmuch-config.c | 3 +++ test/T030-config.sh | 1 + test/T055-path-config.sh | 9 +++++---- 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/configure b/configure index cfa9c09b..4262d122 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 @@ -1524,6 +1545,9 @@ NOTMUCH_HAVE_PYTHON3_CFFI=${have_python3_cffi} # Is the python pytest package available? NOTMUCH_HAVE_PYTHON3_PYTEST=${have_python3_pytest} +# Is the sfsexp library available? +NOTMUCH_HAVE_SFSEXP=${have_sfsexp} + # Platform we are run on PLATFORM=${platform} EOF diff --git a/lib/built-with.c b/lib/built-with.c index 0c70010b..89958e12 100644 --- a/lib/built-with.c +++ b/lib/built-with.c @@ -32,6 +32,8 @@ notmuch_built_with (const char *name) return HAVE_XAPIAN_DB_RETRY_LOCK; } else if (STRNCMP_LITERAL (name, "session_key") == 0) { return true; + } else if (STRNCMP_LITERAL (name, "sexpr_query") == 0) { + return HAVE_SFSEXP; } else { return false; } diff --git a/notmuch-config.c b/notmuch-config.c index 80a207f6..c0c91cc8 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -679,6 +679,9 @@ _notmuch_config_list_built_with () printf ("%sretry_lock=%s\n", BUILT_WITH_PREFIX, notmuch_built_with ("retry_lock") ? "true" : "false"); + printf ("%ssexpr_query=%s\n", + BUILT_WITH_PREFIX, + notmuch_built_with ("sexpr_query") ? "true" : "false"); } static int diff --git a/test/T030-config.sh b/test/T030-config.sh index 636c6356..3a585d1b 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -51,6 +51,7 @@ cat < EXPECTED built_with.compact=something built_with.field_processor=something built_with.retry_lock=something +built_with.sexpr_query=something database.autocommit=8000 database.mail_root=MAIL_DIR database.path=MAIL_DIR diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh index 27dd209a..ef22e964 100755 --- a/test/T055-path-config.sh +++ b/test/T055-path-config.sh @@ -266,7 +266,7 @@ EOF test_expect_equal "${output}+${output2}" "${value}+" test_begin_subtest "Config list ($config)" - notmuch config list | notmuch_dir_sanitize | \ + notmuch config list | notmuch_config_sanitize | \ sed -e "s/^database.backup_dir=.*$/database.backup_dir/" \ -e "s/^database.hook_dir=.*$/database.hook_dir/" \ -e "s/^database.path=.*$/database.path/" \ @@ -274,9 +274,10 @@ EOF -e "s,^database.mail_root=CWD/home/env_points_here,database.mail_root=MAIL_DIR," \ > OUTPUT cat < EXPECTED -built_with.compact=true -built_with.field_processor=true -built_with.retry_lock=true +built_with.compact=something +built_with.field_processor=something +built_with.retry_lock=something +built_with.sexpr_query=something database.autocommit=8000 database.backup_dir database.hook_dir -- 2.32.0