StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'sodium-check' of https://github.com/jin-eld/ProjectTox-Core

Browse Source
This commit is contained in:
irungentoo 2014-11-26 16:10:12 -05:00
commit 61949ec07b
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -371,20 +371,20 @@ else
LDFLAGS_SAVE="$LDFLAGS" LDFLAGS_SAVE="$LDFLAGS"
if test -n "$LIBSODIUM_SEARCH_LIBS"; then if test -n "$LIBSODIUM_SEARCH_LIBS"; then
LDFLAGS="-L$LIBSODIUM_SEARCH_LIBS $LDFLAGS" LDFLAGS="-L$LIBSODIUM_SEARCH_LIBS $LDFLAGS"
AC_CHECK_LIB(sodium, randombytes_random, AC_CHECK_LIB(sodium, crypto_pwhash_scryptsalsa208sha256,
[ [
LIBSODIUM_LDFLAGS="-L$LIBSODIUM_SEARCH_LIBS" LIBSODIUM_LDFLAGS="-L$LIBSODIUM_SEARCH_LIBS"
LIBSODIUM_LIBS="-lsodium" LIBSODIUM_LIBS="-lsodium"
], ],
[ [
AC_MSG_ERROR([required library libsodium was not found in requested location $LIBSODIUM_SEARCH_LIBS]) AC_MSG_ERROR([required library libsodium was not found in requested location $LIBSODIUM_SEARCH_LIBS or library version is too old])
] ]
) )
else else
AC_CHECK_LIB(sodium, randombytes_random, AC_CHECK_LIB(sodium, crypto_pwhash_scryptsalsa208sha256,
[], [],
[ [
AC_MSG_ERROR([required library libsodium was not found on your system, please check http://download.libsodium.org/libsodium/releases/]) AC_MSG_ERROR([required library libsodium was not found on your system, please check http://download.libsodium.org/libsodium/releases/ or library version is too old])
] ]
) )
fi fi