From bb9a89bf5defa793ae9c1939d9476f6dfd46d448 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 26 Oct 2018 09:17:49 +0900 Subject: build: Improve libassuan.m4. * src/libassuan.m4: Don't try gpgrt-config when LIBASSUAN_CONFIG set. Fall back to detecting libassuan-config, when gpgrt-config doesn't work well. Signed-off-by: NIIBE Yutaka --- src/libassuan.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libassuan.m4 b/src/libassuan.m4 index 798e458..a39ed76 100644 --- a/src/libassuan.m4 +++ b/src/libassuan.m4 @@ -26,13 +26,13 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], fi fi - if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then + use_gpgrt_config="" + if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then if CC=$CC $GPGRT_CONFIG libassuan >/dev/null 2>&1; then LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan" - else - LIBASSUAN_CONFIG=no + use_gpgrt_config=yes fi - else + if test -z "$use_gpgrt_config"; then AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no) fi -- cgit v1.2.1