From e092eee869ee4bb78974985321b55a3235c32b4d Mon Sep 17 00:00:00 2001 From: Jin^eLD Date: Thu, 5 Sep 2013 13:02:26 +0300 Subject: Allow to build vs nacl instead of libsodium By default libsodium is used. Only if --enable-nacl is specified, then nacl will be used instead of libsodium. Pass locations of nacl headers and libraries by using the following options: --with-nacl-headers=/home/me/somewhere/nacl-20110221/build/469/include/amd64/ --with-nacl-libs=/home/me/somewhere/nacl-20110221/build/469/lib/amd64/ --- auto_tests/Makefile.inc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'auto_tests/Makefile.inc') diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc index 199b61e9..4930a798 100644 --- a/auto_tests/Makefile.inc +++ b/auto_tests/Makefile.inc @@ -9,23 +9,29 @@ messenger_autotest_SOURCES = \ messenger_autotest_CFLAGS = \ $(LIBSODIUM_CFLAGS) \ + $(NACL_CFLAGS) \ $(CHECK_CFLAGS) messenger_autotest_LDADD = \ $(LIBSODIUM_LDFLAGS) \ + $(NACL_LDFLAGS) \ libtoxcore.la \ $(LIBSODIUM_LIBS) \ + $(NACL_LIBS) \ $(CHECK_LIBS) crypto_test_SOURCES = ../auto_tests/crypto_test.c crypto_test_CFLAGS = $(LIBSODIUM_CFLAGS) \ + $(NACL_CFLAGS) \ $(CHECK_CFLAGS) crypto_test_LDADD = $(LIBSODIUM_LDFLAGS) \ + $(NACL_LDFLAGS) \ libtoxcore.la \ $(LIBSODIUM_LIBS) \ + $(NACL_LIBS) \ $(CHECK_LIBS) endif -- cgit v1.2.3