--- a/src/lib-sql/Makefile.am	Sat Apr 30 13:17:53 2011 +0300
+++ b/src/lib-sql/Makefile.am	Sat Apr 30 13:18:31 2011 +0300
@@ -47,6 +47,9 @@
 	driver-sqlpool.c
 nodist_libsql_la_SOURCES = sql-drivers-register.c
 
+deplibs = \
+	../lib-dovecot/libdovecot.la
+
 if SQL_PLUGINS
 libdriver_mysql_la_LDFLAGS = -module -avoid-version
 libdriver_mysql_la_LIBADD = $(MYSQL_LIBS)
@@ -66,7 +69,11 @@
 
 pkglib_LTLIBRARIES = libdovecot-sql.la
 libdovecot_sql_la_SOURCES = 
-libdovecot_sql_la_LIBADD = libsql.la $(MODULE_LIBS)
+libdovecot_sql_la_LIBADD = libsql.la $(deplibs) \
+	$(MYSQL_LIBS) \
+	$(PGSQL_LIBS) \
+	$(SQLITE_LIBS) \
+	$(MODULE_LIBS)
 libdovecot_sql_la_DEPENDENCIES = libsql.la
 libdovecot_sql_la_LDFLAGS = -export-dynamic
 

--- a/src/lib-ssl-iostream/Makefile.am	Sat Apr 30 13:17:53 2011 +0300
+++ b/src/lib-ssl-iostream/Makefile.am	Sat Apr 30 13:18:31 2011 +0300
@@ -23,6 +23,6 @@
 
 pkglib_LTLIBRARIES = libdovecot-ssl.la
 libdovecot_ssl_la_SOURCES = 
-libdovecot_ssl_la_LIBADD = libssl_iostream.la
+libdovecot_ssl_la_LIBADD = libssl_iostream.la ../lib-dovecot/libdovecot.la
 libdovecot_ssl_la_DEPENDENCIES = libssl_iostream.la
 libdovecot_ssl_la_LDFLAGS = -export-dynamic

--- a/src/login-common/Makefile.am	Sat Apr 30 13:17:53 2011 +0300
+++ b/src/login-common/Makefile.am	Sat Apr 30 13:18:31 2011 +0300
@@ -39,6 +39,6 @@
 
 pkglib_LTLIBRARIES = libdovecot-login.la
 libdovecot_login_la_SOURCES = 
-libdovecot_login_la_LIBADD = liblogin.la
+libdovecot_login_la_LIBADD = liblogin.la ../lib-dovecot/libdovecot.la
 libdovecot_login_la_DEPENDENCIES = liblogin.la
 libdovecot_login_la_LDFLAGS = -export-dynamic