From 6a78b3ec19427a042e1a624baebd23a612256b8f Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Sat, 12 Mar 2016 15:25:41 +0100
Subject: [PATCH] Problem: HAVE_LIBSODIUM macro is inconsistent

Solution: use ZMQ_USE_LIBSODIUM to match ZMQ_USE_TWEETNACL
---
 CMakeLists.txt       | 2 +-
 configure.ac         | 2 +-
 src/ctx.cpp          | 2 +-
 src/curve_client.hpp | 2 +-
 src/curve_server.hpp | 2 +-
 src/zmq_utils.cpp    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcedda51..6e0ab0c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/configure.ac b/configure.ac
index de83ba82..c7e1b526 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/src/ctx.cpp b/src/ctx.cpp
index e99c0eb8..ef26419a 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -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
 
diff --git a/src/curve_client.hpp b/src/curve_client.hpp
index 8d177366..bc5c7670 100644
--- a/src/curve_client.hpp
+++ b/src/curve_client.hpp
@@ -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
 
diff --git a/src/curve_server.hpp b/src/curve_server.hpp
index 671792d7..8e2734aa 100644
--- a/src/curve_server.hpp
+++ b/src/curve_server.hpp
@@ -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
 
diff --git a/src/zmq_utils.cpp b/src/zmq_utils.cpp
index 51b0e490..a3479624 100644
--- a/src/zmq_utils.cpp
+++ b/src/zmq_utils.cpp
@@ -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