Browse Source

build: Update gpg-error.m4.

* m4/gpg-error.m4: Update from libgpg-error.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
gniibe/pcsc-get-status
NIIBE Yutaka 6 months ago
parent
commit
8d6152a4cf
  1. 7
      m4/gpg-error.m4

7
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: 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

Loading…
Cancel
Save