summaryrefslogtreecommitdiffhomepage
path: root/auto/lib/pcre
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-03-10 17:55:19 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-03-10 17:55:19 +0000
commit24b56c92bb344a5377f02eda85c639f86a8592ff (patch)
treeba4494ec3463e67f261ec58e81e68963cdda1b2f /auto/lib/pcre
parentfc5a10aedcdd8cf261ecc164941562bc52fe415d (diff)
downloadnginx-24b56c92bb344a5377f02eda85c639f86a8592ff.tar.gz
nginx-24b56c92bb344a5377f02eda85c639f86a8592ff.tar.bz2
nginx-0.0.2-2004-03-10-20:55:19 import
Diffstat (limited to 'auto/lib/pcre')
-rw-r--r--auto/lib/pcre/make5
-rw-r--r--auto/lib/pcre/makefile.msvc2
-rw-r--r--auto/lib/pcre/makefile.owc2
3 files changed, 5 insertions, 4 deletions
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 6ea086da6..8bfd9438e 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -32,13 +32,14 @@ case $PLATFORM in
cp auto/lib/pcre/patch.config $PCRE
cp auto/lib/pcre/$makefile $PCRE
echo " cd $PCRE" >> $MAKEFILE
- echo " \$(MAKE) -f $makefile OWC_OPT=$OWC_OPT" >> $MAKEFILE
+ echo " \$(MAKE) -f $makefile LIB_OPT=$LIB_OPT" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE
;;
*)
echo " cd $PCRE \\" >> $MAKEFILE
- echo " && ./configure --disable-shared \\" >> $MAKEFILE
+ echo $ngx_n " && CFLAGS=\"-O2 $LIB_OPT\"" $ngx_c >> $MAKEFILE
+ echo " ./configure --disable-shared \\" >> $MAKEFILE
echo " && \$(MAKE)" >> $MAKEFILE
;;
diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc
index 0eeb310ab..f65196821 100644
--- a/auto/lib/pcre/makefile.msvc
+++ b/auto/lib/pcre/makefile.msvc
@@ -1,5 +1,5 @@
-CFLAGS = -O2 -Ob1 -Oi -Gs -MT
+CFLAGS = -O2 -Ob1 -Oi -Gs -MT $(LIB_OPT)
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc
index f4244a6c0..5c15e8770 100644
--- a/auto/lib/pcre/makefile.owc
+++ b/auto/lib/pcre/makefile.owc
@@ -1,5 +1,5 @@
-CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(OWC_OPT)
+CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(LIB_OPT)
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10