security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

build: Update gpg-error.m4. 

* m4/gpg-error.m4: Update from libgpg-error.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2021-02-15 10:15:13 +09:00
parent 42e637a1c3
commit 985e85dc0e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
m4/gpg-error.m4
View File

@ -9,7 +9,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: 2021-02-12 # Last-changed: 2021-02-15
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@ -65,9 +65,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
ok=no ok=no
AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
if test "$GPGRT_CONFIG" == "no"; then if test "$GPGRT_CONFIG" != "no"; then
unset GPGRT_CONFIG
else
# Determine gpgrt_libdir # Determine gpgrt_libdir
# #
# Get the prefix of gpgrt-config assuming it's something like: # Get the prefix of gpgrt-config assuming it's something like:
@ -103,9 +101,11 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
# When we cannot determine system libdir-format, use this: # When we cannot determine system libdir-format, use this:
gpgrt_libdir=${possible_libdir1} gpgrt_libdir=${possible_libdir1}
fi fi
else
unset GPGRT_CONFIG
fi fi
if test "$GPG_ERROR_CONFIG" = "no" -o -n "$gpgrt_libdir"; then if test -n "$gpgrt_libdir"; then
GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
@ -114,7 +114,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
else else
unset GPGRT_CONFIG unset GPGRT_CONFIG
fi fi
else elif test "$GPG_ERROR_CONFIG" != "no"; then
gpg_error_config_version=`$GPG_ERROR_CONFIG --version` gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
fi fi
if test "$GPG_ERROR_CONFIG" != "no"; then if test "$GPG_ERROR_CONFIG" != "no"; then