picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-sys: only use AM_PATH_LIBGCRYPT macro if it exists

Browse source 
If gcrypt's m4 macro files aren't installed, with this change, gcrypt
will be disabled --- unless gcrypt support was explicitly requested by
passing --enable-gcrypt to configure, in which case it will fail.
Without this change, autoconf would fail either way with not being able
to resolve AM_PATH_LIBGCRYPT.
This commit is contained in:
Olof Johansson 2015-09-17 10:42:55 +02:00
parent 7ee7b225bd
commit 79e8bde40d
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
configure.ac
View file

@ -677,12 +677,21 @@ AC_ARG_ENABLE([gcrypt],
[have_gcrypt=auto])
if test "x${have_gcrypt}" != xno ; then
AM_PATH_LIBGCRYPT(
[1.4.5],
[have_gcrypt=yes],
[if test "x$have_gcrypt" = xyes ; then
AC_MSG_ERROR([*** GCRYPT headers not found.])
fi])
m4_define([AM_PATH_LIBGCRYPT_FAIL],
[{ test "x$have_gcrypt" != xyes || AC_MSG_ERROR([*** GCRYPT headers not found.]); }]
)
m4_ifdef([AM_PATH_LIBGCRYPT], [AM_PATH_LIBGCRYPT(
[1.4.5],
[have_gcrypt=yes],
dnl If we have the gcrypt m4 macros, but don't have
dnl gcrypt, throw an error if gcrypt is explicitly
dnl requested.
[AM_PATH_LIBGCRYPT_FAIL]
)],
dnl If we don't have the gcrypt m4 macros, but build with
dnl gcrypt explicitly requested, throw an error.
[AM_PATH_LIBGCRYPT_FAIL]
)
if test "x$have_gcrypt" = xyes ; then
GCRYPT_LIBS="$LIBGCRYPT_LIBS"