Mercurial > hg > nginx
changeset 263:43c26e85205a
nginx-0.0.2-2004-02-19-11:45:27 import
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Thu, 19 Feb 2004 08:45:27 +0000 |
| parents | 8c5bdde0d9f0 |
| children | cd009bf7400d |
| files | auto/lib/pcre/conf auto/options |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/lib/pcre/conf Wed Feb 18 15:45:21 2004 +0000 +++ b/auto/lib/pcre/conf Thu Feb 19 08:45:27 2004 +0000 @@ -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
--- a/auto/options Wed Feb 18 15:45:21 2004 +0000 +++ b/auto/options Thu Feb 19 08:45:27 2004 +0000 @@ -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" ;;