summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2022-11-01 13:47:34 +0900
committerNIIBE Yutaka <gniibe@fsij.org>2022-11-01 13:47:34 +0900
commit0dcb7e05c9e1c9c2a23abe0a0390680741b61414 (patch)
tree6647cfd2b9d2a7f83ae617357946e9e559c94326 /src
parenteab1caae7bd529c09d809d4d7c64c97ab7abeab8 (diff)
downloadlibgcrypt-0dcb7e05c9e1c9c2a23abe0a0390680741b61414.tar.gz
build: Prefer gpgrt-config when available.
* src/libgcrypt.m4: Overriding the decision by --with-libgcrypt-prefix, use gpgrt-config libgcrypt when gpgrt-config is available. -- This may offer better migration. GnuPG-bug-id: 5034 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'src')
-rw-r--r--src/libgcrypt.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
index 19d514fd..cd4249e8 100644
--- a/src/libgcrypt.m4
+++ b/src/libgcrypt.m4
@@ -9,7 +9,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-# Last-changed: 2020-09-27
+# Last-changed: 2022-11-01
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
@@ -40,7 +40,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
fi
use_gpgrt_config=""
- if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+ if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
if $GPGRT_CONFIG libgcrypt --exists; then
LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config])