diff options
| author | Michael Steinert <mike.steinert@gmail.com> | 2012-05-24 20:07:07 -0600 |
|---|---|---|
| committer | Michael Steinert <mike.steinert@gmail.com> | 2012-05-27 10:39:58 -0600 |
| commit | cbf56b42d1061a2f1ebe62f3c42edbfe4d4da46a (patch) | |
| tree | d904c61b9e67df598a691329ac2bc7772198c499 | |
| parent | d02af667205c3c47decd2e4c1d94f354686d6792 (diff) | |
| download | rabbitmq-c-github-ask-cbf56b42d1061a2f1ebe62f3c42edbfe4d4da46a.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 | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 348fa09..cfd93ef 100644 --- a/configure.ac +++ b/configure.ac @@ -122,7 +122,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 9ac2747..2411325 100644 --- a/tools/common.c +++ b/tools/common.c @@ -254,10 +254,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) { @@ -292,9 +294,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); |