diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2021-03-31 09:56:45 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2021-03-31 09:56:45 +0900 |
| commit | 9b9c5dfa1020ce5a5a5e4954c58112d2707ec578 (patch) | |
| tree | 588e5177ecb54071242f6cb40385c4dad1df7d32 | |
| parent | 33593864cd54143db594c4237bba41e14179061c (diff) | |
| download | libgpg-error-9b9c5dfa1020ce5a5a5e4954c58112d2707ec578.tar.gz | |
m4: Support cross-compiling better.
* src/gpg-error.m4 (GPGRT_CONFIG): Prefer the one under $prefix.
(sed expression): Better compatibility to POSIX sed.
--
GnuPG-bug-id: 5365
Reported-by: Jay Freeman (saurik)
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | src/gpg-error.m4 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 index d910754..307a23f 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: 2021-02-16 +# Last-changed: 2021-03-31 dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, @@ -65,7 +65,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR], min_gpg_error_version=ifelse([$1], ,1.33,$1) ok=no - AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) + AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH]) if test "$GPGRT_CONFIG" != "no"; then # Determine gpgrt_libdir # @@ -80,7 +80,8 @@ AC_DEFUN([AM_PATH_GPG_ERROR], # Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64 # It is assumed that CC is specified to the one of host on cross build. if libdir_candidates=$(${CC:-cc} -print-search-dirs | \ - sed -n -e "/^libraries/{s/libraries: =//;s/:/\n/gp}"); then + sed -n -e "/^libraries/{s/libraries: =//;s/:/\ +/g;p;}"); then # From the output of -print-search-dirs, select valid pkgconfig dirs. libdir_candidates=$(for dir in $libdir_candidates; do if p=$(cd $dir 2>/dev/null && pwd); then |