diff options
Diffstat (limited to 'usr.sbin/nginx/auto')
72 files changed, 78 insertions, 37 deletions
diff --git a/usr.sbin/nginx/auto/cc/acc b/usr.sbin/nginx/auto/cc/acc index f325bc56d11..6baee672ad4 100644 --- a/usr.sbin/nginx/auto/cc/acc +++ b/usr.sbin/nginx/auto/cc/acc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. # aCC: HP ANSI C++ B3910B A.03.55.02 diff --git a/usr.sbin/nginx/auto/cc/bcc b/usr.sbin/nginx/auto/cc/bcc index 9570a3c478b..ec82e60fb13 100644 --- a/usr.sbin/nginx/auto/cc/bcc +++ b/usr.sbin/nginx/auto/cc/bcc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. # Borland C++ 5.5 diff --git a/usr.sbin/nginx/auto/cc/ccc b/usr.sbin/nginx/auto/cc/ccc index 298f31e99c2..c964045105d 100644 --- a/usr.sbin/nginx/auto/cc/ccc +++ b/usr.sbin/nginx/auto/cc/ccc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. # Compaq C V6.5-207 diff --git a/usr.sbin/nginx/auto/cc/conf b/usr.sbin/nginx/auto/cc/conf index bdcce2c019d..c9118f2fd6f 100644 --- a/usr.sbin/nginx/auto/cc/conf +++ b/usr.sbin/nginx/auto/cc/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. LINK="\$(CC)" diff --git a/usr.sbin/nginx/auto/cc/gcc b/usr.sbin/nginx/auto/cc/gcc index 8ea1f5846d4..de666a34c78 100644 --- a/usr.sbin/nginx/auto/cc/gcc +++ b/usr.sbin/nginx/auto/cc/gcc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. # gcc 2.7.2.3, 2.8.1, 2.95.4, egcs-1.1.2 diff --git a/usr.sbin/nginx/auto/cc/icc b/usr.sbin/nginx/auto/cc/icc index 91dd95ecfd1..1d83ed37a03 100644 --- a/usr.sbin/nginx/auto/cc/icc +++ b/usr.sbin/nginx/auto/cc/icc @@ -1,8 +1,9 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. -# Intel C++ compiler 7.1, 8.0, 8.1, 9.0 +# Intel C++ compiler 7.1, 8.0, 8.1, 9.0, 11.1 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \ | sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'` @@ -15,32 +16,7 @@ have=NGX_COMPILER value="\"Intel C Compiler $NGX_ICC_VER\"" . auto/define # optimizations CFLAGS="$CFLAGS -O" -# inline the functions declared with __inline -#CFLAGS="$CFLAGS -Ob1" -# inline any function, at the compiler's discretion -CFLAGS="$CFLAGS -Ob2" -# multi-file IP optimizations -case "$NGX_ICC_VER" in - 9.*) - IPO="-ipo" - ;; - - # 8.1.38 under FreeBSD can not link -ipo - 8.1) - IPO="-ip" - ;; - - *) - IPO="-ipo -ipo_obj" - ;; -esac - -# single-file IP optimizations -#IPO="-ip" - -CFLAGS="$CFLAGS $IPO" -CORE_LINK="$CORE_LINK $IPO" CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file" @@ -64,15 +40,15 @@ esac CFLAGS="$CFLAGS $CPU_OPT" if [ ".$PCRE_OPT" = "." ]; then - PCRE_OPT="-O $IPO $CPU_OPT" + PCRE_OPT="-O $CPU_OPT" fi if [ ".$MD5_OPT" = "." ]; then - MD5_OPT="-O $IPO $CPU_OPT" + MD5_OPT="-O $CPU_OPT" fi if [ ".$ZLIB_OPT" = "." ]; then - ZLIB_OPT="-O $IPO $CPU_OPT" + ZLIB_OPT="-O $CPU_OPT" fi diff --git a/usr.sbin/nginx/auto/cc/msvc b/usr.sbin/nginx/auto/cc/msvc index 01d6f7f2fa3..a99d5a92c2d 100644 --- a/usr.sbin/nginx/auto/cc/msvc +++ b/usr.sbin/nginx/auto/cc/msvc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. # MSVC 6.0 SP2 diff --git a/usr.sbin/nginx/auto/cc/name b/usr.sbin/nginx/auto/cc/name index 8788bc6627d..598f879a0d9 100644 --- a/usr.sbin/nginx/auto/cc/name +++ b/usr.sbin/nginx/auto/cc/name @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. if [ "$NGX_PLATFORM" != win32 ]; then diff --git a/usr.sbin/nginx/auto/cc/owc b/usr.sbin/nginx/auto/cc/owc index 39c180a26fd..22eb4c1259a 100644 --- a/usr.sbin/nginx/auto/cc/owc +++ b/usr.sbin/nginx/auto/cc/owc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. # Open Watcom C 1.0, 1.2, 1.3 diff --git a/usr.sbin/nginx/auto/cc/sunc b/usr.sbin/nginx/auto/cc/sunc index 69e6c2c7128..dd9ccedfbaa 100644 --- a/usr.sbin/nginx/auto/cc/sunc +++ b/usr.sbin/nginx/auto/cc/sunc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. # Sun C 5.7 Patch 117837-04 2005/05/11 Sun Studio 10 diff --git a/usr.sbin/nginx/auto/define b/usr.sbin/nginx/auto/define index 971f99df2ce..b5a7622590d 100644 --- a/usr.sbin/nginx/auto/define +++ b/usr.sbin/nginx/auto/define @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. cat << END >> $NGX_AUTO_CONFIG_H diff --git a/usr.sbin/nginx/auto/endianess b/usr.sbin/nginx/auto/endianess index 5ed22a8ec9b..452dd7c1268 100644 --- a/usr.sbin/nginx/auto/endianess +++ b/usr.sbin/nginx/auto/endianess @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. echo $ngx_n "checking for system endianess ...$ngx_c" diff --git a/usr.sbin/nginx/auto/feature b/usr.sbin/nginx/auto/feature index 98e757cafab..c13e51dfb82 100644 --- a/usr.sbin/nginx/auto/feature +++ b/usr.sbin/nginx/auto/feature @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. echo $ngx_n "checking for $ngx_feature ...$ngx_c" diff --git a/usr.sbin/nginx/auto/have b/usr.sbin/nginx/auto/have index 1b644ad3200..f8e3751c5f0 100644 --- a/usr.sbin/nginx/auto/have +++ b/usr.sbin/nginx/auto/have @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. cat << END >> $NGX_AUTO_CONFIG_H diff --git a/usr.sbin/nginx/auto/have_headers b/usr.sbin/nginx/auto/have_headers index 526ac47d404..a3a75430aa4 100644 --- a/usr.sbin/nginx/auto/have_headers +++ b/usr.sbin/nginx/auto/have_headers @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. cat << END >> $NGX_AUTO_HEADERS_H diff --git a/usr.sbin/nginx/auto/headers b/usr.sbin/nginx/auto/headers index 6f5225f81fd..5a2e6b9023f 100644 --- a/usr.sbin/nginx/auto/headers +++ b/usr.sbin/nginx/auto/headers @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. ngx_include="unistd.h"; . auto/include diff --git a/usr.sbin/nginx/auto/include b/usr.sbin/nginx/auto/include index 3a047d303de..3466fda15b3 100644 --- a/usr.sbin/nginx/auto/include +++ b/usr.sbin/nginx/auto/include @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. echo $ngx_n "checking for $ngx_include ...$ngx_c" diff --git a/usr.sbin/nginx/auto/init b/usr.sbin/nginx/auto/init index 56ecb1908d8..910f5294b66 100644 --- a/usr.sbin/nginx/auto/init +++ b/usr.sbin/nginx/auto/init @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. NGX_MAKEFILE=$NGX_OBJS/Makefile diff --git a/usr.sbin/nginx/auto/install b/usr.sbin/nginx/auto/install index d56be27ef93..c2c0ade5991 100644 --- a/usr.sbin/nginx/auto/install +++ b/usr.sbin/nginx/auto/install @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. if [ $USE_PERL = YES ]; then @@ -72,7 +73,7 @@ case ".$NGX_HTTP_LOG_PATH" in esac -if test -e man/nginx.8 ; then +if test -f man/nginx.8 ; then NGX_MAN=man/nginx.8 else NGX_MAN=docs/man/nginx.8 diff --git a/usr.sbin/nginx/auto/lib/conf b/usr.sbin/nginx/auto/lib/conf index 357e7810d69..e1e447557e9 100644 --- a/usr.sbin/nginx/auto/lib/conf +++ b/usr.sbin/nginx/auto/lib/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. if [ $USE_PCRE = YES -o $PCRE != NONE ]; then diff --git a/usr.sbin/nginx/auto/lib/geoip/conf b/usr.sbin/nginx/auto/lib/geoip/conf index 5647e9167e6..3764d764979 100644 --- a/usr.sbin/nginx/auto/lib/geoip/conf +++ b/usr.sbin/nginx/auto/lib/geoip/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. ngx_feature="GeoIP library" diff --git a/usr.sbin/nginx/auto/lib/google-perftools/conf b/usr.sbin/nginx/auto/lib/google-perftools/conf index 67df9f8ac0e..398ddd05e02 100644 --- a/usr.sbin/nginx/auto/lib/google-perftools/conf +++ b/usr.sbin/nginx/auto/lib/google-perftools/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. ngx_feature="Google perftools" diff --git a/usr.sbin/nginx/auto/lib/libatomic/conf b/usr.sbin/nginx/auto/lib/libatomic/conf index 5cf16f381b5..d1e484ab32e 100644 --- a/usr.sbin/nginx/auto/lib/libatomic/conf +++ b/usr.sbin/nginx/auto/lib/libatomic/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. if [ $NGX_LIBATOMIC != YES ]; then diff --git a/usr.sbin/nginx/auto/lib/libatomic/make b/usr.sbin/nginx/auto/lib/libatomic/make index e1672e324b4..b84267b63e4 100644 --- a/usr.sbin/nginx/auto/lib/libatomic/make +++ b/usr.sbin/nginx/auto/lib/libatomic/make @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. cat << END >> $NGX_MAKEFILE diff --git a/usr.sbin/nginx/auto/lib/libgd/conf b/usr.sbin/nginx/auto/lib/libgd/conf index 6378723706e..b0bc74c15f4 100644 --- a/usr.sbin/nginx/auto/lib/libgd/conf +++ b/usr.sbin/nginx/auto/lib/libgd/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. ngx_feature="GD library" diff --git a/usr.sbin/nginx/auto/lib/libxslt/conf b/usr.sbin/nginx/auto/lib/libxslt/conf index 8c9ea8ba192..bc19d83ddce 100644 --- a/usr.sbin/nginx/auto/lib/libxslt/conf +++ b/usr.sbin/nginx/auto/lib/libxslt/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. ngx_feature="libxslt" diff --git a/usr.sbin/nginx/auto/lib/make b/usr.sbin/nginx/auto/lib/make index f22767eb494..58a84a34cac 100644 --- a/usr.sbin/nginx/auto/lib/make +++ b/usr.sbin/nginx/auto/lib/make @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. if [ $PCRE != NONE -a $PCRE != NO -a $PCRE != YES ]; then diff --git a/usr.sbin/nginx/auto/lib/md5/conf b/usr.sbin/nginx/auto/lib/md5/conf index 9afe5b8deda..f9c1ed90296 100644 --- a/usr.sbin/nginx/auto/lib/md5/conf +++ b/usr.sbin/nginx/auto/lib/md5/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. if [ $MD5 != NONE ]; then diff --git a/usr.sbin/nginx/auto/lib/md5/make b/usr.sbin/nginx/auto/lib/md5/make index 60af28ccad6..81f138ab671 100644 --- a/usr.sbin/nginx/auto/lib/md5/make +++ b/usr.sbin/nginx/auto/lib/md5/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/md5/makefile.bcc b/usr.sbin/nginx/auto/lib/md5/makefile.bcc index c02ef95bd1a..eb6fb624178 100644 --- a/usr.sbin/nginx/auto/lib/md5/makefile.bcc +++ b/usr.sbin/nginx/auto/lib/md5/makefile.bcc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN diff --git a/usr.sbin/nginx/auto/lib/md5/makefile.msvc b/usr.sbin/nginx/auto/lib/md5/makefile.msvc index 233da0fb592..90d62fac7f0 100644 --- a/usr.sbin/nginx/auto/lib/md5/makefile.msvc +++ b/usr.sbin/nginx/auto/lib/md5/makefile.msvc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN diff --git a/usr.sbin/nginx/auto/lib/md5/makefile.owc b/usr.sbin/nginx/auto/lib/md5/makefile.owc index c36c9369fcc..78c1e61dde7 100644 --- a/usr.sbin/nginx/auto/lib/md5/makefile.owc +++ b/usr.sbin/nginx/auto/lib/md5/makefile.owc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT) diff --git a/usr.sbin/nginx/auto/lib/openssl/conf b/usr.sbin/nginx/auto/lib/openssl/conf index 8218a5b975a..528ee1794e9 100644 --- a/usr.sbin/nginx/auto/lib/openssl/conf +++ b/usr.sbin/nginx/auto/lib/openssl/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. if [ $OPENSSL != NONE ]; then diff --git a/usr.sbin/nginx/auto/lib/openssl/make b/usr.sbin/nginx/auto/lib/openssl/make index a2025bbd669..9090fcbfd34 100644 --- a/usr.sbin/nginx/auto/lib/openssl/make +++ b/usr.sbin/nginx/auto/lib/openssl/make @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. case "$CC" in diff --git a/usr.sbin/nginx/auto/lib/openssl/makefile.bcc b/usr.sbin/nginx/auto/lib/openssl/makefile.bcc index 5938cbf6b3a..6a94ff74982 100644 --- a/usr.sbin/nginx/auto/lib/openssl/makefile.bcc +++ b/usr.sbin/nginx/auto/lib/openssl/makefile.bcc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. all: diff --git a/usr.sbin/nginx/auto/lib/openssl/makefile.msvc b/usr.sbin/nginx/auto/lib/openssl/makefile.msvc index 379b95dc028..fc9e57864ae 100644 --- a/usr.sbin/nginx/auto/lib/openssl/makefile.msvc +++ b/usr.sbin/nginx/auto/lib/openssl/makefile.msvc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. all: 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) diff --git a/usr.sbin/nginx/auto/lib/perl/conf b/usr.sbin/nginx/auto/lib/perl/conf index 3f7b908493f..52c7084e974 100644 --- a/usr.sbin/nginx/auto/lib/perl/conf +++ b/usr.sbin/nginx/auto/lib/perl/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. echo "checking for perl" diff --git a/usr.sbin/nginx/auto/lib/perl/make b/usr.sbin/nginx/auto/lib/perl/make index 49eb5cf3430..f5d9ab50189 100644 --- a/usr.sbin/nginx/auto/lib/perl/make +++ b/usr.sbin/nginx/auto/lib/perl/make @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. cat << END >> $NGX_MAKEFILE diff --git a/usr.sbin/nginx/auto/lib/sha1/conf b/usr.sbin/nginx/auto/lib/sha1/conf index af3d3fba2e7..1e644c02f12 100644 --- a/usr.sbin/nginx/auto/lib/sha1/conf +++ b/usr.sbin/nginx/auto/lib/sha1/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. if [ $SHA1 != NONE ]; then diff --git a/usr.sbin/nginx/auto/lib/sha1/make b/usr.sbin/nginx/auto/lib/sha1/make index 6c89acf1b10..fc10aaef38b 100644 --- a/usr.sbin/nginx/auto/lib/sha1/make +++ b/usr.sbin/nginx/auto/lib/sha1/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/sha1/makefile.bcc b/usr.sbin/nginx/auto/lib/sha1/makefile.bcc index 1d8b5e4c8b0..b0685fa4512 100644 --- a/usr.sbin/nginx/auto/lib/sha1/makefile.bcc +++ b/usr.sbin/nginx/auto/lib/sha1/makefile.bcc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN diff --git a/usr.sbin/nginx/auto/lib/sha1/makefile.msvc b/usr.sbin/nginx/auto/lib/sha1/makefile.msvc index 4abd366cad3..3cbd21b3dbd 100644 --- a/usr.sbin/nginx/auto/lib/sha1/makefile.msvc +++ b/usr.sbin/nginx/auto/lib/sha1/makefile.msvc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN diff --git a/usr.sbin/nginx/auto/lib/sha1/makefile.owc b/usr.sbin/nginx/auto/lib/sha1/makefile.owc index c1a3e04311c..fc095cc980a 100644 --- a/usr.sbin/nginx/auto/lib/sha1/makefile.owc +++ b/usr.sbin/nginx/auto/lib/sha1/makefile.owc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT) diff --git a/usr.sbin/nginx/auto/lib/test b/usr.sbin/nginx/auto/lib/test index 6821b51da2a..907e2353b7f 100644 --- a/usr.sbin/nginx/auto/lib/test +++ b/usr.sbin/nginx/auto/lib/test @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. echo $ngx_n "checking for $ngx_lib ...$ngx_c" diff --git a/usr.sbin/nginx/auto/lib/zlib/conf b/usr.sbin/nginx/auto/lib/zlib/conf index 843dd5a557d..cefc874b222 100644 --- a/usr.sbin/nginx/auto/lib/zlib/conf +++ b/usr.sbin/nginx/auto/lib/zlib/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. if [ $ZLIB != NONE ]; then diff --git a/usr.sbin/nginx/auto/lib/zlib/make b/usr.sbin/nginx/auto/lib/zlib/make index b874b04addd..9401a1d1a8e 100644 --- a/usr.sbin/nginx/auto/lib/zlib/make +++ b/usr.sbin/nginx/auto/lib/zlib/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/zlib/makefile.bcc b/usr.sbin/nginx/auto/lib/zlib/makefile.bcc index 69a728c76a9..56f8356884e 100644 --- a/usr.sbin/nginx/auto/lib/zlib/makefile.bcc +++ b/usr.sbin/nginx/auto/lib/zlib/makefile.bcc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. CFLAGS = -q -O2 -tWM -w-8004 -w-8012 $(CPU_OPT) diff --git a/usr.sbin/nginx/auto/lib/zlib/makefile.msvc b/usr.sbin/nginx/auto/lib/zlib/makefile.msvc index d02f2b68e37..2c7c1ae1025 100644 --- a/usr.sbin/nginx/auto/lib/zlib/makefile.msvc +++ b/usr.sbin/nginx/auto/lib/zlib/makefile.msvc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) diff --git a/usr.sbin/nginx/auto/lib/zlib/makefile.owc b/usr.sbin/nginx/auto/lib/zlib/makefile.owc index 738e9a01b6e..f75e66d4f5b 100644 --- a/usr.sbin/nginx/auto/lib/zlib/makefile.owc +++ b/usr.sbin/nginx/auto/lib/zlib/makefile.owc @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. CFLAGS = -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT) diff --git a/usr.sbin/nginx/auto/make b/usr.sbin/nginx/auto/make index 71324b09297..23d6a1ce172 100644 --- a/usr.sbin/nginx/auto/make +++ b/usr.sbin/nginx/auto/make @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. echo "creating $NGX_MAKEFILE" diff --git a/usr.sbin/nginx/auto/modules b/usr.sbin/nginx/auto/modules index b13bcb25b1f..f8d31a3833e 100644 --- a/usr.sbin/nginx/auto/modules +++ b/usr.sbin/nginx/auto/modules @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. if [ $EVENT_SELECT = NO -a $EVENT_FOUND = NO ]; then diff --git a/usr.sbin/nginx/auto/nohave b/usr.sbin/nginx/auto/nohave index bb5632aaf6c..dfb171837c5 100644 --- a/usr.sbin/nginx/auto/nohave +++ b/usr.sbin/nginx/auto/nohave @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. cat << END >> $NGX_AUTO_CONFIG_H diff --git a/usr.sbin/nginx/auto/options b/usr.sbin/nginx/auto/options index 07d22f51961..6eea8c4a8b8 100644 --- a/usr.sbin/nginx/auto/options +++ b/usr.sbin/nginx/auto/options @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. help=no diff --git a/usr.sbin/nginx/auto/os/conf b/usr.sbin/nginx/auto/os/conf index f4d08cb423d..8c18a63fc4b 100644 --- a/usr.sbin/nginx/auto/os/conf +++ b/usr.sbin/nginx/auto/os/conf @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. echo "checking for $NGX_SYSTEM specific features" diff --git a/usr.sbin/nginx/auto/os/darwin b/usr.sbin/nginx/auto/os/darwin index f9953b95cdc..590e03697db 100644 --- a/usr.sbin/nginx/auto/os/darwin +++ b/usr.sbin/nginx/auto/os/darwin @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. have=NGX_DARWIN . auto/have_headers diff --git a/usr.sbin/nginx/auto/os/freebsd b/usr.sbin/nginx/auto/os/freebsd index 082938800c9..88654ba60fb 100644 --- a/usr.sbin/nginx/auto/os/freebsd +++ b/usr.sbin/nginx/auto/os/freebsd @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. have=NGX_FREEBSD . auto/have_headers diff --git a/usr.sbin/nginx/auto/os/linux b/usr.sbin/nginx/auto/os/linux index 394cd87bce1..0b2173cae9c 100644 --- a/usr.sbin/nginx/auto/os/linux +++ b/usr.sbin/nginx/auto/os/linux @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. have=NGX_LINUX . auto/have_headers diff --git a/usr.sbin/nginx/auto/os/solaris b/usr.sbin/nginx/auto/os/solaris index 333f0aebd49..16da4b3fd31 100644 --- a/usr.sbin/nginx/auto/os/solaris +++ b/usr.sbin/nginx/auto/os/solaris @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. have=NGX_SOLARIS . auto/have_headers diff --git a/usr.sbin/nginx/auto/os/win32 b/usr.sbin/nginx/auto/os/win32 index 02b261cea5f..21a54ba11e5 100644 --- a/usr.sbin/nginx/auto/os/win32 +++ b/usr.sbin/nginx/auto/os/win32 @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. have=NGX_WIN32 . auto/have_headers diff --git a/usr.sbin/nginx/auto/sources b/usr.sbin/nginx/auto/sources index ffe144ce1b9..8946869dc41 100644 --- a/usr.sbin/nginx/auto/sources +++ b/usr.sbin/nginx/auto/sources @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. CORE_MODULES="ngx_core_module ngx_errlog_module ngx_conf_module" diff --git a/usr.sbin/nginx/auto/stubs b/usr.sbin/nginx/auto/stubs index 0031eaf8768..d8bc1f0e02a 100644 --- a/usr.sbin/nginx/auto/stubs +++ b/usr.sbin/nginx/auto/stubs @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. have=NGX_SUPPRESS_WARN . auto/have diff --git a/usr.sbin/nginx/auto/summary b/usr.sbin/nginx/auto/summary index 010a5be497e..f7f32a442a4 100644 --- a/usr.sbin/nginx/auto/summary +++ b/usr.sbin/nginx/auto/summary @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. ### STUB diff --git a/usr.sbin/nginx/auto/types/sizeof b/usr.sbin/nginx/auto/types/sizeof index 4d65dca16f7..e84a0905ef9 100644 --- a/usr.sbin/nginx/auto/types/sizeof +++ b/usr.sbin/nginx/auto/types/sizeof @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. echo $ngx_n "checking for $ngx_type size ...$ngx_c" diff --git a/usr.sbin/nginx/auto/types/typedef b/usr.sbin/nginx/auto/types/typedef index 884ef25d766..f121e8fc2ea 100644 --- a/usr.sbin/nginx/auto/types/typedef +++ b/usr.sbin/nginx/auto/types/typedef @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. echo $ngx_n "checking for $ngx_type ...$ngx_c" diff --git a/usr.sbin/nginx/auto/types/uintptr_t b/usr.sbin/nginx/auto/types/uintptr_t index 55024b820fe..07f7e7d7dba 100644 --- a/usr.sbin/nginx/auto/types/uintptr_t +++ b/usr.sbin/nginx/auto/types/uintptr_t @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. echo $ngx_n "checking for uintptr_t ...$ngx_c" diff --git a/usr.sbin/nginx/auto/types/value b/usr.sbin/nginx/auto/types/value index 698ba7d92af..ac88a3919ef 100644 --- a/usr.sbin/nginx/auto/types/value +++ b/usr.sbin/nginx/auto/types/value @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. cat << END >> $NGX_AUTO_CONFIG_H diff --git a/usr.sbin/nginx/auto/unix b/usr.sbin/nginx/auto/unix index 7621e8fa232..4988072f1ff 100755 --- a/usr.sbin/nginx/auto/unix +++ b/usr.sbin/nginx/auto/unix @@ -1,5 +1,6 @@ # Copyright (C) Igor Sysoev +# Copyright (C) Nginx, Inc. NGX_USER=${NGX_USER:-nobody} |