--- a/configure.in	Wed Jan 02 01:59:32 2008 +0200
+++ b/configure.in	Wed Jan 02 02:00:39 2008 +0200
@@ -2032,7 +2032,7 @@
 dbox_libs='$(top_builddir)/src/lib-storage/index/dbox/libstorage_dbox.a'
 cydir_libs='$(top_builddir)/src/lib-storage/index/cydir/libstorage_cydir.a'
 raw_libs='$(top_builddir)/src/lib-storage/index/raw/libstorage_raw.a'
-index_libs='$(top_builddir)/src/lib-storage/index/libstorage_index.a $(top_builddir)/src/lib-index/libindex.a'
+CORE_LIBS='$(top_builddir)/src/lib-storage/index/libstorage_index.a $(top_builddir)/src/lib-storage/libstorage.a $(top_builddir)/src/lib-index/libindex.a'
 
 deliver_storage="raw"
 STORAGE_LIBS=
@@ -2042,7 +2042,7 @@
   fi
   STORAGE_LIBS="$STORAGE_LIBS `eval echo \\$${storage}_libs`"
 done
-STORAGE_LIBS="$STORAGE_LIBS $index_libs"
+STORAGE_LIBS="$STORAGE_LIBS $CORE_LIBS"
 AC_SUBST(STORAGE_LIBS)
 AC_DEFINE_UNQUOTED(MAIL_STORAGES, "$mail_storages", List of compiled in mail storages)
 

--- a/src/deliver/Makefile.am	Wed Jan 02 01:59:32 2008 +0200
+++ b/src/deliver/Makefile.am	Wed Jan 02 02:00:39 2008 +0200
@@ -26,7 +26,6 @@
 	../lib-storage/register/libstorage-register.a \
 	../lib-storage/list/libstorage_list.a \
 	$(STORAGE_LIBS) \
-	../lib-storage/libstorage.a \
 	../lib-imap/libimap.a \
 	../lib-mail/libmail.a \
 	../lib-dict/libdict.a \

--- a/src/imap/Makefile.am	Wed Jan 02 01:59:32 2008 +0200
+++ b/src/imap/Makefile.am	Wed Jan 02 02:00:39 2008 +0200
@@ -22,7 +22,6 @@
 	../lib-storage/register/libstorage-register.a \
 	../lib-storage/list/libstorage_list.a \
 	$(STORAGE_LIBS) \
-	../lib-storage/libstorage.a \
 	../lib-imap/libimap.a \
 	../lib-mail/libmail.a \
 	../lib-dict/libdict.a \

--- a/src/plugins/convert/Makefile.am	Wed Jan 02 01:59:32 2008 +0200
+++ b/src/plugins/convert/Makefile.am	Wed Jan 02 02:00:39 2008 +0200
@@ -32,7 +32,6 @@
 	$(top_builddir)/src/lib-storage/register/libstorage-register.a \
 	$(top_builddir)/src/lib-storage/list/libstorage_list.a \
 	$(STORAGE_LIBS) \
-	$(top_builddir)/src/lib-storage/libstorage.a \
 	$(top_builddir)/src/lib-imap/libimap.a \
 	$(top_builddir)/src/lib-mail/libmail.a \
 	$(top_builddir)/src/lib-charset/libcharset.a \

--- a/src/plugins/expire/Makefile.am	Wed Jan 02 01:59:32 2008 +0200
+++ b/src/plugins/expire/Makefile.am	Wed Jan 02 02:00:39 2008 +0200
@@ -33,7 +33,6 @@
 	$(top_builddir)/src/lib-storage/register/libstorage-register.a \
 	$(top_builddir)/src/lib-storage/list/libstorage_list.a \
 	$(STORAGE_LIBS) \
-	$(top_builddir)/src/lib-storage/libstorage.a \
 	$(top_builddir)/src/lib-imap/libimap.a \
 	$(top_builddir)/src/lib-mail/libmail.a \
 	$(top_builddir)/src/lib-dict/libdict.a \

--- a/src/plugins/fts-squat/Makefile.am	Wed Jan 02 01:59:32 2008 +0200
+++ b/src/plugins/fts-squat/Makefile.am	Wed Jan 02 02:00:39 2008 +0200
@@ -34,7 +34,6 @@
 libs = \
 	$(top_builddir)/src/lib-storage/register/libstorage-register.a \
 	$(STORAGE_LIBS) \
-	$(top_builddir)/src/lib-storage/libstorage.a \
 	$(top_builddir)/src/lib-storage/list/libstorage_list.a \
 	$(top_builddir)/src/lib-imap/libimap.a \
 	$(top_builddir)/src/lib-mail/libmail.a \

--- a/src/pop3/Makefile.am	Wed Jan 02 01:59:32 2008 +0200
+++ b/src/pop3/Makefile.am	Wed Jan 02 02:00:39 2008 +0200
@@ -20,7 +20,6 @@
 	../lib-storage/register/libstorage-register.a \
 	../lib-storage/list/libstorage_list.a \
 	$(STORAGE_LIBS) \
-	../lib-storage/libstorage.a \
 	../lib-imap/libimap.a \
 	../lib-mail/libmail.a \
 	../lib-dict/libdict.a \