auth: Don't include LIBSODIUM_LIBS in dependencies

Put it into AUTH_LIBS among other libraries that are used by auth.
dovecot · Dec 22, 2017 · 23ff476 · 23ff476
1 parent 70b97d6
commit 23ff476
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)