summaryrefslogtreecommitdiffstats
path: root/usr.sbin/nginx/auto/lib/pcre
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/nginx/auto/lib/pcre')
-rw-r--r--usr.sbin/nginx/auto/lib/pcre/conf9
-rw-r--r--usr.sbin/nginx/auto/lib/pcre/make1
-rw-r--r--usr.sbin/nginx/auto/lib/pcre/makefile.bcc1
-rw-r--r--usr.sbin/nginx/auto/lib/pcre/makefile.msvc1
-rw-r--r--usr.sbin/nginx/auto/lib/pcre/makefile.owc1
5 files changed, 6 insertions, 7 deletions
diff --git a/usr.sbin/nginx/auto/lib/pcre/conf b/usr.sbin/nginx/auto/lib/pcre/conf
index bfa600c81ca..c8942caa77b 100644
--- a/usr.sbin/nginx/auto/lib/pcre/conf
+++ b/usr.sbin/nginx/auto/lib/pcre/conf
@@ -1,5 +1,6 @@
# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
if [ $PCRE != NONE ]; then
@@ -83,7 +84,7 @@ if [ $PCRE != NONE ]; then
else
- if [ "$NGX_PLATFORM" != win32 -a `uname -s` != OpenBSD ]; then
+ if [ "$NGX_PLATFORM" != win32 ]; then
PCRE=NO
@@ -164,12 +165,6 @@ else
fi
fi
- have=NGX_PCRE . auto/have
- CORE_SRCS="$CORE_SRCS $PCRE_SRCS $REGEX_SRCS"
- CORE_INCS="$CORE_INCS src/pcre"
- CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10"
- PCRE=YES
-
if [ $PCRE != YES ]; then
cat << END
diff --git a/usr.sbin/nginx/auto/lib/pcre/make b/usr.sbin/nginx/auto/lib/pcre/make
index 9f2c658bf17..1695b934073 100644
--- a/usr.sbin/nginx/auto/lib/pcre/make
+++ b/usr.sbin/nginx/auto/lib/pcre/make
@@ -1,5 +1,6 @@
# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
case "$NGX_CC_NAME" in
diff --git a/usr.sbin/nginx/auto/lib/pcre/makefile.bcc b/usr.sbin/nginx/auto/lib/pcre/makefile.bcc
index 40d579fb59d..1c140d668b7 100644
--- a/usr.sbin/nginx/auto/lib/pcre/makefile.bcc
+++ b/usr.sbin/nginx/auto/lib/pcre/makefile.bcc
@@ -1,5 +1,6 @@
# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
CFLAGS = -q -O2 -tWM -w-8004 $(CPU_OPT)
diff --git a/usr.sbin/nginx/auto/lib/pcre/makefile.msvc b/usr.sbin/nginx/auto/lib/pcre/makefile.msvc
index 47ae6991aee..7a8da715818 100644
--- a/usr.sbin/nginx/auto/lib/pcre/makefile.msvc
+++ b/usr.sbin/nginx/auto/lib/pcre/makefile.msvc
@@ -1,5 +1,6 @@
# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
CFLAGS = -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
diff --git a/usr.sbin/nginx/auto/lib/pcre/makefile.owc b/usr.sbin/nginx/auto/lib/pcre/makefile.owc
index b2f1d1297b2..bfb69206879 100644
--- a/usr.sbin/nginx/auto/lib/pcre/makefile.owc
+++ b/usr.sbin/nginx/auto/lib/pcre/makefile.owc
@@ -1,5 +1,6 @@
# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)