From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 8CC+CDCcYmM9ugAAbAwnHQ (envelope-from ) for ; Wed, 02 Nov 2022 17:34:56 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id UPWeBzCcYmMQHwEAG6o9tA (envelope-from ) for ; Wed, 02 Nov 2022 17:34:56 +0100 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (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 C8967875A for ; Wed, 2 Nov 2022 17:34:55 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 596375F387; Wed, 2 Nov 2022 16:22:34 +0000 (UTC) X-Greylist: delayed 426 seconds by postgrey-1.36 at yantan; Wed, 02 Nov 2022 16:22:31 UTC Received: from che.mayfirst.org (unknown [162.247.75.117]) by mail.notmuchmail.org (Postfix) with ESMTPS id 8D09E5E00E for ; Wed, 2 Nov 2022 16:22:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1667405721; h=from : to : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=/lvTi/Vzjm29wSu23hSIDwQ0yoXlKTENpyM/Fgrpnb8=; b=HkFWv5UeipTNIs22IdUSpvpDbajRb/55h6htxeF8HBjiRGMY5nriix2apRio3gSp1fZhV 7jJsK/BKIgG/kymBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1667405721; h=from : to : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=/lvTi/Vzjm29wSu23hSIDwQ0yoXlKTENpyM/Fgrpnb8=; b=D/nFbXYWQEF7CKxIHhljmijHHtJy1g3KygZvg8jU6WT8+r9VPUQMv5FrIPyzD0UUeBozO +TcJOulC+V3TfHX/MZQ7RjxHmy8mlK379iLhA9bemDmGDBje6nyC6CRV57IttEy0hFLYnrA g6lN1FjRNxFSUUif6+MEuRwzf0MLRw20fKRxZUQoX7t3k0VkNZrjmJTKIiHWTOPC16tN8CV w3WgdrIvPHDOaf4w60H3opXzPNTCiSl+P9aFMy8ntT6O/g3NhMR5aFcERIj+3EqQIj4ZWUc ufCMQzpVaYcqh6hMgMdlZuLdUxVf1fwAHr4EezmK1y+zSE68Wn2iT7o/k11A== Received: from fifthhorseman.net (unknown [38.109.115.130]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 6A444F9AD for ; Wed, 2 Nov 2022 12:15:21 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 1895420BC8; Wed, 2 Nov 2022 12:15:12 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH] configure: use pkg-config for gpgme Date: Wed, 2 Nov 2022 12:15:12 -0400 Message-Id: <20221102161512.377538-1-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Message-ID-Hash: UESSFFG77AFVDV3RPJK2HWUO7JRQ5YBZ X-Message-ID-Hash: UESSFFG77AFVDV3RPJK2HWUO7JRQ5YBZ X-MailFrom: dkg@fifthhorseman.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; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1667406896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=utXG3I2rzLUuZic6LWdTCbmzcMvhm860g7hVfJ3IiXg=; b=g9Fn9FDLVT6kYKt3onl1XBuHD7c1ldBAlSVBwEW2JkjZJ4aPtHKnUuSTM+r4b98Af/e1Fp x+l+ED40y956SDFoCw4QRfBp6uvCUso5/L+k7Erg/N2t491DGMW2MAt+0SbQal01AZzHqH QkVigsWcxYgkOHDQkvQ3uHuGSqPI3l+LkbW4YAe/1h1cIhnUjMgE4xgVAw6+g5zbHDy4cB R5ZNERVTvCMBoWLAqR8/hMB3467Z+h+SC3TxinrK55A5FA/jzoIt0TleXpuKHd8W0WrMhQ W4TVgX0AwfVBXo9s3fMDGkClMCFkna7VExRDN0lHQDPffriC203L0x1UN1febw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1667406896; a=rsa-sha256; cv=none; b=soTwRB05JIVV1DEumbCm1KdU1TupExMeMuVjxfxXaW6xa9C5gZT9qdetusrXnpSbh6tSVW hfGCjZaf1Her1cqHtA8gLWbQMUzFmN+cf51oL9hlUp8oksXqLPbKoE1wTjtaujc2v7qonK +xOl/RKDwmIucVHHAynQzz4w887oieBsyIMFHbnGpDtr8rnj+2Ma3LN/UnOzzh6jLcDm84 stPm5Yi3MIk32jyv5diFaWPrwDyvEiSVeZ86UPkCFMQ44XQMjegfB3S1bXGeGsrq2R+i4I AO7ipSlIlQS13oAqn3+58N6IHxYkjeCI0GaxOwHdlLbSn6e4+UYewGO9RcnsYg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=fifthhorseman.net header.s=2019 header.b=HkFWv5Ue; dkim=fail ("body hash did not verify") header.d=fifthhorseman.net header.s=2019rsa header.b="D/nFbXYW"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fifthhorseman.net (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 8.26 X-Spam: Yes Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=fifthhorseman.net header.s=2019 header.b=HkFWv5Ue; dkim=fail ("body hash did not verify") header.d=fifthhorseman.net header.s=2019rsa header.b="D/nFbXYW"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fifthhorseman.net (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: C8967875A X-Spam-Score: 8.26 X-Migadu-Spam: Yes X-Migadu-Scanner: scn0.migadu.com X-TUID: /5YupaPU1Cik GnuPG upstream has supported pkg-config since gpgme version 1.13 and gpg-error 1.33, and now prefers the use of pkg-config by default, instead of relying on gpg-error-config and gpgme-config. As of libgpg-error 1.46, upstream deliberately does not ship gpg-error-config by default. As of gpgme 1.18.0, upstream does not ship gpgme-config if gpg-error-config is also not present. Both of these versions of upstream libraries are in debian unstable now. To the extent that notmuch is dependent on GnuPG, it should follow GnuPG upstream's lead. Signed-off-by: Daniel Kahn Gillmor --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index be69b34d..c3629a73 100755 --- a/configure +++ b/configure @@ -541,8 +541,8 @@ version of GPGME. Please try to rebuild your version of GMime against a more recent version of GPGME (at least GPGME 1.8.0). EOF - if command -v gpgme-config >/dev/null; then - printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)" + if GPGME_VERS="$(pkg-config --modversion gpgme || gpgme-config --version)"; then + printf 'Your current GPGME development version is: %s\n' "$GPGME_VERS" else printf 'You do not have the GPGME development libraries installed.\n' fi -- 2.35.1