diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2023-04-06 08:40:12 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2023-04-06 08:40:12 +0900 |
| commit | 806a5d18b988449fbaa3c2e6380acf3ae4580f4a (patch) | |
| tree | 4362c933705e7b1d9494262d7ff05ee73c824838 | |
| parent | d256ba7cc57d9bfcfa05fb05cf66dc992efbb695 (diff) | |
| download | gpgme-806a5d18b988449fbaa3c2e6380acf3ae4580f4a.tar.gz | |
build: Update gpg-error.m4.
* m4/gpg-error.m4: Update from libgpg-error master.
--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | m4/gpg-error.m4 | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 index 908e6048..7fa52b12 100644 --- a/m4/gpg-error.m4 +++ b/m4/gpg-error.m4 @@ -10,7 +10,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: 2022-11-15 +# Last-changed: 2023-04-01 dnl dnl Find gpg-error-config, for backward compatibility @@ -115,12 +115,9 @@ AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl fi if test -n "$gpgrt_libdir"; then break; fi done - if test -z "$libdir_candidates"; then - # No valid pkgconfig dir in any of the system directories, fallback - gpgrt_libdir=${possible_libdir1} - fi - else - # When we cannot determine system libdir-format, use this: + fi + if test -z "$gpgrt_libdir"; then + # No valid pkgconfig dir in any of the system directories, fallback gpgrt_libdir=${possible_libdir1} fi 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]) gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` else + gpg_error_config_version=`$GPG_ERROR_CONFIG --version` unset GPGRT_CONFIG fi elif test "$GPG_ERROR_CONFIG" != "no"; then |