[git] Assuan - branch, master, updated. libassuan-2.5.1-17-gbb9a89b

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".

The branch, master has been updated
       via  bb9a89bf5defa793ae9c1939d9476f6dfd46d448 (commit)
      from  0a3192ae33f6b57312cb5bfec0e8fd491c923728 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bb9a89bf5defa793ae9c1939d9476f6dfd46d448
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 26 09:17:49 2018 +0900

    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 <gniibe at fsij.org>

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
 

-----------------------------------------------------------------------

Summary of changes:
 src/libassuan.m4 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
IPC library used by GnuPG
http://git.gnupg.org