From 73ef02ac2b467c3b38c409f17b3c62e8a8b11267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 19 Mar 2018 15:19:18 -0400
Subject: [PATCH] build: don't link argon2

Linking Argon2 shouldn't be needed as Argon2
is a private OpenDHT dependency.

Change-Id: Id46aee27cb09a8af36912b59f74d62dbec0839aa
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
---
 configure.ac    | 3 ---
 src/Makefile.am | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6924d6393a..1245cd40df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -603,9 +603,6 @@ AM_CONDITIONAL([BUILD_OPUS], [test "$HAVE_OPUS" -eq 1])
 dnl check for openDHT
 PKG_CHECK_MODULES([OPENDHT], [opendht >= 0.6.1],, AC_MSG_WARN([Missing OpenDHT]))
 
-dnl check for argon2
-PKG_CHECK_MODULES([ARGON2], [libargon2],, AC_MSG_FAILURE([Missing Argon2]))
-
 PKG_CHECK_MODULES([SECP256K1], [libsecp256k1 >= 0.1],, AC_MSG_FAILURE([Missing secp256k1]))
 
 dnl IPv6 mode is default-disabled
diff --git a/src/Makefile.am b/src/Makefile.am
index ff6fd42780..aaa28d8030 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,8 +58,7 @@ libring_la_LDFLAGS = \
 		@PORTAUDIO_LIBS@ \
 		@GNUTLS_LIBS@ \
 		@OPENDHT_LIBS@ \
-		@ARGON2_LIBS@ \
-        @SECP256K1_LIBS@ \
+		@SECP256K1_LIBS@ \
 		@ZLIB_LIBS@ \
 		$(PCRE_LIBS) \
 		@LIBS@
@@ -82,8 +81,7 @@ libring_la_CFLAGS = \
 		@SPEEXDSP_CFLAGS@ \
 		@PORTAUDIO_CFLAGS@ \
 		@GNUTLS_CFLAGS@ \
-		@OPENDHT_CFLAGS@ \
-		@ARGON2_CFLAGS@
+		@OPENDHT_CFLAGS@
 
 libring_la_CXXFLAGS = @JSONCPP_CFLAGS@
 
-- 
GitLab