From f371e0ae2697031a42cfd573079c9261bc731091 Mon Sep 17 00:00:00 2001 From: Michael Steinert Date: Thu, 24 May 2012 20:07:07 -0600 Subject: Fix non-SSL build in the tools directory Also reduce OpenSSL requirement to 1.0.0 (0.9.8 would probably be fine as well). Signed-off-by: Michael Steinert --- tools/common.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/common.c b/tools/common.c index b0f534c..77bcb61 100644 --- a/tools/common.c +++ b/tools/common.c @@ -229,10 +229,9 @@ static void init_connection_info(struct amqp_connection_info *ci) ci->vhost = NULL; ci->user = NULL; - if (amqp_url) { + if (amqp_url) die_amqp_error(amqp_parse_url(strdup(amqp_url), ci), - "Parsing URL '%s'", amqp_url); - } + "Parsing URL '%s'", amqp_url); if (amqp_server) { char *colon; @@ -274,10 +273,12 @@ static void init_connection_info(struct amqp_connection_info *ci) amqp_server); } +#if WITH_SSL if (amqp_ssl && !ci->ssl) { die("the --ssl option specifies an SSL connection" " but the --server option does not"); } +#endif } if (amqp_port >= 0) { @@ -312,9 +313,11 @@ static void init_connection_info(struct amqp_connection_info *ci) ci->vhost = amqp_vhost; } +#if WITH_SSL if (amqp_ssl) { ci->ssl = true; } +#endif amqp_default_connection_info(&defaults); -- cgit v1.2.1