[git] KSBA - branch, master, updated. libksba-1.3.5-26-gf0116c0

[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 "KSBA is a library to access X.509 certificates and CMS data.".

The branch, master has been updated
       via  f0116c07d0d89fc7114dedeb3fc638ab9dae2254 (commit)
      from  a32a50c7726ee7c6ac320d99b9ab42f073960cc9 (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 f0116c07d0d89fc7114dedeb3fc638ab9dae2254
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 26 09:23:44 2018 +0900

    build: Improve ksba.m4.
    
    * src/ksba.m4: Don't try gpgrt-config when LIBKSBA_CONFIG set.  Fall
    back to detecting ksba-config, when gpgrt-config doesn't work well.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/src/ksba.m4 b/src/ksba.m4
index 43fb1f2..d02954a 100644
--- a/src/ksba.m4
+++ b/src/ksba.m4
@@ -41,13 +41,15 @@ AC_DEFUN([AM_PATH_KSBA],
       KSBA_CONFIG=$ksba_config_prefix/bin/ksba-config
     fi
   fi
-  if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+
+  use_gpgrt_config=""
+  if test x"$KSBA_CONFIG" != x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
     if CC=$CC $GPGRT_CONFIG libksba >/dev/null 2>&1; then
       LIBKSBA_CONFIG="$GPGRT_CONFIG libksba"
-    else
-      LIBKSBA_CONFIG=no
+      use_gpgrt_config=yes
     fi
-  else
+  fi
+  if test -z "$use_gpgrt_config"; then
     AC_PATH_TOOL(LIBKSBA_CONFIG, ksba-config, no)
   fi
 

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

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


hooks/post-receive
-- 
KSBA is a library to access X.509 certificates and CMS data.
http://git.gnupg.org