build: Update gpg-error.m4.
* m4/gpg-error.m4: Update from libgpg-error master. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
d256ba7cc5
commit
806a5d18b9
@ -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: 2022-11-15
|
# Last-changed: 2023-04-01
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Find gpg-error-config, for backward compatibility
|
dnl Find gpg-error-config, for backward compatibility
|
||||||
@ -115,12 +115,9 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl
|
|||||||
fi
|
fi
|
||||||
if test -n "$gpgrt_libdir"; then break; fi
|
if test -n "$gpgrt_libdir"; then break; fi
|
||||||
done
|
done
|
||||||
if test -z "$libdir_candidates"; then
|
|
||||||
# No valid pkgconfig dir in any of the system directories, fallback
|
|
||||||
gpgrt_libdir=${possible_libdir1}
|
|
||||||
fi
|
fi
|
||||||
else
|
if test -z "$gpgrt_libdir"; then
|
||||||
# When we cannot determine system libdir-format, use this:
|
# No valid pkgconfig dir in any of the system directories, fallback
|
||||||
gpgrt_libdir=${possible_libdir1}
|
gpgrt_libdir=${possible_libdir1}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
@ -134,6 +131,7 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl
|
|||||||
AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
||||||
gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
|
gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
|
||||||
else
|
else
|
||||||
|
gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
|
||||||
unset GPGRT_CONFIG
|
unset GPGRT_CONFIG
|
||||||
fi
|
fi
|
||||||
elif test "$GPG_ERROR_CONFIG" != "no"; then
|
elif test "$GPG_ERROR_CONFIG" != "no"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user