diff options
| author |   robert <robert@openbsd.org> | 2012-02-18 16:52:25 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2012-02-18 16:52:25 +0000 |
| commit | 53c056d0dbab5ccf5caa11f1bd5c2d2383d6b20b (patch) | |
| tree | 0701ef0dd57b83f49154186f8c43bf3da189ad95 | |
| parent | Work around compiler confusion while building rthread.o on vax. (diff) | |
| download | wireguard-openbsd-53c056d0dbab5ccf5caa11f1bd5c2d2383d6b20b.tar.xz wireguard-openbsd-53c056d0dbab5ccf5caa11f1bd5c2d2383d6b20b.zip | |
remove accidentally overwritten change which makes sure to use the bundled
pcre
| -rw-r--r-- | usr.sbin/nginx/auto/lib/pcre/conf | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/nginx/auto/lib/pcre/conf b/usr.sbin/nginx/auto/lib/pcre/conf index c8942caa77b..d183079e93d 100644 --- a/usr.sbin/nginx/auto/lib/pcre/conf +++ b/usr.sbin/nginx/auto/lib/pcre/conf @@ -84,7 +84,7 @@ if [ $PCRE != NONE ]; then else - if [ "$NGX_PLATFORM" != win32 ]; then + if [ "$NGX_PLATFORM" != win32 -a `uname -s` != OpenBSD ]; then PCRE=NO @@ -165,6 +165,12 @@ 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 |