Ensure ENABLE_SSH_AGENT conditional is always defined within automake.

This commit is contained in:
Michael Jumper 2014-01-03 18:33:54 -08:00
parent 5afe6daac9
commit 678becb267

View File

@ -568,20 +568,14 @@ AC_SUBST(SSH_LIBS)
# Agent forwarding support within libssh2
#
if test "x${have_libssh2}" = "xyes"
have_ssh_agent=no
if test "x${have_libssh2}" = "xyes" -a "x${enable_ssh_agent}" = "xyes"
then
have_ssh_agent=yes
AC_CHECK_DECL([libssh2_channel_request_auth_agent],
[], [have_ssh_agent=no],
[have_ssh_agent=yes], [],
[[#include <libssh2.h>]])
AM_CONDITIONAL([ENABLE_SSH_AGENT],
[test "x${have_ssh_agent}" = "xyes" \
-a "x${enable_ssh_agent}" = "xyes"])
if test "x${enable_ssh_agent}" = "xyes"
then
if test "x${have_ssh_agent}" = "xno"
then
AC_MSG_ERROR([
@ -593,10 +587,12 @@ then
AC_DEFINE([ENABLE_SSH_AGENT],,
[Whether agent forwarding support for SSH is enabled])
fi
fi
fi
AM_CONDITIONAL([ENABLE_SSH_AGENT],
[test "x${have_ssh_agent}" = "xyes" \
-a "x${enable_ssh_agent}" = "xyes"])
AC_CONFIG_FILES([Makefile
tests/Makefile