diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-11-07 14:24:55 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-11-07 14:24:55 +0000 |
| commit | 0302764c914d07ffe8f81b27fe4e1ce43b4c095e (patch) | |
| tree | 046927c7e3faeb3818e1c74993d5949c654dd689 /auto/modules | |
| parent | 3a79abf0ca5dca3720f4c08eb7d91a6f9b286dc3 (diff) | |
| download | nginx-0302764c914d07ffe8f81b27fe4e1ce43b4c095e.tar.gz nginx-0302764c914d07ffe8f81b27fe4e1ce43b4c095e.tar.bz2 | |
r1477, r1478, r1479, r1480, r1481, r1482, r1483, r1484, r1485, r1486,
r1487, r1488, r1494, r1495, r1499 merge:
*) ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
*) smtp_client_buffer and smtp_greeting_delay
Diffstat (limited to 'auto/modules')
| -rw-r--r-- | auto/modules | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/auto/modules b/auto/modules index ee5462dc4..f479ea9df 100644 --- a/auto/modules +++ b/auto/modules @@ -308,8 +308,6 @@ fi if [ $MAIL_SSL = YES ]; then - MAIL_DEPS="$MAIL_DEPS $MAIL_SSL_DEPS" - MAIL_SRCS="$MAIL_SRCS $MAIL_SSL_SRCS" have=NGX_MAIL_SSL . auto/have USE_OPENSSL=YES fi @@ -341,6 +339,26 @@ if [ $MAIL = YES ]; then if [ $MAIL_SSL = YES ]; then modules="$modules $MAIL_SSL_MODULE" + MAIL_DEPS="$MAIL_DEPS $MAIL_SSL_DEPS" + MAIL_SRCS="$MAIL_SRCS $MAIL_SSL_SRCS" + fi + + if [ $MAIL_POP3 = YES ]; then + modules="$modules $MAIL_POP3_MODULE" + MAIL_DEPS="$MAIL_DEPS $MAIL_POP3_DEPS" + MAIL_SRCS="$MAIL_SRCS $MAIL_POP3_SRCS" + fi + + if [ $MAIL_IMAP = YES ]; then + modules="$modules $MAIL_IMAP_MODULE" + MAIL_DEPS="$MAIL_DEPS $MAIL_IMAP_DEPS" + MAIL_SRCS="$MAIL_SRCS $MAIL_IMAP_SRCS" + fi + + if [ $MAIL_SMTP = YES ]; then + modules="$modules $MAIL_SMTP_MODULE" + MAIL_DEPS="$MAIL_DEPS $MAIL_SMTP_DEPS" + MAIL_SRCS="$MAIL_SRCS $MAIL_SMTP_SRCS" fi modules="$modules $MAIL_AUTH_HTTP_MODULE" |