Mercurial > dovecot > core-2.2

changeset 9127:922868605499 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
When using --disable-shared-libs, link with some unused .o files to get plugins working.
author Timo Sirainen <tss@iki.fi>
date Thu, 16 Apr 2009 21:40:05 -0400
parents 9ff1e79fffab
children be738988c8ab
files src/imap/Makefile.am src/lda/Makefile.am src/pop3/Makefile.am
diffstat 3 files changed, 23 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap/Makefile.am	Thu Apr 16 21:37:37 2009 -0400
+++ b/src/imap/Makefile.am	Thu Apr 16 21:40:05 2009 -0400
@@ -14,9 +14,15 @@
 
 imap_LDFLAGS = -export-dynamic
 
+if !BUILD_SHARED_LIBS
+unused_objects = \
+	../lib/mountpoint.o
+endif
+
 libs = \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT)
+	$(LIBDOVECOT) \
+	$(unused_objects)
 
 imap_LDADD = $(libs) $(MODULE_LIBS)
 imap_DEPENDENCIES = $(libs)
--- a/src/lda/Makefile.am	Thu Apr 16 21:37:37 2009 -0400
+++ b/src/lda/Makefile.am	Thu Apr 16 21:40:05 2009 -0400
@@ -17,10 +17,17 @@
 
 dovecot_lda_LDFLAGS = -export-dynamic
 
+if !BUILD_SHARED_LIBS
+unused_objects = \
+	../lib/mountpoint.o \
+	../lib-imap/imap-util.o
+endif
+
 libs = \
 	../lib-lda/liblda.a \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT)
+	$(LIBDOVECOT) \
+	$(unused_objects)
 
 dovecot_lda_LDADD = $(libs) $(MODULE_LIBS)
 
--- a/src/pop3/Makefile.am	Thu Apr 16 21:37:37 2009 -0400
+++ b/src/pop3/Makefile.am	Thu Apr 16 21:40:05 2009 -0400
@@ -12,9 +12,16 @@
 
 pop3_LDFLAGS = -export-dynamic
 
+if !BUILD_SHARED_LIBS
+unused_objects = \
+	../lib/mountpoint.o \
+	../lib-imap/imap-util.o
+endif
+
 libs = \
 	$(LIBDOVECOT_STORAGE) \
-	$(LIBDOVECOT)
+	$(LIBDOVECOT) \
+	$(unused_objects)
 
 pop3_LDADD = $(libs) $(MODULE_LIBS)
 pop3_DEPENDENCIES = $(libs)