[git] Assuan - branch, master, updated. libassuan-2.5.1-15-gb7922ea

[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  b7922ea7ae2c3d385a7b3b3a5f33987705cfdd2b (commit)
      from  1dd2430d8877ffda43bc46f0d5f23fea4801ecf6 (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 b7922ea7ae2c3d385a7b3b3a5f33987705cfdd2b
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Oct 25 20:31:08 2018 +0900

    build: Relax requirements.
    
    * m4/gpg-error.m4: Update from libgpg-error 1.33.
    * src/libassuan.m4: Don't require AM_PATH_GPG_ERROR.  Only when
    gpgrt-config is available and works well, use it.
    * configure.ac (AM_PATH_GPG_ERROR): No requirement any more.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/configure.ac b/configure.ac
index 15f6f18..06923cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -354,7 +354,7 @@ AM_CONDITIONAL(USE_DESCRIPTOR_PASSING, test "$use_descriptor_passing" = "yes")
 
 
 # Checking for libgpg-error.
-AM_PATH_GPG_ERROR(1.33,, AC_MSG_ERROR([libgpg-error was not found]))
+AM_PATH_GPG_ERROR(1.17,, AC_MSG_ERROR([libgpg-error was not found]))
 
 #
 # Checks for library functions.
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 0f46cd6..f89a4ee 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -62,15 +62,21 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
 
   AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
   min_gpg_error_version=ifelse([$1], ,1.33,$1)
-  AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
   ok=no
-  if test "$GPG_ERROR_CONFIG" != "no" \
-     && test -f "$GPG_ERROR_CONFIG" ; then
+  if test "$GPG_ERROR_CONFIG" = "no"; then
+    AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
+    if CC=$CC $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
+      GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+      gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG --modversion`
+    fi
+  else
+    gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG --version`
+  fi
+  if test "$GPG_ERROR_CONFIG" != "no"; then
     req_major=`echo $min_gpg_error_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_gpg_error_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-    gpg_error_config_version=`CC=$CC $GPG_ERROR_CONFIG --version`
     major=`echo $gpg_error_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $gpg_error_config_version | \
@@ -84,7 +90,14 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
             fi
         fi
     fi
+    if test -z "$GPGRT_CONFIG"; then
+      if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then
+        AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
+        GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+      fi
+    fi
   fi
+  AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
   if test $ok = yes; then
     GPG_ERROR_CFLAGS=`CC=$CC $GPG_ERROR_CONFIG --cflags`
     GPG_ERROR_LIBS=`CC=$CC $GPG_ERROR_CONFIG --libs`
diff --git a/src/libassuan.m4 b/src/libassuan.m4
index ab1e855..85f79f3 100644
--- a/src/libassuan.m4
+++ b/src/libassuan.m4
@@ -16,7 +16,6 @@ dnl Returns ok set to yes or no.
 dnl
 AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
 [ AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AM_PATH_GPG_ERROR])
   AC_ARG_WITH(libassuan-prefix,
               AC_HELP_STRING([--with-libassuan-prefix=PFX],
                              [prefix where LIBASSUAN is installed (optional)]),
@@ -25,8 +24,16 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
     if test x${LIBASSUAN_CONFIG+set} != xset ; then
       LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
     fi
+  fi
+
+  if test x"$GPGRT_CONFIG" != x -o "$GPGRT_CONFIG" != "no"; then
+    if CC=$CC $GPGRT_CONFIG libassuan >/dev/null 2>&1; then
+      LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
+    else
+      LIBASSUAN_CONFIG=no
+    fi
   else
-    LIBASSUAN_CONFIG="$GPG_ERROR_CONFIG libassuan"
+    AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no)
   fi
 
   tmp=ifelse([$1], ,1:0.9.2,$1)
@@ -40,8 +47,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
 
   AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
   ok=no
-  if test "$LIBASSUAN_CONFIG" != "no" \
-     && test -f "${LIBASSUAN_CONFIG% *}" ; then
+  if test "$LIBASSUAN_CONFIG" != "no"; then
     req_major=`echo $min_libassuan_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_libassuan_version | \

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

Summary of changes:
 configure.ac     |  2 +-
 m4/gpg-error.m4  | 21 +++++++++++++++++----
 src/libassuan.m4 | 14 ++++++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)


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