Makefile: Fixes to compiling with LDFLAGS="-Wl,--as-needed -Wl,--no-undefined"

diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am
index 4a35d7ece5a1cb07595a5f3825056d0322eb090d..d3337c0217be18904d9a728ec32b96c2b573ee04 100644 (file)
--- a/src/lib-sql/Makefile.am
+++ b/src/lib-sql/Makefile.am
@@ -47,6 +47,9 @@ libsql_la_SOURCES = \
        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 @@ endif
 
 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
 

diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am
index 68d345971a96522f82c828e91a5d915d3260724a..90e38331ee9c5ac181cfe0cfe36068ddc7fbbed9 100644 (file)
--- a/src/lib-ssl-iostream/Makefile.am
+++ b/src/lib-ssl-iostream/Makefile.am
@@ -23,6 +23,6 @@ pkginc_lib_HEADERS = $(headers)
 
 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

diff --git a/src/login-common/Makefile.am b/src/login-common/Makefile.am
index 8f28334bda78036ef09a36f516c41e79814d3f3c..06b6eff734a79ada75774e52ad3cb5d25d569854 100644 (file)
--- a/src/login-common/Makefile.am
+++ b/src/login-common/Makefile.am
@@ -39,6 +39,6 @@ pkginc_lib_HEADERS = $(headers)
 
 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