auth: Don't include LIBSODIUM_LIBS in dependencies

Put it into AUTH_LIBS among other libraries that are used by auth.

diff --git a/m4/want_sodium.m4 b/m4/want_sodium.m4
index b73f973fb0e4213a30c76375849a944a0d4fb076..ba58661babb20032fc5d8ab91698ca276c117bd0 100644 (file)
--- a/m4/want_sodium.m4
+++ b/m4/want_sodium.m4
@@ -5,6 +5,7 @@ AC_DEFUN([DOVECOT_WANT_SODIUM], [
       LDFLAGS="$LDFLAGS $LIBSODIUM_LIBS"
       AC_CHECK_FUNC([crypto_pwhash_str_verify], [
         have_sodium=yes
+        AUTH_LIBS="$AUTH_LIBS $LIBSODIUM_LIBS"
         AC_DEFINE(HAVE_LIBSODIUM, [1], [Define if you have libsodium])
       ])
       LDFLAGS="$OLD_LDFLAGS"

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 92a52dc9ae6b8cdc3a2d0b1479f17e70b96c5454..d4401965987725ce4662b96dee5bcd0012da83da 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -74,8 +74,7 @@ auth_libs = \
        ../lib-ntlm/libntlm.la \
        ../lib-otp/libotp.la \
        $(LIBDOVECOT_LUA) \
-       $(LIBDOVECOT_SQL) \
-       $(LIBSODIUM_LIBS)
+       $(LIBDOVECOT_SQL)
 
 auth_CPPFLAGS = $(AM_CPPFLAGS) $(BINARY_CFLAGS)
 auth_LDADD = $(auth_libs) $(LIBDOVECOT) $(AUTH_LIBS) $(BINARY_LDFLAGS)