nginx-0.0.2-2004-02-19-11:45:27 import
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 1fc3153..436bee2 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -5,14 +5,11 @@
CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
if [ "$PLATFORM" = "win32" ]; then
- #CFLAGS="$CFLAGS -D PCRE_STATIC -D HAVE_PCRE=1"
have=HAVE_PCRE . auto/have
have=PCRE_STATIC . auto/have
-
CORE_LIBS="$CORE_LIBS pcre.lib"
CORE_LINK="$CORE_LINK -libpath:$PCRE"
else
- #CFLAGS="$CFLAGS -D HAVE_PCRE=1"
have=HAVE_PCRE . auto/have
CORE_DEPS="$CORE_DEPS $PCRE/.libs/libpcre.a"
CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre"
@@ -29,7 +26,12 @@
if [ $ngx_found = yes ]; then
+ have=HAVE_PCRE . auto/have
+
+ CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
+ CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
CORE_LIBS="$CORE_LIBS $ngx_libs"
+
PCRE=YES
else
PCRE=NO
diff --git a/auto/options b/auto/options
index 9804b2b..d199614 100644
--- a/auto/options
+++ b/auto/options
@@ -21,7 +21,7 @@
HTTP_PROXY=YES
USE_PCRE=NO
-PCRE=NO
+PCRE=NONE
USE_MD5=NO
MD5=NONE
@@ -58,7 +58,7 @@
--with-cc=*) CC="$value" ;;
- --without-pcre) PCRE=NONE ;;
+ --without-pcre) USE_PCRE=NO ;;
--with-pcre=*) PCRE="$value" ;;
--with-md5=*) MD5="$value" ;;
--with-zlib=*) ZLIB="$value" ;;
