From bb324029ad442a1f6dd7049a6e6fc1cbe4a05799 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 29 Oct 2013 03:45:34 +0100
Subject: Allow using libsodium instead of NaCl

As libsodium has some strange include files (like a version.h), we try to use
absolute include paths whenever possible in fastd now and rename our generated
headers.
---
 src/methods/xsalsa20_poly1305/CMakeLists.txt      | 2 +-
 src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/methods/xsalsa20_poly1305')

diff --git a/src/methods/xsalsa20_poly1305/CMakeLists.txt b/src/methods/xsalsa20_poly1305/CMakeLists.txt
index 09b029c..170a1ed 100644
--- a/src/methods/xsalsa20_poly1305/CMakeLists.txt
+++ b/src/methods/xsalsa20_poly1305/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(BEFORE ${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR} ${NACL_INCLUDE_DIR})
+include_directories(${FASTD_SOURCE_DIR}/src ${FASTD_BINARY_DIR} ${NACL_INCLUDE_DIRS})
 
 add_library(method_xsalsa20_poly1305 OBJECT
   xsalsa20_poly1305.c
diff --git a/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c b/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c
index 0a9f2c8..825a4b8 100644
--- a/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c
+++ b/src/methods/xsalsa20_poly1305/xsalsa20_poly1305.c
@@ -24,7 +24,7 @@
 */
 
 
-#include <fastd.h>
+#include "../../fastd.h"
 #include "../common.h"
 
 #include <crypto_secretbox_xsalsa20poly1305.h>
-- 
cgit v1.2.3