From 236e79cd26fe39e59725c41814178eb31046f8b0 Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Sat, 28 Sep 2013 13:20:41 +0200 Subject: [PATCH] Fix check for toxcore by linking sodium in the correct place --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 53167f9..712e0aa 100644 --- a/configure.ac +++ b/configure.ac @@ -349,7 +349,7 @@ if test "x$LIBTOXCORE_FOUND" = "xno"; then LIBTOXCORE_LDFLAGS= LDFLAGS_SAVE="$LDFLAGS" 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], [ LIBTOXCORE_LDFLAGS="-L$LIBTOXCORE_SEARCH_LIBS" @@ -360,10 +360,11 @@ if test "x$LIBTOXCORE_FOUND" = "xno"; then ], [ $WINSOCK2_LIBS + $LIBSODIUM_LIBS ] ) else - LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS $LIBSODIUM_LIBS" + LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS" AC_CHECK_LIB([toxcore], [tox_new], [], [ @@ -371,6 +372,7 @@ if test "x$LIBTOXCORE_FOUND" = "xno"; then ], [ $WINSOCK2_LIBS + $LIBSODIUM_LIBS ] ) fi