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 1f4ebee7d9a15c5686acf63e250ea0dd953a0c32..a65779a1477569f703fffb739ba431ecb39d7825 100644 (file)
--- 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 a56d674daf5b49c06874699dcf0521c17689199b..f9f17773e613ee103d76d4df87c5aaa5ea06142f 100644 (file)
--- 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 c64e5bff583d22f4a62ea4473e706d9806609de6..6f99e1a8cc0a97150e6b342907c253d8a651aff4 100644 (file)
--- 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)