jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

contrib: add argon2 library as daemon dependency

Browse Source 
This patch fixes osx build that not correctly link with Argon2.

Change-Id: I2f71179a163643667cac5caaa9517aed5a0de3fc
Reviewed-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
This commit is contained in:
Guillaume Roguez
2017-05-09 15:36:08 -04:00
parent 8d8e5397e8
commit c8557c75b6
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -573,6 +573,9 @@ 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]))
AC_CHECK_HEADER([cryptopp/cryptlib.h], , AC_MSG_FAILURE([Unable to find the cryptopp headers (you may need to install the dev package).]))
LDFLAGS+=" -lcryptopp"
AS_IF([test "${SYS}" = "mingw32"],[

2
contrib/src/argon2/rules.mak
View File

@ -2,7 +2,7 @@
ARGON2_VERSION := 1eea0104e7cb2a38c617cf90ffa46ce5db6aceda
ARGON2_URL := https://github.com/P-H-C/phc-winner-argon2/archive/$(ARGON2_VERSION).tar.gz
ifeq ($(call need_pkg,'libargon2'),)
ifeq ($(call need_pkg,'libargon2 > 20161029'),)
PKGS_FOUND += argon2
endif

4
src/Makefile.am
View File

@ -54,6 +54,7 @@ libring_la_LDFLAGS = \
@PORTAUDIO_LIBS@ \
@GNUTLS_LIBS@ \
@OPENDHT_LIBS@ \
@ARGON2_LIBS@ \
@ZLIB_LIBS@ \
$(PCRE_LIBS) \
@LIBS@
@ -76,7 +77,8 @@ libring_la_CFLAGS = \
@SPEEXDSP_CFLAGS@ \
@PORTAUDIO_CFLAGS@ \
@GNUTLS_CFLAGS@ \
@OPENDHT_CFLAGS@
@OPENDHT_CFLAGS@ \
@ARGON2_CFLAGS@
libring_la_CXXFLAGS = @JSONCPP_CFLAGS@