diff options
| author | Michael Steinert <mike.steinert@gmail.com> | 2012-05-24 20:07:07 -0600 |
|---|---|---|
| committer | Alan Antonuk <alan.antonuk@gmail.com> | 2013-04-09 15:31:35 -0700 |
| commit | f371e0ae2697031a42cfd573079c9261bc731091 (patch) | |
| tree | b3acece8473ea183a595a301ecb7a056d93fc630 | |
| parent | dabcfed253cd148fe3dba7fa97537c0d1c9b36ba (diff) | |
| download | rabbitmq-c-github-ask-f371e0ae2697031a42cfd573079c9261bc731091.tar.gz | |
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 <mike.steinert@gmail.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tools/common.c | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5c0f661..c2e8d09 100644 --- a/configure.ac +++ b/configure.ac @@ -142,7 +142,7 @@ AS_IF([test "x$with_ssl" = "xcyassl"], [test "x$with_ssl" = "xgnutls"], [PKG_CHECK_MODULES([SSL], [gnutls],, [with_ssl=no])], [test "x$with_ssl" = "xopenssl"], - [PKG_CHECK_MODULES([SSL], [openssl >= 1.0.1a],, [with_ssl=no])], + [PKG_CHECK_MODULES([SSL], [openssl >= 1.0.0],, [with_ssl=no])], [test "x$with_ssl" = "xpolarssl"], [AX_LIB_POLARSSL([SSL_CFLAGS=$POLARSSL_CFLAGS SSL_LIBS=$POLARSSL_LIBS], 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); |