summaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2022-10-24 05:11:47 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2022-10-24 05:11:47 +0200
commitb9d05774f565a895a41764310308984a33be3c84 (patch)
treeb05d8644ccfffba0802b4c9ab99ec0be5c175f61 /m4
parentpo: Update Simplified Chinese Translation. (diff)
downloadgnupg2-b9d05774f565a895a41764310308984a33be3c84.tar.xz
gnupg2-b9d05774f565a895a41764310308984a33be3c84.zip
build: Update gpg-error.m4.
* m4/gpg-error.m4: Update from libgpg-error 1.46. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'm4')
-rw-r--r--m4/gpg-error.m46
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 4b5cd40b6..a975e53d0 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-02-15
+# Last-changed: 2022-09-21
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@@ -120,6 +120,10 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
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:
gpgrt_libdir=${possible_libdir1}