summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-04-04 20:32:09 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-04-04 20:32:09 +0000
commit9a864bd8f87efd0fa23f552d4277475dd76bcea4 (patch)
tree748c76cb067e50ae033389a0590fee8b4d76d222 /auto
parentc972a3fe2774c329cd64fdaf36f51e28a130bf4c (diff)
downloadnginx-9a864bd8f87efd0fa23f552d4277475dd76bcea4.tar.gz
nginx-9a864bd8f87efd0fa23f552d4277475dd76bcea4.tar.bz2
nginx-0.0.3-2004-04-05-00:32:09 import
Diffstat (limited to 'auto')
-rw-r--r--auto/cc2
-rw-r--r--auto/lib/md5/conf3
-rw-r--r--auto/lib/pcre/conf3
-rw-r--r--auto/lib/zlib/conf3
-rw-r--r--auto/sources2
5 files changed, 9 insertions, 4 deletions
diff --git a/auto/cc b/auto/cc
index b67865192..7f0010201 100644
--- a/auto/cc
+++ b/auto/cc
@@ -2,7 +2,7 @@
case $CC in
*gcc*)
- # gcc 2.95.4, 3.3.2
+ # gcc 2.7.2.3, 2.95.4, 3.3.2, 3.4
# optimization
#CFLAGS="$CFLAGS -O2 -fomit-frame-pointer"
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf
index 40fd74716..d5b2a0afd 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -32,7 +32,8 @@ if [ $MD5 != NONE ]; then
*)
LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
- CORE_LIBS="$CORE_LIBS -L $MD5 -lmd5"
+ CORE_LIBS="$CORE_LIBS $MD5/libmd5.a"
+ #CORE_LIBS="$CORE_LIBS -L $MD5 -lmd5"
;;
esac
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 3f2c7a1f6..fa50c24e9 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -31,7 +31,8 @@ if [ $PCRE != NONE ]; then
have=HAVE_PCRE . auto/have
CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
- CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre"
+ CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a"
+ #CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre"
;;
esac
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf
index 82cc5edc8..7376abd70 100644
--- a/auto/lib/zlib/conf
+++ b/auto/lib/zlib/conf
@@ -26,7 +26,8 @@ if [ $ZLIB != NONE ]; then
*)
LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
- CORE_LIBS="$CORE_LIBS -L $ZLIB -lz"
+ CORE_LIBS="$CORE_LIBS $ZLIB/libz.a"
+ #CORE_LIBS="$CORE_LIBS -L $ZLIB -lz"
;;
esac
diff --git a/auto/sources b/auto/sources
index 9aa9da0b5..eba6eb977 100644
--- a/auto/sources
+++ b/auto/sources
@@ -52,12 +52,14 @@ EVENT_INCS="src/event src/event/modules"
EVENT_DEPS="src/event/ngx_event.h \
src/event/ngx_event_timer.h \
+ src/event/ngx_event_posted.h \
src/event/ngx_event_busy_lock.h \
src/event/ngx_event_connect.h \
src/event/ngx_event_pipe.h"
EVENT_SRCS="src/event/ngx_event.c \
src/event/ngx_event_timer.c \
+ src/event/ngx_event_posted.c \
src/event/ngx_event_busy_lock.c \
src/event/ngx_event_accept.c \
src/event/ngx_event_connect.c \