summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorzugz (tox) <mbays+tox@sdf.org>2018-08-20 18:11:37 +0200
committerzugz (tox) <mbays+tox@sdf.org>2018-08-20 22:36:15 +0200
commit8e0aea1add4377e2c244fd61c29df60b42f8d611 (patch)
treeff4f62acd65c65c6c4380b95899501f8bbc62380 /testing
parent7aa57afebad031993825b0bd1ef0760f524e1442 (diff)
handle libsodium dependency of misc_tools correctly for autotools
Diffstat (limited to 'testing')
-rw-r--r--testing/Makefile.inc4
-rw-r--r--testing/misc_tools.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index fa1c1029..b0435a59 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -8,6 +8,10 @@ endif
8noinst_LTLIBRARIES += libmisc_tools.la 8noinst_LTLIBRARIES += libmisc_tools.la
9libmisc_tools_la_SOURCES = ../testing/misc_tools.c ../testing/misc_tools.h 9libmisc_tools_la_SOURCES = ../testing/misc_tools.c ../testing/misc_tools.h
10 10
11libmisc_tools_la_CFLAGS = $(LIBSODIUM_CFLAGS)
12
13libmisc_tools_la_LIBADD = $(LIBSODIUM_LDFLAGS)
14
11if BUILD_TESTING 15if BUILD_TESTING
12 16
13noinst_PROGRAMS += DHT_test \ 17noinst_PROGRAMS += DHT_test \
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index c9a73b3e..9549b4b6 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -40,7 +40,7 @@
40#include <string.h> 40#include <string.h>
41 41
42#ifndef VANILLA_NACL 42#ifndef VANILLA_NACL
43#include "sodium.h" 43#include <sodium.h>
44#endif 44#endif
45 45
46#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) 46#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)