summaryrefslogtreecommitdiff
path: root/auto
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2007-09-15 16:51:16 +0000
committerIgor Sysoev <igor@sysoev.ru>2007-09-15 16:51:16 +0000
commit48714085dde4fe4c5b695dad23295e3f96fe1d2e (patch)
tree37b0109215ca08bb1103f03dd43f435392ebe36a /auto
parent05a75d0d9496d874fc22d7e8b3c44b7914a61509 (diff)
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Diffstat (limited to 'auto')
-rw-r--r--auto/modules22
-rw-r--r--auto/options6
-rw-r--r--auto/sources18
3 files changed, 41 insertions, 5 deletions
diff --git a/auto/modules b/auto/modules
index ee5462dc..f479ea9d 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"
diff --git a/auto/options b/auto/options
index a9d7a2ae..1006e858 100644
--- a/auto/options
+++ b/auto/options
@@ -81,6 +81,9 @@ HTTP_STUB_STATUS=NO
MAIL=NO
MAIL_SSL=NO
+MAIL_POP3=YES
+MAIL_IMAP=YES
+MAIL_SMTP=YES
NGX_ADDONS=
@@ -190,6 +193,9 @@ do
# STUB
--with-imap) MAIL=YES ;;
--with-imap_ssl_module) MAIL_SSL=YES ;;
+ --without-mail_pop3_module) MAIL_POP3=NO ;;
+ --without-mail_imap_module) MAIL_IMAP=NO ;;
+ --without-mail_smtp_module) MAIL_SMTP=NO ;;
--add-module=*) NGX_ADDONS="$NGX_ADDONS $value" ;;
diff --git a/auto/sources b/auto/sources
index 901cddab..c5a43032 100644
--- a/auto/sources
+++ b/auto/sources
@@ -423,11 +423,23 @@ MAIL_MODULES="ngx_mail_module ngx_mail_core_module"
MAIL_SRCS="src/mail/ngx_mail.c \
src/mail/ngx_mail_core_module.c \
src/mail/ngx_mail_handler.c \
- src/mail/ngx_mail_pop3_handler.c \
- src/mail/ngx_mail_imap_handler.c \
- src/mail/ngx_mail_smtp_handler.c \
src/mail/ngx_mail_parse.c"
+MAIL_POP3_MODULE="ngx_mail_pop3_module"
+MAIL_POP3_DEPS="src/mail/ngx_mail_pop3_module.h"
+MAIL_POP3_SRCS="src/mail/ngx_mail_pop3_module.c \
+ src/mail/ngx_mail_pop3_handler.c"
+
+MAIL_IMAP_MODULE="ngx_mail_imap_module"
+MAIL_IMAP_DEPS="src/mail/ngx_mail_imap_module.h"
+MAIL_IMAP_SRCS="src/mail/ngx_mail_imap_module.c \
+ src/mail/ngx_mail_imap_handler.c"
+
+MAIL_SMTP_MODULE="ngx_mail_smtp_module"
+MAIL_SMTP_DEPS="src/mail/ngx_mail_smtp_module.h"
+MAIL_SMTP_SRCS="src/mail/ngx_mail_smtp_module.c \
+ src/mail/ngx_mail_smtp_handler.c"
+
MAIL_SSL_MODULE="ngx_mail_ssl_module"
MAIL_SSL_DEPS="src/mail/ngx_mail_ssl_module.h"
MAIL_SSL_SRCS="src/mail/ngx_mail_ssl_module.c"