maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure ENABLE_SSH_AGENT conditional is always defined within automake.

Browse Source
This commit is contained in:
Michael Jumper 2014-01-03 18:33:54 -08:00
parent 5afe6daac9
commit 678becb267
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
configure.ac
View File

@ -568,35 +568,31 @@ AC_SUBST(SSH_LIBS)
# Agent forwarding support within libssh2 # 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 then
have_ssh_agent=yes
AC_CHECK_DECL([libssh2_channel_request_auth_agent], AC_CHECK_DECL([libssh2_channel_request_auth_agent],
[], [have_ssh_agent=no], [have_ssh_agent=yes], [],
[[#include <libssh2.h>]]) [[#include <libssh2.h>]])
AM_CONDITIONAL([ENABLE_SSH_AGENT], if test "x${have_ssh_agent}" = "xno"
[test "x${have_ssh_agent}" = "xyes" \
-a "x${enable_ssh_agent}" = "xyes"])
if test "x${enable_ssh_agent}" = "xyes"
then then
if test "x${have_ssh_agent}" = "xno" AC_MSG_ERROR([
then --------------------------------------------
AC_MSG_ERROR([ Agent forwarding support was requested but no such support was found
-------------------------------------------- in libssh2.
Agent forwarding support was requested but no such support was found --------------------------------------------])
in libssh2. else
--------------------------------------------]) AC_DEFINE([ENABLE_SSH_AGENT],,
else [Whether agent forwarding support for SSH is enabled])
AC_DEFINE([ENABLE_SSH_AGENT],,
[Whether agent forwarding support for SSH is enabled])
fi
fi fi
fi fi
AM_CONDITIONAL([ENABLE_SSH_AGENT],
[test "x${have_ssh_agent}" = "xyes" \
-a "x${enable_ssh_agent}" = "xyes"])
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
tests/Makefile tests/Makefile