[dovecot-cvs] dovecot/src/master main.c,1.86,1.87

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv704

Modified Files:
	main.c 
Log Message:
List -n and -a in short help. Fixes to --build-options.



Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/main.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- main.c	1 Jul 2006 18:44:56 -0000	1.86
+++ main.c	2 Jul 2006 11:03:58 -0000	1.87
@@ -612,7 +612,7 @@
 static void print_help(void)
 {
 	printf(
-"Usage: dovecot [-F] [-c <config file>] [-p]\n"
+"Usage: dovecot [-F] [-c <config file>] [-p] [-n] [-a]\n"
 "       [--exec-mail <protocol>] [--version] [--build-options]\n");
 }
 
@@ -622,6 +622,9 @@
 #ifdef IOLOOP_EPOLL
 		" ioloop=epoll"
 #endif
+#ifdef IOLOOP_KQUEUE
+		" ioloop=kqueue"
+#endif
 #ifdef IOLOOP_POLL
 		" ioloop=poll"
 #endif
@@ -629,10 +632,13 @@
 		" ioloop=select"
 #endif
 #ifdef IOLOOP_NOTIFY_DNOTIFY
-		" dnotify"
+		" notify=dnotify"
 #endif
 #ifdef IOLOOP_NOTIFY_INOTIFY
-		" inotify"
+		" notify=inotify"
+#endif
+#ifdef IOLOOP_NOTIFY_KQUEUE
+		" notify=kqueue"
 #endif
 #ifdef HAVE_IPV6
 		" ipv6"
@@ -643,67 +649,68 @@
 #ifdef HAVE_OPENSSL
 		" openssl"
 #endif
-#ifdef HAVE_MYSQL
+	"\nSQL drivers:"
+#ifdef BUILD_MYSQL
 		" mysql"
 #endif
-#ifdef HAVE_PGSQL
+#ifdef BUILD_PGSQL
 		" postgresql"
 #endif
-#ifdef HAVE_SQLITE
+#ifdef BUILD_SQLITE
 		" sqlite"
 #endif
-	"\nPassdb: "
+	"\nPassdb:"
 #ifdef PASSDB_BSDAUTH
-		"bsdauth "
+		" bsdauth"
 #endif
 #ifdef PASSDB_CHECKPASSWORD
-		"checkpassword "
+		" checkpassword"
 #endif
 #ifdef PASSDB_LDAP
-		"ldap "
+		" ldap"
 #endif
 #ifdef PASSDB_PAM
-		"pam "
+		" pam"
 #endif
 #ifdef PASSDB_PASSWD
-		"passwd "
+		" passwd"
 #endif
 #ifdef PASSDB_PASSWD_FILE
-		"passwd-file "
+		" passwd-file"
 #endif
 #ifdef PASSDB_SHADOW 
-		"shadow "
+		" shadow"
 #endif
 #ifdef PASSDB_SQL 
-		"sql "
+		" sql"
 #endif
 #ifdef PASSDB_VPOPMAIL
-		"vpopmail "
+		" vpopmail"
 #endif
-	"\nUserdb: "
+	"\nUserdb:"
 #ifdef USERDB_CHECKPASSWORD
-		"checkpassword "
+		" checkpassword"
 #endif
 #ifdef USERDB_LDAP
-		"ldap "
-#endif
-#ifdef USERDB_PASSDB 
-		"passdb "
+		" ldap"
 #endif
 #ifdef USERDB_PASSWD
-		"passwd "
+		" passwd"
+#endif
+#ifdef USERDB_PREFETCH
+		" prefetch"
 #endif
 #ifdef USERDB_PASSWD_FILE
-		"passwd-file "
+		" passwd-file"
 #endif
 #ifdef USERDB_SQL 
-		"sql "
+		" sql"
 #endif
 #ifdef USERDB_STATIC 
-		"static "
+		" static"
 #endif
 #ifdef USERDB_VPOPMAIL
-		"vpopmail "
+		" vpopmail"
 #endif
 	"\n");
 }