From 8f034bb3a1bbde2fc7a8d2ada6e3d779c465895b Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 1 Nov 2018 12:05:53 +0900 Subject: gpg-error.m4: Unset GPGRT_CONFIG when gpgrt-config doesn't work. * src/gpg-error.m4: Unset GPGRT_CONFIG when gpgrt-config doesn't work. Signed-off-by: NIIBE Yutaka --- src/gpg-error.m4 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gpg-error.m4 b/src/gpg-error.m4 index 0964a26..f643307 100644 --- a/src/gpg-error.m4 +++ b/src/gpg-error.m4 @@ -73,6 +73,8 @@ AC_DEFUN([AM_PATH_GPG_ERROR], GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" use_gpgrt_config=yes gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` + else + unset GPGRT_CONFIG fi fi else @@ -101,8 +103,12 @@ AC_DEFUN([AM_PATH_GPG_ERROR], AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) if test "$GPGRT_CONFIG" != "no"; then GPGRT_CONFIG="$GPGRT_CONFIG --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir" - GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" - use_gpgrt_config=yes + if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then + GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" + use_gpgrt_config=yes + else + unset GPGRT_CONFIG + fi fi fi fi -- cgit v1.2.3