unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH] configure: use pkg-config for gpgme
Date: Wed,  2 Nov 2022 12:15:12 -0400	[thread overview]
Message-ID: <20221102161512.377538-1-dkg@fifthhorseman.net> (raw)

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 <dkg@fifthhorseman.net>
---
 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

             reply	other threads:[~2022-11-02 16:34 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-02 16:15 Daniel Kahn Gillmor [this message]
2022-11-02 21:02 ` [PATCH] configure: use pkg-config for gpgme David Bremner
2022-11-11 10:16   ` Daniel Kahn Gillmor
2023-01-09 18:19     ` Daniel Kahn Gillmor
2023-01-10 12:45       ` David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221102161512.377538-1-dkg@fifthhorseman.net \
    --to=dkg@fifthhorseman.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).