[git] GCRYPT - branch, master, updated. libgcrypt-1.8.1-127-g8522453

[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  852245390ef7fd8ca9e36010886a4cf42cf710bf (commit)
       via  bea193446351c24b10a4342466978d57bd53f599 (commit)
      from  3f76319803a4abcd33fa29a0ac39f8ed9d646226 (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 852245390ef7fd8ca9e36010886a4cf42cf710bf
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Nov 13 10:30:39 2018 +0900

    libgcrypt.m4: Prefer gpgrt-config to SYSROOT support.
    
    * libgcrypt.m4: Move SYSROOT support after check of GPGRT_CONFIG.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
index 40ea01c..37dfbea 100644
--- a/src/libgcrypt.m4
+++ b/src/libgcrypt.m4
@@ -9,7 +9,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# Last-changed: 2018-11-02
+# Last-changed: 2018-11-13
 
 
 dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
@@ -36,19 +36,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
   if test x"${LIBGCRYPT_CONFIG}" = x ; then
      if test x"${libgcrypt_config_prefix}" != x ; then
         LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
-     else
-       case "${SYSROOT}" in
-         /*)
-           if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
-             LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
-           fi
-           ;;
-         '')
-           ;;
-          *)
-           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
-           ;;
-       esac
      fi
   fi
 
@@ -61,6 +48,20 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
     fi
   fi
   if test -z "$use_gpgrt_config"; then
+    if test x"${LIBGCRYPT_CONFIG}" = x ; then
+      case "${SYSROOT}" in
+         /*)
+           if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
+             LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
+           fi
+           ;;
+         '')
+           ;;
+          *)
+           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+           ;;
+      esac
+    fi
     AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
   fi
 

commit bea193446351c24b10a4342466978d57bd53f599
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Nov 13 09:36:37 2018 +0900

    build: Update autogen.rc.
    
    * autogen.rc: Remove obsolete --with-gpg-error-prefix option.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/autogen.rc b/autogen.rc
index 09a9b9c..646f659 100644
--- a/autogen.rc
+++ b/autogen.rc
@@ -2,15 +2,11 @@
 
 case "$myhost" in
   w32)
-    configure_opts="
-      --with-gpg-error-prefix=@SYSROOT@
-      "
+    configure_opts=""
     ;;
 
   amd64)
-    configure_opts="
-      --with-gpg-error-prefix=@SYSROOT@
-     "
+    configure_opts=""
     ;;
 esac
 

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

Summary of changes:
 autogen.rc       |  8 ++------
 src/libgcrypt.m4 | 29 +++++++++++++++--------------
 2 files changed, 17 insertions(+), 20 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