[git] GCRYPT - branch, master, updated. libgcrypt-1.8.1-106-g630ece1

[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 "The GNU crypto library".

The branch, master has been updated
       via  630ece1b7e0a94442bca91d8e96d9b1d4cd3ec66 (commit)
      from  8e5641ed65f86783542d5caccdeeee42eeb9457c (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 630ece1b7e0a94442bca91d8e96d9b1d4cd3ec66
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 26 09:38:47 2018 +0900

    build: Fix libgcrypt.m4.
    
    * src/libgcrypt.m4: Use AC_PATH_PROG to detect libgcrypt-config.
    
    --
    
    Last commit using AC_PATH_TOOL was wrong.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
index ccbc377..e674293 100644
--- a/src/libgcrypt.m4
+++ b/src/libgcrypt.m4
@@ -52,16 +52,15 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
      fi
   fi
 
-  if test x"${LIBGCRYPT_CONFIG}" = x ; then
-    if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
-      if CC=$CC $GPGRT_CONFIG libgcrypt >/dev/null 2>&1; then
-        LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
-        libgcrypt_config_by_gpgrt=yes
-      fi
+  use_gpgrt_config=""
+  if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+    if CC=$CC $GPGRT_CONFIG libgcrypt >/dev/null 2>&1; then
+      LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
+      use_gpgrt_config=yes
     fi
   fi
-  if test -z "$libgcrypt_config_by_gpgrt"; then
-    AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+  if test -z "$use_gpgrt_config"; then
+    AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
   fi
 
   tmp=ifelse([$1], ,1:1.2.0,$1)

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

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


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits