dovecot-1.3: configure --without-shared-libs: Don't link other l...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.3/rev/43ce0506a90b
changeset: 9135:43ce0506a90b
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Apr 17 13:22:13 2009 -0400
description:
configure --without-shared-libs: Don't link other libraries to libstorage.a.

diffstat:

2 files changed, 16 insertions(+), 14 deletions(-)
configure.in                |    5 +++--
src/lib-storage/Makefile.am |   25 +++++++++++++------------

diffs (72 lines):

diff -r 761fc36e0e34 -r 43ce0506a90b configure.in
--- a/configure.in	Fri Apr 17 12:56:14 2009 -0400
+++ b/configure.in	Fri Apr 17 13:22:13 2009 -0400
@@ -2232,8 +2232,9 @@ if test "$want_shared_libs" = "yes"; the
   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 -r 761fc36e0e34 -r 43ce0506a90b src/lib-storage/Makefile.am
--- a/src/lib-storage/Makefile.am	Fri Apr 17 12:56:14 2009 -0400
+++ b/src/lib-storage/Makefile.am	Fri Apr 17 13:22:13 2009 -0400
@@ -1,6 +1,6 @@ SUBDIRS = list index register
 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