New commits:
commit 07602d090bfbd7bd90796c37f482b6769bdd22ad
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>
courier-imap: 5.3.1
diff --git a/mail/courier-imap/CONFIGURE b/mail/courier-imap/CONFIGURE
index d85365d..60e9975 100755
--- a/mail/courier-imap/CONFIGURE
+++ b/mail/courier-imap/CONFIGURE
@@ -1,23 +1,7 @@
-if spell_ok db
-then
- if spell_ok gdbm
- then
- config_query_option CIMAP_DB
\
- "You have both GDBM and Berkeley DB libraries
installed. Do you want to use GDBM with Courier? (Courier will
automatically choose GDBM over Berkely DB. Answer 'n' to use Berkely DB
instead.) " \
- y
\
- "--with-db=gdbm"
\
- "--with-db=db"
- fi
-else
- if ! spell_ok gdbm
- then
- config_query_option CIMAP_DB
\
- "Either GDBM or Berkeley DB library must be
installed. Do you want to install GDBM? (Answer 'n' to install Berkely DB
instead.) " \
- y
\
- "--with-db=gdbm"
\
- "--with-db=db"
- fi
-fi &&
+message "$SPELL requires one of dbi ($(spell_ok db || echo "not ")installed)
or gdbm ($(spell_ok gdbm || echo "not ")installed)" &&
+config_query_list CIMAP_DB "Which database provider do you want?" \
+ "db" \
+ "gdbm" &&