[git] GnuPG - branch, master, updated. gnupg-2.2.7-249-g8e84efb
by NIIBE Yutaka
cvs at cvs.gnupg.org
Fri Nov 2 05:08:43 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 "The GNU Privacy Guard".
The branch, master has been updated
via 8e84efbe35633275e260712ba38a505e3f9d0898 (commit)
from fd7aee6a97134fdf48a496841241f8ae25736e61 (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 8e84efbe35633275e260712ba38a505e3f9d0898
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Fri Nov 2 13:06:43 2018 +0900
build: Update *.m4 from libraries.
* m4/gpg-error.m4: Update from master.
* m4/ksba.m4: Ditto.
* m4/libassuan.m4: Ditto.
* m4/libgcrypt.m4: Ditto.
* m4/npth.m4: Ditto.
* m4/ntbtls.m4: Ditto.
--
Do it again today.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 0964a26..a9d572f 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.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-10-29
+# Last-changed: 2018-11-02
dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@@ -64,15 +64,42 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
min_gpg_error_version=ifelse([$1], ,1.33,$1)
ok=no
- use_gpgrt_config=""
- if test "$GPG_ERROR_CONFIG" = "no"; then
+ if test "$prefix" = NONE ; then
+ prefix_option_expanded=/usr/local
+ else
+ prefix_option_expanded="$prefix"
+ fi
+ if test "$exec_prefix" = NONE ; then
+ exec_prefix_option_expanded=$prefix_option_expanded
+ else
+ exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix)
+ fi
+ libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir)
+
+ if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then
+ gpgrt_libdir=$libdir_option_expanded
+ else
+ if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then
+ if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then
+ if test -f $possible_libdir/pkgconfig/gpg-error.pc; then
+ gpgrt_libdir=$possible_libdir
+ fi
+ fi
+ fi
+ fi
+
+ if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then
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"
+ if test "$GPGRT_CONFIG" = "no"; then
+ unset GPGRT_CONFIG
+ else
+ GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
- use_gpgrt_config=yes
+ AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
+ else
+ unset GPGRT_CONFIG
fi
fi
else
@@ -96,13 +123,19 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
fi
fi
- if test -z "$GPGRT_CONFIG"; then
+ if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then
if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then
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 test "$GPGRT_CONFIG" = "no"; then
+ unset GPGRT_CONFIG
+ else
+ GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
+ if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
+ GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
+ AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
+ else
+ unset GPGRT_CONFIG
+ fi
fi
fi
fi
@@ -111,7 +144,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
if test $ok = yes; then
GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
- if test -z "$use_gpgrt_config"; then
+ if test -z "$GPGRT_CONFIG"; then
GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null`
GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null`
else
@@ -122,7 +155,7 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
fi
AC_MSG_RESULT([yes ($gpg_error_config_version)])
ifelse([$2], , :, [$2])
- if test -z "$use_gpgrt_config"; then
+ if test -z "$GPGRT_CONFIG"; then
gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none`
else
gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none`
diff --git a/m4/ksba.m4 b/m4/ksba.m4
index ee4b962..ad8de4f 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -46,6 +46,7 @@ AC_DEFUN([AM_PATH_KSBA],
if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
if $GPGRT_CONFIG ksba --exists; then
KSBA_CONFIG="$GPGRT_CONFIG ksba"
+ AC_MSG_NOTICE([Use gpgrt-config as ksba-config])
use_gpgrt_config=yes
fi
fi
diff --git a/m4/libassuan.m4 b/m4/libassuan.m4
index 52058ea..4af2d04 100644
--- a/m4/libassuan.m4
+++ b/m4/libassuan.m4
@@ -30,6 +30,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
if $GPGRT_CONFIG libassuan --exists; then
LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
+ AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
use_gpgrt_config=yes
fi
fi
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 2646e96..40ea01c 100644
--- a/m4/libgcrypt.m4
+++ b/m4/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-10-29
+# Last-changed: 2018-11-02
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
@@ -56,6 +56,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
if test x"${LIBGCRYPT_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
if $GPGRT_CONFIG libgcrypt --exists; then
LIBGCRYPT_CONFIG="$GPGRT_CONFIG libgcrypt"
+ AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config])
use_gpgrt_config=yes
fi
fi
diff --git a/m4/npth.m4 b/m4/npth.m4
index 7296cbc..7d3e73f 100644
--- a/m4/npth.m4
+++ b/m4/npth.m4
@@ -22,6 +22,7 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG],
if test x"$NPTH_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
if $GPGRT_CONFIG npth --exists; then
NPTH_CONFIG="$GPGRT_CONFIG npth"
+ AC_MSG_NOTICE([Use gpgrt-config as npth-config])
use_gpgrt_config=yes
fi
fi
diff --git a/m4/ntbtls.m4 b/m4/ntbtls.m4
index c4e07dc..7bbd569 100644
--- a/m4/ntbtls.m4
+++ b/m4/ntbtls.m4
@@ -50,6 +50,7 @@ AC_DEFUN([AM_PATH_NTBTLS],
if test x"${NTBTLS_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
if $GPGRT_CONFIG ntbtls --exists; then
NTBTLS_CONFIG="$GPGRT_CONFIG ntbtls"
+ AC_MSG_NOTICE([Use gpgrt-config as ntbtls-config])
use_gpgrt_config=yes
fi
fi
-----------------------------------------------------------------------
Summary of changes:
m4/gpg-error.m4 | 59 ++++++++++++++++++++++++++++++++++++++++++++-------------
m4/ksba.m4 | 1 +
m4/libassuan.m4 | 1 +
m4/libgcrypt.m4 | 3 ++-
m4/npth.m4 | 1 +
m4/ntbtls.m4 | 1 +
6 files changed, 52 insertions(+), 14 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list