GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m4: Update m4 files.

Browse Source 
* m4/gpg-error.m4: Update libgpg-error master.
* m4/libassuan.m4: Update libassuan master.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-06-13 14:47:39 +09:00
parent 14b035034a
commit 6c90ec7be2
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
m4/gpg-error.m4
View File

@ -1,5 +1,5 @@
# gpg-error.m4 - autoconf macro to detect libgpg-error. # gpg-error.m4 - autoconf macro to detect libgpg-error.
# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020, 2021, 2022 # Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020, 2021, 2022, 2024
# g10 Code GmbH # g10 Code GmbH
# #
# This file is free software; as a special exception the author gives # This file is free software; as a special exception the author gives
@ -10,7 +10,7 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# #
# Last-changed: 2023-04-01 # Last-changed: 2024-06-13
dnl dnl
dnl Find gpg-error-config, for backward compatibility dnl Find gpg-error-config, for backward compatibility
@ -125,17 +125,16 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl
fi fi
if test -n "$gpgrt_libdir"; then if test -n "$gpgrt_libdir"; then
# Add the --libdir option to GPGRT_CONFIG
GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then # Make sure if gpgrt-config really works, by testing config gpg-error
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" if ! $GPGRT_CONFIG gpg-error --exists; then
AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) # If it doesn't work, clear the GPGRT_CONFIG variable.
gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
else
gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
unset GPGRT_CONFIG unset GPGRT_CONFIG
fi fi
elif test "$GPG_ERROR_CONFIG" != "no"; then else
gpg_error_config_version=`$GPG_ERROR_CONFIG --version` # GPGRT_CONFIG found but no suitable dir for --libdir found.
# This is a failure. Clear the GPGRT_CONFIG variable.
unset GPGRT_CONFIG unset GPGRT_CONFIG
fi fi
]) ])
@ -152,10 +151,20 @@ dnl searched in $SYSROOT/bin and then along $PATH. If the used
dnl config script does not match the host specification the script dnl config script does not match the host specification the script
dnl is added to the gpg_config_script_warn variable. dnl is added to the gpg_config_script_warn variable.
dnl dnl
AC_DEFUN([AM_PATH_GPG_ERROR],[dnl AC_DEFUN([AM_PATH_GPG_ERROR],
AC_REQUIRE([AC_CANONICAL_HOST])dnl [ AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl
AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
elif test x"$GPG_ERROR_CONFIG" != x -a "$GPG_ERROR_CONFIG" != "no"; then
gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
else
gpg_error_config_version="0.0"
fi
min_gpg_error_version=ifelse([$1], ,1.33,$1) min_gpg_error_version=ifelse([$1], ,1.33,$1)
ok=no ok=no
if test "$GPG_ERROR_CONFIG" != "no"; then if test "$GPG_ERROR_CONFIG" != "no"; then

17
m4/libassuan.m4
View File

@ -9,7 +9,7 @@ dnl This file is distributed in the hope that it will be useful, but
dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
dnl SPDX-License-Identifier: FSFULLR dnl SPDX-License-Identifier: FSFULLR
# Last-changed: 2024-05-14 # Last-changed: 2024-06-13
dnl dnl
dnl Find gpgrt-config, which uses .pc file dnl Find gpgrt-config, which uses .pc file
@ -82,17 +82,16 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl
fi fi
if test -n "$gpgrt_libdir"; then if test -n "$gpgrt_libdir"; then
# Add the --libdir option to GPGRT_CONFIG
GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then # Make sure if gpgrt-config really works, by testing config gpg-error
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" if ! $GPGRT_CONFIG gpg-error --exists; then
AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) # If it doesn't work, clear the GPGRT_CONFIG variable.
gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
else
gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
unset GPGRT_CONFIG unset GPGRT_CONFIG
fi fi
elif test "$GPG_ERROR_CONFIG" != "no"; then else
gpg_error_config_version=`$GPG_ERROR_CONFIG --version` # GPGRT_CONFIG found but no suitable dir for --libdir found.
# This is a failure. Clear the GPGRT_CONFIG variable.
unset GPGRT_CONFIG unset GPGRT_CONFIG
fi fi
]) ])