3 files changed, 35 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c18d41d2..9a79b74e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,21 @@ cmake_minimum_required(VERSION 2.6.0)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
+if(NOT WIN32)
+        option(USE_NACL "Use NaCl library instead of libsodium")
+endif()
+
+if(NOT USE_NACL)
+        set(LINK_CRYPTO_LIBRARY ${SODIUM_LIBRARY})
+else()
+        find_package(NaCl REQUIRED)
+
+        include_directories(${NACL_INCLUDE_DIR})
+        add_definitions(-DVANILLA_NACL)
+
+        set(LINK_CRYPTO_LIBRARY ${NACL_LIBRARIES})
+endif()
+
 #MinGW prints more warnings for -Wall than gcc does, thus causing build to fail
 if(NOT WIN32)
         if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
@@ -21,7 +36,8 @@ macro(linkCoreLibraries exe_name)
         else()
                 include_directories(${SODIUM_INCLUDE_DIR})
                 target_link_libraries(${exe_name} core
-                        ${SODIUM_LIBRARY})
+                        ${LINK_CRYPTO_LIBRARY})
+
         endif()
 endmacro()
 
diff --git a/cmake/FindNaCl.cmake b/cmake/FindNaCl.cmake
new file mode 100644
index 00000000..cdd6248a
--- /dev/null
+++ b/cmake/FindNaCl.cmake
@@ -0,0 +1,17 @@
+find_path(NACL_INCLUDE_DIR crypto_box.h
+        $ENV{NACL_INCLUDE_DIR} /usr/include/nacl/
+        DOC "Directory which contain NaCl headers")
+
+find_path(NACL_LIBRARY_DIR libnacl.a
+        $ENV{NACL_LIBRARY_DIR} /usr/lib/nacl
+        DOC "Directory which contain libnacl.a, cpucycles.o, and randombytes.o")
+
+if(NACL_LIBRARY_DIR)
+        set(NACL_LIBRARIES
+                "${NACL_LIBRARY_DIR}/cpucycles.o"
+                "${NACL_LIBRARY_DIR}/libnacl.a"
+                "${NACL_LIBRARY_DIR}/randombytes.o")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(NaCl DEFAULT_MSG NACL_INCLUDE_DIR NACL_LIBRARY_DIR NACL_LIBRARIES)
diff --git a/core/network.h b/core/network.h
index 8af4b32f..3277070c 100644
--- a/core/network.h
+++ b/core/network.h
@@ -56,11 +56,7 @@
 /* we use libsodium by default */
 #include <sodium.h>
 #else
-
-/* TODO: Including stuff like this is bad. This needs fixing.
-   We keep support for the original NaCl for now. */
-#include "../nacl/build/Linux/include/amd64/crypto_box.h"
-
+#include <crypto_box.h>
 #endif
 
 #ifdef __cplusplus