Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 23:03:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47 from devurandom/master

Browse Source 
Fix check for toxcore by linking sodium in the correct place
This commit is contained in:
irungentoo 2013-09-28 04:35:59 -07:00
commit 87a29e43c9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -349,7 +349,7 @@ if test "x$LIBTOXCORE_FOUND" = "xno"; then
LIBTOXCORE_LDFLAGS= LIBTOXCORE_LDFLAGS=
LDFLAGS_SAVE="$LDFLAGS" LDFLAGS_SAVE="$LDFLAGS"
if test -n "$LIBTOXCORE_SEARCH_LIBS"; then if test -n "$LIBTOXCORE_SEARCH_LIBS"; then
LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS -L$LIBTOXCORE_SEARCH_LIBS $LIBSODIUM_LIBS" LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS -L$LIBTOXCORE_SEARCH_LIBS"
AC_CHECK_LIB([toxcore], [tox_new], AC_CHECK_LIB([toxcore], [tox_new],
[ [
LIBTOXCORE_LDFLAGS="-L$LIBTOXCORE_SEARCH_LIBS" LIBTOXCORE_LDFLAGS="-L$LIBTOXCORE_SEARCH_LIBS"
@ -360,10 +360,11 @@ if test "x$LIBTOXCORE_FOUND" = "xno"; then
], ],
[ [
$WINSOCK2_LIBS $WINSOCK2_LIBS
$LIBSODIUM_LIBS
] ]
) )
else else
LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS $LIBSODIUM_LIBS" LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS"
AC_CHECK_LIB([toxcore], [tox_new], AC_CHECK_LIB([toxcore], [tox_new],
[], [],
[ [
@ -371,6 +372,7 @@ if test "x$LIBTOXCORE_FOUND" = "xno"; then
], ],
[ [
$WINSOCK2_LIBS $WINSOCK2_LIBS
$LIBSODIUM_LIBS
] ]
) )
fi fi