summaryrefslogtreecommitdiff
path: root/auto
diff options
context:
space:
mode:
authornginx <nginx@nginx.org>2013-02-19 15:28:29 +0000
committerJon Kolb <jon@b0g.us>2013-02-19 15:28:29 +0000
commita36b88c56061d08f8fbe96a51489bf3381792aca (patch)
treefe157c41a9e920b0b05a343f2dc85312f080b6f4 /auto
parentbf3178867712d61cd5bb7692e6f837c4b0c51d8c (diff)
downloadnginx-a36b88c56061d08f8fbe96a51489bf3381792aca.tar.gz
Changes with nginx 1.3.13 19 Feb 2013v1.3.13
*) Change: a compiler with name "cc" is now used by default. *) Feature: support for proxying of WebSocket connections. Thanks to Apcera and CloudBees for sponsoring this work. *) Feature: the "auth_basic_user_file" directive supports "{SHA}" password encryption method. Thanks to Louis Opter.
Diffstat (limited to 'auto')
-rw-r--r--auto/lib/perl/make3
-rw-r--r--auto/options2
2 files changed, 3 insertions, 2 deletions
diff --git a/auto/lib/perl/make b/auto/lib/perl/make
index 6fe95af0e..b40352abf 100644
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@@ -6,11 +6,12 @@
cat << END >> $NGX_MAKEFILE
$NGX_OBJS/src/http/modules/perl/blib/arch/auto/nginx/nginx.so: \
+ \$(CORE_DEPS) \$(HTTP_DEPS) \
src/http/modules/perl/nginx.pm \
src/http/modules/perl/nginx.xs \
src/http/modules/perl/ngx_http_perl_module.h \
$NGX_OBJS/src/http/modules/perl/Makefile
- cp -p src/http/modules/perl/nginx.* $NGX_OBJS/src/http/modules/perl/
+ cp src/http/modules/perl/nginx.* $NGX_OBJS/src/http/modules/perl/
cd $NGX_OBJS/src/http/modules/perl && \$(MAKE)
diff --git a/auto/options b/auto/options
index a75bead54..150286d7b 100644
--- a/auto/options
+++ b/auto/options
@@ -15,7 +15,7 @@ NGX_LOCK_PATH=
NGX_USER=
NGX_GROUP=
-CC=${CC:-gcc}
+CC=${CC:-cc}
CPP=
NGX_OBJS=objs