nginx-0.0.1-2003-12-19-11:15:11 import
diff --git a/auto/lib/conf b/auto/lib/conf
index b5271a2..0739a72 100644
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -2,12 +2,15 @@
if [ $PCRE != NO ]; then
CORE_INCS="$CORE_INCS -I $PCRE"
+ CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
+ CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
if [ "$PLATFORM" = "win32" ]; then
- CFLAGS="$CFLAGS -D PCRE_STATIC"
+ CFLAGS="$CFLAGS -D PCRE_STATIC -D HAVE_PCRE=1"
CORE_LIBS="$CORE_LIBS pcre.lib"
CORE_LINK="$CORE_LINK -libpath:$PCRE"
else
+ CFLAGS="$CFLAGS -D HAVE_PCRE=1"
CORE_DEPS="$CORE_DEPS $PCRE/.libs/libpcre.a"
CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre"
fi
diff --git a/auto/sources b/auto/sources
index 1e8790f..b2eec44 100644
--- a/auto/sources
+++ b/auto/sources
@@ -5,6 +5,7 @@
CORE_DEPS="src/core/nginx.h \
src/core/ngx_config.h \
+ src/core/ngx_atomic.h \
src/core/ngx_log.h \
src/core/ngx_alloc.h \
src/core/ngx_array.h \
@@ -15,7 +16,6 @@
src/core/ngx_inet.h \
src/core/ngx_file.h \
src/core/ngx_crc.h \
- src/core/ngx_regex.h \
src/core/ngx_rbtree.h \
src/core/ngx_times.h \
src/core/ngx_connection.h \
@@ -32,13 +32,16 @@
src/core/ngx_parse.c \
src/core/ngx_inet.c \
src/core/ngx_file.c \
- src/core/ngx_regex.c \
src/core/ngx_rbtree.c \
src/core/ngx_times.c \
src/core/ngx_conf_file.c \
src/core/ngx_garbage_collector.c"
+REGEX_DEPS="src/core/ngx_regex.h"
+REGEX_SRCS="src/core/ngx_regex.c"
+
+
EVENT_MODULES="ngx_events_module ngx_event_core_module"
EVENT_INCS="-I src/event -I src/event/modules"
diff --git a/auto/summary b/auto/summary
index 19afd04..28fe5f5 100644
--- a/auto/summary
+++ b/auto/summary
@@ -2,6 +2,12 @@
echo
echo "Configuration summary"
+case $PCRE in
+ YES) echo " + using system PCRE library" ;;
+ NO) echo " + PCRE library is not found" ;;
+ *) echo " + using PCRE library: $PCRE" ;;
+esac
+
case $MD5 in
YES) echo " + using system md5 library" ;;
NO) echo " + md5 library is not found" ;;
diff --git a/auto/unix b/auto/unix
index 09115f5..4fd44f4 100755
--- a/auto/unix
+++ b/auto/unix
@@ -83,6 +83,12 @@
. auto/func
+ngx_func="strsignal()"
+ngx_func_inc="#include <string.h>"
+ngx_func_test="char *s = strsignal(1)"
+. auto/func
+
+
ngx_func="strerror_r()"
ngx_func_inc="#include <string.h>"
ngx_func_test="char buf[20]; strerror_r(1, buf, 20)"
