diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-02-19 11:45:27 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-02-19 11:45:27 +0300 |
| commit | 43c3cd91a9d810947f0d971129c06c05353a756a (patch) | |
| tree | a29e67d189f7b8ec8fc0fa756a1074b4a51e4629 /auto | |
| parent | 8ae18a10d6c7c94fbb4fa04a64c6fa1e2a38fe16 (diff) | |
nginx-0.0.2-2004-02-19-11:45:27 import
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/lib/pcre/conf | 8 | ||||
| -rw-r--r-- | auto/options | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index 1fc315359..436bee2dd 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -5,14 +5,11 @@ if [ $PCRE != NONE ]; then 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 @@ else 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 9804b2b2d..d1996142a 100644 --- a/auto/options +++ b/auto/options @@ -21,7 +21,7 @@ HTTP_SSI=YES HTTP_PROXY=YES USE_PCRE=NO -PCRE=NO +PCRE=NONE USE_MD5=NO MD5=NONE @@ -58,7 +58,7 @@ do --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" ;; |