>From 221d6dbaf23dc26c0910565e51a2fde120028c5f Mon Sep 17 00:00:00 2001
Message-ID: <221d6dbaf23dc26c0910565e51a2fde120028c5f.1779243956.git.gniibe@fsij.org>
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Wed, 20 May 2026 11:22:41 +0900
Subject: [PATCH] build:w32: Use libgpgme instead of libgpgme-glib.
To: gnupg-devel@gnupg.org
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------2.47.3"

This is a multi-part message in MIME format.
--------------2.47.3
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit


* configure.ac: Simply use AM_PATH_GPGME, instead of
AM_PATH_GPGME_GLIB.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 configure.ac | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)


--------------2.47.3
Content-Type: text/x-patch; name="0001-build-w32-Use-libgpgme-instead-of-libgpgme-glib.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-build-w32-Use-libgpgme-instead-of-libgpgme-glib.patch"

diff --git a/configure.ac b/configure.ac
index c3313d3..650b42d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,17 +258,8 @@ AC_SYS_LARGEFILE
 # Depending on the OS we need to test for different versions of gpgme.
 #
 _AM_PATH_GPGME_CONFIG
-if test "$have_w32_system" = yes; then
-  AM_PATH_GPGME_GLIB("$NEED_GPGME_API:$NEED_GPGME_VERSION",
-                     have_gpgme=yes,have_gpgme=no)
-  GPGME_LIBS="$GPGME_GLIB_LIBS"
-  GPGME_CFLAGS="$GPGME_GLIB_CFLAGS"
-  AC_SUBST(GPGME_CFLAGS)
-  AC_SUBST(GPGME_LIBS)
-else
-  AM_PATH_GPGME("$NEED_GPGME_API:$NEED_GPGME_VERSION",
-                have_gpgme=yes,have_gpgme=no)
-fi
+AM_PATH_GPGME("$NEED_GPGME_API:$NEED_GPGME_VERSION",
+              have_gpgme=yes,have_gpgme=no)
 
 _save_libs=$LIBS
 _save_cflags=$CFLAGS

--------------2.47.3--


