configure --without-shared-libs: Don't link other libraries to libstorage.a.

--HG--
branch : HEAD

diff --git a/configure.in b/configure.in
index 6c60edcae7f219b11a992d1d868ae2a6ebaeafdc..1ec7c104ec65481bc3890519e55c078d058935c1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2232,8 +2232,9 @@ if test "$want_shared_libs" = "yes"; then
   LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/libdovecot-login.la'
 else
   LIBDOVECOT='$(top_builddir)/src/lib-settings/libsettings.la $(top_builddir)/src/lib-dict/libdict.la $(top_builddir)/src/lib-imap/libimap.la $(top_builddir)/src/lib-mail/libmail.la $(top_builddir)/src/lib-auth/libauth.la $(top_builddir)/src/lib-charset/libcharset.la $(top_builddir)/src/lib-master/libmaster.la $(top_builddir)/src/lib/liblib.la $(LIBICONV)'
-  LIBDOVECOT_STORAGE_BASE='$(top_builddir)/src/lib-storage/libstorage.la $(top_builddir)/src/lib-storage/register/libstorage_register.la $(top_builddir)/src/lib-storage/list/libstorage_list.la $(top_builddir)/src/lib-storage/index/libstorage_index.la $(top_builddir)/src/lib-index/libindex.la'
-  LIBDOVECOT_STORAGE="$LINKED_STORAGE_LIBS $LIBDOVECOT_STORAGE_BASE"
+  LIBDOVECOT_STORAGE_LAST='$(top_builddir)/src/lib-storage/list/libstorage_list.la $(top_builddir)/src/lib-storage/index/libstorage_index.la $(top_builddir)/src/lib-storage/libstorage.la $(top_builddir)/src/lib-index/libindex.la'
+  LIBDOVECOT_STORAGE_FIRST='$(top_builddir)/src/lib-storage/libstorage_service.la $(top_builddir)/src/lib-storage/register/libstorage_register.la'
+  LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_FIRST $LINKED_STORAGE_LIBS $LIBDOVECOT_STORAGE_LAST"
   LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/liblogin.la'
 fi
 LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la'

diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index 80068a2bd8f2f5e72dd1d02a7dbdc3eb54df620a..090a22736cd2072758edd4fd83ec016d012c9856 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = list index register
 
-noinst_LTLIBRARIES = libstorage.la
+noinst_LTLIBRARIES = libstorage.la libstorage_service.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
@@ -22,7 +22,6 @@ libstorage_la_SOURCES = \
        mail-search.c \
        mail-search-build.c \
        mail-storage.c \
-       mail-storage-service.c \
        mail-storage-settings.c \
        mail-user.c \
        mailbox-list.c \
@@ -30,14 +29,8 @@ libstorage_la_SOURCES = \
        mailbox-tree.c \
        mailbox-uidvalidity.c
 
-libs = \
-       ../lib-index/libindex.la \
-       list/libstorage_list.la \
-       index/libstorage_index.la \
-       register/libstorage_register.la 
-
-libstorage_la_LIBADD = $(libs)
-libstorage_la_DEPENDENCIES = $(libs)
+libstorage_service_la_SOURCES = \
+       mail-storage-service.c
 
 headers = \
        mail-copy.h \
@@ -57,10 +50,18 @@ headers = \
        mailbox-tree.h \
        mailbox-uidvalidity.h
 
+shlibs = \
+       libstorage.la \
+       libstorage_service.la \
+       ../lib-index/libindex.la \
+       list/libstorage_list.la \
+       index/libstorage_index.la \
+       register/libstorage_register.la 
+
 pkglib_LTLIBRARIES = libdovecot-storage.la
 libdovecot_storage_la_SOURCES = 
-libdovecot_storage_la_LIBADD = libstorage.la
-libdovecot_storage_la_DEPENDENCIES = libstorage.la
+libdovecot_storage_la_LIBADD = $(shlibs)
+libdovecot_storage_la_DEPENDENCIES = $(shlibs)
 libdovecot_storage_la_LDFLAGS = -export-dynamic
 
 if INSTALL_HEADERS