bugfix: updated the ./configure --help usage text output for the latest nginx version.

This commit is contained in:
Yichun Zhang (agentzh) 2020-01-02 20:58:30 -08:00
parent 29af6de924
commit 41abd0f3b5
2 changed files with 35 additions and 38 deletions

View File

@ -93,8 +93,6 @@ Options directly inherited from nginx
--error-log-path=PATH set error log pathname
--pid-path=PATH set nginx.pid pathname
--lock-path=PATH set nginx.lock pathname
--tapset-prefix=PATH set systemtap tapset directory prefix
--stap-nginx-path=PATH set stap-nginx pathname
--user=USER set non-privileged user for
worker processes
@ -112,7 +110,6 @@ Options directly inherited from nginx
--with-threads enable thread pool support
--with-file-aio enable file AIO support
--with-ipv6 enable IPv6 support
--with-http_v2_module enable ngx_http_v2_module
--with-http_realip_module enable ngx_http_realip_module
@ -226,6 +223,8 @@ Options directly inherited from nginx
--add-module=PATH enable external module
--add-dynamic-module=PATH enable dynamic external module
--with-compat dynamic modules compatibility
--with-cc=PATH set C compiler pathname
--with-cpp=PATH set C preprocessor pathname
--with-cc-opt=OPTIONS set additional C compiler options
@ -878,8 +877,6 @@ Options directly inherited from nginx
--error-log-path=PATH set error log pathname
--pid-path=PATH set nginx.pid pathname
--lock-path=PATH set nginx.lock pathname
--tapset-prefix=PATH set systemtap tapset directory prefix
--stap-nginx-path=PATH set stap-nginx pathname
--user=USER set non-privileged user for
worker processes
@ -897,7 +894,6 @@ Options directly inherited from nginx
--with-threads enable thread pool support
--with-file-aio enable file AIO support
--with-ipv6 enable IPv6 support
--with-http_v2_module enable ngx_http_v2_module
--with-http_realip_module enable ngx_http_realip_module
@ -1011,6 +1007,8 @@ Options directly inherited from nginx
--add-module=PATH enable external module
--add-dynamic-module=PATH enable dynamic external module
--with-compat dynamic modules compatibility
--with-cc=PATH set C compiler pathname
--with-cpp=PATH set C preprocessor pathname
--with-cc-opt=OPTIONS set additional C compiler options
@ -1808,43 +1806,43 @@ clean:
=== TEST 22: ngx_postgres enabled and --with-pg_config is specified
--- cmd: ./configure --with-pg_config=pg_config --with-http_postgres_module --dry-run
--- out_like
platform: linux \(linux\)
--- out
platform: linux (linux)
cp -rp bundle/ build
cd build
export LIBPQ_LIB='(/usr/lib64|/usr/lib/x86_64-linux-gnu)'
export LIBPQ_INC='(?:/usr/include|/usr/include/postgresql)'
export LIBPQ_LIB='/usr/lib64'
export LIBPQ_INC='/usr/include'
cd LuaJIT-2.1-20200102
INFO: found -msse4.2 in cc.
gmake TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit
gmake install TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit DESTDIR=\$OPENRESTY_BUILD_DIR/luajit-root/
export LUAJIT_LIB='\$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
export LUAJIT_INC='\$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1'
gmake install TARGET_STRIP=@: CCDEBUG=-g XCFLAGS='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_ENABLE_GC64 -msse4.2' CC=cc PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root/
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.1'
cd ..
patching the resty script with hard-coded nginx binary path...
cd nginx-1.17.4
sh ./configure --prefix=/usr/local/openresty/nginx \\
--with-cc-opt='-O2' \\
--add-module=../ngx_devel_kit-0.3.1rc1 \\
--add-module=../echo-nginx-module-0.62rc1 \\
--add-module=../xss-nginx-module-0.06 \\
--add-module=../ngx_coolkit-0.2 \\
--add-module=../set-misc-nginx-module-0.32 \\
--add-module=../form-input-nginx-module-0.12 \\
--add-module=../encrypted-session-nginx-module-0.08 \\
--add-module=../ngx_postgres-1.0 \\
--add-module=../srcache-nginx-module-0.32rc1 \\
--add-module=../ngx_lua-0.10.15 \\
--add-module=../ngx_lua_upstream-0.07 \\
--add-module=../headers-more-nginx-module-0.33 \\
--add-module=../array-var-nginx-module-0.05 \\
--add-module=../memc-nginx-module-0.19 \\
--add-module=../redis2-nginx-module-0.15 \\
--add-module=../redis-nginx-module-0.3.7 \\
--add-module=../rds-json-nginx-module-0.15 \\
--add-module=../rds-csv-nginx-module-0.09 \\
--add-module=../ngx_stream_lua-0.0.7 \\
--with-ld-opt='-Wl,-rpath,\1:/usr/local/openresty/luajit/lib' \\
sh ./configure --prefix=/usr/local/openresty/nginx \
--with-cc-opt='-O2' \
--add-module=../ngx_devel_kit-0.3.1rc1 \
--add-module=../echo-nginx-module-0.62rc1 \
--add-module=../xss-nginx-module-0.06 \
--add-module=../ngx_coolkit-0.2 \
--add-module=../set-misc-nginx-module-0.32 \
--add-module=../form-input-nginx-module-0.12 \
--add-module=../encrypted-session-nginx-module-0.08 \
--add-module=../ngx_postgres-1.0 \
--add-module=../srcache-nginx-module-0.32rc1 \
--add-module=../ngx_lua-0.10.15 \
--add-module=../ngx_lua_upstream-0.07 \
--add-module=../headers-more-nginx-module-0.33 \
--add-module=../array-var-nginx-module-0.05 \
--add-module=../memc-nginx-module-0.19 \
--add-module=../redis2-nginx-module-0.15 \
--add-module=../redis-nginx-module-0.3.7 \
--add-module=../rds-json-nginx-module-0.15 \
--add-module=../rds-csv-nginx-module-0.09 \
--add-module=../ngx_stream_lua-0.0.7 \
--with-ld-opt='-Wl,-rpath,/usr/lib64:/usr/local/openresty/luajit/lib' \
--with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-http_ssl_module
cd ../..
Type the following commands to build and install:

5
util/configure vendored
View File

@ -1408,8 +1408,6 @@ Options directly inherited from nginx
--error-log-path=PATH set error log pathname
--pid-path=PATH set nginx.pid pathname
--lock-path=PATH set nginx.lock pathname
--tapset-prefix=PATH set systemtap tapset directory prefix
--stap-nginx-path=PATH set stap-nginx pathname
--user=USER set non-privileged user for
worker processes
@ -1427,7 +1425,6 @@ Options directly inherited from nginx
--with-threads enable thread pool support
--with-file-aio enable file AIO support
--with-ipv6 enable IPv6 support
--with-http_v2_module enable ngx_http_v2_module
--with-http_realip_module enable ngx_http_realip_module
@ -1541,6 +1538,8 @@ Options directly inherited from nginx
--add-module=PATH enable external module
--add-dynamic-module=PATH enable dynamic external module
--with-compat dynamic modules compatibility
--with-cc=PATH set C compiler pathname
--with-cpp=PATH set C preprocessor pathname
--with-cc-opt=OPTIONS set additional C compiler options