[git] GPG-ERROR - branch, master, updated. libgpg-error-1.32-47-g8f034bb

by NIIBE Yutaka cvs at cvs.gnupg.org
Thu Nov 1 04:14:15 CET 2018


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 "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  8f034bb3a1bbde2fc7a8d2ada6e3d779c465895b (commit)
      from  998313bd321ae161ec58111ccc6c6f0921007bc5 (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 8f034bb3a1bbde2fc7a8d2ada6e3d779c465895b
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Nov 1 12:05:53 2018 +0900

    gpg-error.m4: Unset GPGRT_CONFIG when gpgrt-config doesn't work.
    
    * src/gpg-error.m4: Unset GPGRT_CONFIG when gpgrt-config doesn't work.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
index 0964a26..f643307 100644
--- a/src/gpg-error.m4
+++ b/src/gpg-error.m4
@@ -73,6 +73,8 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
         GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
         use_gpgrt_config=yes
         gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
+      else
+        unset GPGRT_CONFIG
       fi
     fi
   else
@@ -101,8 +103,12 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
         AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
         if test "$GPGRT_CONFIG" != "no"; then
           GPGRT_CONFIG="$GPGRT_CONFIG --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir"
-          GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
-          use_gpgrt_config=yes
+          if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
+            GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+            use_gpgrt_config=yes
+          else
+            unset GPGRT_CONFIG
+          fi
         fi
       fi
     fi

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

Summary of changes:
 src/gpg-error.m4 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org




More information about the Gnupg-commits mailing list