From: Timo Sirainen <tss@iki.fi>
Date: Fri, 17 Apr 2009 01:40:05 +0000 (-0400)
Subject: When using --disable-shared-libs, link with some unused .o files to get plugins working.
X-Git-Tag: 2.0.alpha1~925
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4683d85dc96fc6b2432ec9811aacc5f82c8648a;p=thirdparty%2Fdovecot%2Fcore.git

When using --disable-shared-libs, link with some unused .o files to get plugins working.

--HG--
branch : HEAD
---

diff --git a/src/imap/Makefile.am b/src/imap/Makefile.am
index 1f4ebee7d9..a65779a147 100644
--- a/src/imap/Makefile.am
+++ b/src/imap/Makefile.am
@@ -14,9 +14,15 @@ AM_CPPFLAGS = \
 
 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)
diff --git a/src/lda/Makefile.am b/src/lda/Makefile.am
index a56d674daf..f9f17773e6 100644
--- a/src/lda/Makefile.am
+++ b/src/lda/Makefile.am
@@ -17,10 +17,17 @@ AM_CPPFLAGS = \
 
 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)
 
diff --git a/src/pop3/Makefile.am b/src/pop3/Makefile.am
index c64e5bff58..6f99e1a8cc 100644
--- a/src/pop3/Makefile.am
+++ b/src/pop3/Makefile.am
@@ -12,9 +12,16 @@ AM_CPPFLAGS = \
 
 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)