dovecot-2.0: lda, storage .so libs: Added explicit linking again...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/26e88084bbc0
changeset: 12136:26e88084bbc0
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Sep 20 16:06:17 2010 +0100
description:
lda, storage .so libs: Added explicit linking against other .so libs they require
Based on patch by Funda Wang

diffstat:

 src/lib-lda/Makefile.am     |  6 ++++--
 src/lib-storage/Makefile.am |  7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 012a1773ebfd -r 26e88084bbc0 src/lib-lda/Makefile.am
--- a/src/lib-lda/Makefile.am	Mon Sep 20 15:30:07 2010 +0100
+++ b/src/lib-lda/Makefile.am	Mon Sep 20 16:06:17 2010 +0100
@@ -28,8 +28,10 @@
 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 -r 012a1773ebfd -r 26e88084bbc0 src/lib-storage/Makefile.am
--- a/src/lib-storage/Makefile.am	Mon Sep 20 15:30:07 2010 +0100
+++ b/src/lib-storage/Makefile.am	Mon Sep 20 16:06:17 2010 +0100
@@ -66,14 +66,15 @@
 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