lda, storage .so libs: Added explicit linking against other .so libs they require

Based on patch by Funda Wang

diff --git a/src/lib-lda/Makefile.am b/src/lib-lda/Makefile.am
index b146f273ee82326924d58ea3049c4f24306b4c5e..cd596d5373cf4f0becc162569cf4a0bd011aeb59 100644 (file)
--- a/src/lib-lda/Makefile.am
+++ b/src/lib-lda/Makefile.am
@@ -28,8 +28,10 @@ headers = \
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
 
+deps=../lib-storage/libdovecot-storage.la ../lib-dovecot/libdovecot.la
+
 pkglib_LTLIBRARIES = libdovecot-lda.la
 libdovecot_lda_la_SOURCES = 
-libdovecot_lda_la_LIBADD = liblda.la
-libdovecot_lda_la_DEPENDENCIES = liblda.la
+libdovecot_lda_la_LIBADD = liblda.la $(deps)
+libdovecot_lda_la_DEPENDENCIES = liblda.la $(deps)
 libdovecot_lda_la_LDFLAGS = -export-dynamic

diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index 01813737af1a06a528d2a1449386c750f242a4c1..14a844b8379980ff835d546d1f5059c938e38494 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -66,14 +66,15 @@ headers = \
 shlibs = \
        libstorage.la \
        libstorage_service.la \
-       ../lib-index/libindex.la \
        list/libstorage_list.la \
        index/libstorage_index.la \
-       register/libstorage_register.la 
+       register/libstorage_register.la \
+       ../lib-index/libindex.la \
+       ../lib-dovecot/libdovecot.la
 
 pkglib_LTLIBRARIES = libdovecot-storage.la
 libdovecot_storage_la_SOURCES = 
-libdovecot_storage_la_LIBADD = $(shlibs)
+libdovecot_storage_la_LIBADD = $(shlibs) $(MODULE_LIBS)
 libdovecot_storage_la_DEPENDENCIES = $(shlibs)
 libdovecot_storage_la_LDFLAGS = -export-dynamic