Commit 6a78b3ec authored by Pieter Hintjens's avatar Pieter Hintjens

Problem: HAVE_LIBSODIUM macro is inconsistent

Solution: use ZMQ_USE_LIBSODIUM to match ZMQ_USE_TWEETNACL
parent 6630a7ce
......@@ -43,7 +43,7 @@ elseif (WITH_LIBSODIUM)
if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
target_link_libraries (libzmq ssp)
endif ()
set (HAVE_LIBSODIUM 1)
set (ZMQ_USE_LIBSODIUM 1)
set (ZMQ_HAVE_CURVE 1)
else ()
message (FATAL_ERROR
......
......@@ -439,7 +439,7 @@ if test "x$enable_curve" = "xno"; then
elif test "x$with_libsodium" = "xyes"; then
AC_MSG_NOTICE([Using libsodium for CURVE security])
AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption])
AC_DEFINE(HAVE_LIBSODIUM, [1], [Using libsodium for curve encryption])
AC_DEFINE(ZMQ_USE_LIBSODIUM, [1], [Using libsodium for curve encryption])
curve_library="libsodium"
# On Solaris, libsodium depends on libssp
......
......@@ -51,7 +51,7 @@
#if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM)
#elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h"
#endif
......
......@@ -36,7 +36,7 @@
#if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM)
#elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h"
#endif
......
......@@ -36,7 +36,7 @@
#if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM)
#elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h"
#endif
......
......@@ -46,7 +46,7 @@
#if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM)
#elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h"
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment