diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2023-03-23 11:58:27 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2023-03-23 11:58:27 +0900 |
| commit | ed36ba06f907c0d67f8a60930dc329d58a4cd77d (patch) | |
| tree | 39e6076f1df5e4433ed8982576595a3840aec45f | |
| parent | 68333be63042be281a497a5751474e9e3d119dc3 (diff) | |
| download | libgpg-error-ed36ba06f907c0d67f8a60930dc329d58a4cd77d.tar.gz | |
m4: Fallback to $possible_libdir1, when not found with $CC.
* src/gpg-error.m4: Try $possible_libdir1 for gpgrt_libdir.
--
GnuPG-bug-id: 6388
Reported-by: Andrew Collier <acollier@undo.io>
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | src/gpg-error.m4 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 index 908e604..c5bde75 100644 --- a/src/gpg-error.m4 +++ b/src/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-03-23 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 |