dovecot-2.1: configure: Don't reorder --with-storages values.

dovecot at dovecot.org dovecot at dovecot.org
Tue Nov 15 18:30:05 EET 2011


details:   http://hg.dovecot.org/dovecot-2.1/rev/500bf1444ad6
changeset: 13699:500bf1444ad6
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Nov 15 18:29:52 2011 +0200
description:
configure: Don't reorder --with-storages values.
The ordering is used for storage autodetection.

diffstat:

 configure.in |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r bcb20d216edd -r 500bf1444ad6 configure.in
--- a/configure.in	Tue Nov 15 18:29:14 2011 +0200
+++ b/configure.in	Tue Nov 15 18:29:52 2011 +0200
@@ -241,13 +241,19 @@
   want_gc=no)
 
 AC_ARG_WITH(storages,
-AS_HELP_STRING([--with-storages], [Build with specified mail storage formats (maildir mbox sdbox mdbox cydir)]), [
+AS_HELP_STRING([--with-storages], [Build with specified mail storage formats (mdbox sdbox maildir mbox cydir imapc)]), [
 	if test "$withval" = "yes" || test "$withval" = "no"; then
 		AC_MSG_ERROR([--with-storages needs storage list as parameter])
 	fi
 	mail_storages="shared `echo "$withval"|sed 's/,/ /g'`" ],
-	mail_storages="shared maildir mbox sdbox mdbox cydir imapc")
+	mail_storages="shared mdbox sdbox maildir mbox cydir imapc")
 AC_SUBST(mail_storages)
+mail_storages="$mail_storages raw"
+# drop duplicates
+duplicates=`(for i in $mail_storages; do echo $i; done)|sort|uniq -d|xargs echo`
+if test "$duplicates" != ""; then
+  AC_ERROR([Duplicate --with-storages: $duplicates])
+fi
 
 DC_DOVECOT_MODULEDIR
 
@@ -2443,9 +2449,6 @@
 STORAGE_LIB='$(top_builddir)/src/lib-storage/libdovecot-storage.la'
 
 LINKED_STORAGE_LIBS=
-mail_storages="$mail_storages raw"
-# drop duplicates
-mail_storages=`(for i in $mail_storages; do echo $i; done)|sort|uniq|xargs echo`
 
 mailbox_list_drivers="maildir imapdir none fs shared"
 have_sdbox=no


More information about the dovecot-cvs mailing list