comparison auto/make @ 1136:68f30ab68bb7

Many changes: *) rename imap to mail, sort pop3/imap functions *) smtp auth support *) pop3 starttls only *) fix segfault if cram-md5 was used without apop
author Igor Sysoev <igor@sysoev.ru>
date Mon, 19 Mar 2007 13:36:56 +0000
parents 7e24168b0853
children e5ce4e2de846
comparison
equal deleted inserted replaced
1135:03f1133f24e8 1136:68f30ab68bb7
4 4
5 mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \ 5 mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \
6 $NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \ 6 $NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \
7 $NGX_OBJS/src/http $NGX_OBJS/src/http/modules \ 7 $NGX_OBJS/src/http $NGX_OBJS/src/http/modules \
8 $NGX_OBJS/src/http/modules/perl \ 8 $NGX_OBJS/src/http/modules/perl \
9 $NGX_OBJS/src/imap 9 $NGX_OBJS/src/mail
10 10
11 11
12 ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep 12 ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep
13 ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"` 13 ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"`
14 14
39 fi 39 fi
40 40
41 41
42 # ALL_INCS, required by the addons and by OpenWatcom C precompiled headers 42 # ALL_INCS, required by the addons and by OpenWatcom C precompiled headers
43 43
44 ngx_incs=`echo $CORE_INCS $NGX_OBJS $HTTP_INCS $IMAP_INCS\ 44 ngx_incs=`echo $CORE_INCS $NGX_OBJS $HTTP_INCS $MAIL_INCS\
45 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ 45 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \
46 -e "s/\//$ngx_regex_dirsep/g"` 46 -e "s/\//$ngx_regex_dirsep/g"`
47 47
48 cat << END >> $NGX_MAKEFILE 48 cat << END >> $NGX_MAKEFILE
49 49
99 END 99 END
100 100
101 fi 101 fi
102 102
103 103
104 # the imap dependences and include pathes 104 # the mail dependences and include pathes
105 105
106 if [ $IMAP = YES ]; then 106 if [ $MAIL = YES ]; then
107 107
108 ngx_all_srcs="$ngx_all_srcs $IMAP_SRCS" 108 ngx_all_srcs="$ngx_all_srcs $MAIL_SRCS"
109 109
110 ngx_deps=`echo $IMAP_DEPS \ 110 ngx_deps=`echo $MAIL_DEPS \
111 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ 111 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
112 -e "s/\//$ngx_regex_dirsep/g"` 112 -e "s/\//$ngx_regex_dirsep/g"`
113 113
114 ngx_incs=`echo $IMAP_INCS \ 114 ngx_incs=`echo $MAIL_INCS \
115 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \ 115 | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \
116 -e "s/\//$ngx_regex_dirsep/g"` 116 -e "s/\//$ngx_regex_dirsep/g"`
117 117
118 cat << END >> $NGX_MAKEFILE 118 cat << END >> $NGX_MAKEFILE
119 119
120 IMAP_DEPS = $ngx_deps 120 MAIL_DEPS = $ngx_deps
121 121
122 122
123 IMAP_INCS = $ngx_include_opt$ngx_incs 123 MAIL_INCS = $ngx_include_opt$ngx_incs
124 124
125 END 125 END
126 126
127 fi 127 fi
128 128
277 done 277 done
278 278
279 fi 279 fi
280 280
281 281
282 # the imap sources 282 # the mail sources
283 283
284 if [ $IMAP = YES ]; then 284 if [ $MAIL = YES ]; then
285 285
286 if test -n "$NGX_PCH"; then 286 if test -n "$NGX_PCH"; then
287 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" 287 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
288 else 288 else
289 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(IMAP_INCS)" 289 ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(MAIL_INCS)"
290 fi 290 fi
291 291
292 for ngx_src in $IMAP_SRCS 292 for ngx_src in $MAIL_SRCS
293 do 293 do
294 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` 294 ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
295 ngx_obj=`echo $ngx_src \ 295 ngx_obj=`echo $ngx_src \
296 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ 296 | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \
297 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ 297 -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \
298 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ 298 -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \
299 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` 299 -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"`
300 300
301 cat << END >> $NGX_MAKEFILE 301 cat << END >> $NGX_MAKEFILE
302 302
303 $ngx_obj: \$(CORE_DEPS) \$(IMAP_DEPS)$ngx_cont$ngx_src 303 $ngx_obj: \$(CORE_DEPS) \$(MAIL_DEPS)$ngx_cont$ngx_src
304 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX 304 $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
305 305
306 END 306 END
307 done 307 done
308 308