build-sys: libgcrypt error messages make no sense without libgpg-error
Hence, pull in this library too, if we need libgcrypt.
This commit is contained in:
parent
d42800f18e
commit
d28ac939c1
18
configure.ac
18
configure.ac
|
@ -708,7 +708,7 @@ AC_ARG_ENABLE([gcrypt],
|
||||||
|
|
||||||
if test "x${have_gcrypt}" != xno ; then
|
if test "x${have_gcrypt}" != xno ; then
|
||||||
m4_define([AM_PATH_LIBGCRYPT_FAIL],
|
m4_define([AM_PATH_LIBGCRYPT_FAIL],
|
||||||
[{ test "x$have_gcrypt" != xyes || AC_MSG_ERROR([*** GCRYPT headers not found.]); }]
|
[{ test "x$have_gcrypt" != xyes || AC_MSG_ERROR([*** GCRYPT/GPG-ERROR headers not found.]); }]
|
||||||
)
|
)
|
||||||
m4_ifdef([AM_PATH_LIBGCRYPT], [AM_PATH_LIBGCRYPT(
|
m4_ifdef([AM_PATH_LIBGCRYPT], [AM_PATH_LIBGCRYPT(
|
||||||
[1.4.5],
|
[1.4.5],
|
||||||
|
@ -723,12 +723,22 @@ if test "x${have_gcrypt}" != xno ; then
|
||||||
[AM_PATH_LIBGCRYPT_FAIL]
|
[AM_PATH_LIBGCRYPT_FAIL]
|
||||||
)
|
)
|
||||||
|
|
||||||
if test "x$have_gcrypt" = xyes ; then
|
have_gpg_error=no
|
||||||
GCRYPT_LIBS="$LIBGCRYPT_LIBS"
|
m4_ifdef([AM_PATH_GPG_ERROR], [AM_PATH_GPG_ERROR(
|
||||||
GCRYPT_CFLAGS="$LIBGCRYPT_CFLAGS"
|
[1.12],
|
||||||
|
[have_gpg_error=yes],
|
||||||
|
[AM_PATH_LIBGCRYPT_FAIL]
|
||||||
|
)],
|
||||||
|
[AM_PATH_LIBGCRYPT_FAIL]
|
||||||
|
)
|
||||||
|
|
||||||
|
if test "x$have_gcrypt" = xyes -a "x$have_gpg_error" = xyes ; then
|
||||||
|
GCRYPT_LIBS="$LIBGCRYPT_LIBS $GPG_ERROR_LIBS"
|
||||||
|
GCRYPT_CFLAGS="$LIBGCRYPT_CFLAGS $GPG_ERROR_CFLAGS"
|
||||||
AC_DEFINE(HAVE_GCRYPT, 1, [GCRYPT available])
|
AC_DEFINE(HAVE_GCRYPT, 1, [GCRYPT available])
|
||||||
else
|
else
|
||||||
have_gcrypt=no
|
have_gcrypt=no
|
||||||
|
have_gpg_error=no
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
GCRYPT_LIBS=
|
GCRYPT_LIBS=
|
||||||
|
|
Loading…
Reference in a new issue