lib-sql, lib-ldap: Fix link dependencies

Fixes using the gold linker.

diff --git a/src/lib-ldap/Makefile.am b/src/lib-ldap/Makefile.am
index 5407d1a6868a219b1cf6b40bf9a38d2ef066b415..8fba6ae82ab08c3d50915da8580e519f8afeda57 100644 (file)
--- a/src/lib-ldap/Makefile.am
+++ b/src/lib-ldap/Makefile.am
@@ -17,9 +17,9 @@ libdovecot_ldap_la_SOURCES = \
        ldap-compare.c \
        ldap-entry.c
 
-libdovecot_ldap_la_DEPENDENCIES = ../lib/liblib.la
+libdovecot_ldap_la_DEPENDENCIES = ../lib-dovecot/libdovecot.la
 libdovecot_ldap_la_LDFLAGS = -export-dynamic
-libdovecot_ldap_la_LIBADD = ../lib/liblib.la $(LDAP_LIBS)
+libdovecot_ldap_la_LIBADD = ../lib-dovecot/libdovecot.la $(LDAP_LIBS)
 
 headers = \
        ldap-client.h

diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am
index 4e81960d2fb1a83ef45b352122b0dcb126e4e029..89c3d2dcdda039649f1b9f85bf947c975d3ec223 100644 (file)
--- a/src/lib-sql/Makefile.am
+++ b/src/lib-sql/Makefile.am
@@ -55,6 +55,8 @@ libsql_la_SOURCES = \
        $(dist_sources) \
        $(driver_sources) \
        driver-sqlpool.c
+libsql_la_LIBADD = $(SQL_LIBS)
+
 nodist_libsql_la_SOURCES = sql-drivers-register.c
 
 deplibs = \
@@ -80,14 +82,7 @@ libdriver_cassandra_la_LDFLAGS = -module -avoid-version
 libdriver_cassandra_la_LIBADD = $(CASSANDRA_LIBS)
 libdriver_cassandra_la_CPPFLAGS = $(AM_CPPFLAGS) $(CASSANDRA_CFLAGS)
 libdriver_cassandra_la_SOURCES = driver-cassandra.c
-
-sql_libs =
 else
-sql_libs = \
-       $(MYSQL_LIBS) \
-       $(PGSQL_LIBS) \
-       $(SQLITE_LIBS) \
-       $(CASSANDRA_LIBS)
 endif
 
 libdriver_test_la_LDFLAGS = -avoid-version
@@ -99,7 +94,7 @@ noinst_HEADERS = driver-test.h
 
 pkglib_LTLIBRARIES = libdovecot-sql.la
 libdovecot_sql_la_SOURCES = 
-libdovecot_sql_la_LIBADD = libsql.la $(deplibs) $(sql_libs)
+libdovecot_sql_la_LIBADD = libsql.la $(deplibs)
 libdovecot_sql_la_DEPENDENCIES = libsql.la
 libdovecot_sql_la_LDFLAGS = -export-dynamic