nginx: auto/options comparison

comparison auto/options @ 6383:85dea406e18f

Dynamic modules. The auto/module script is extended to understand ngx_module_link=DYNAMIC. When set, it links the module as a shared object rather than statically into nginx binary. The module can later be loaded using the "load_module" directive. New auto/module parameter ngx_module_order allows to define module loading order in complex cases. By default the order is set based on ngx_module_type. 3rd party modules can be compiled dynamically using the --add-dynamic-module configure option, which will preset ngx_module_link to "DYNAMIC" before calling the module config script. Win32 support is rudimentary, and only works when using MinGW gcc (which is able to handle exports/imports automatically). In collaboration with Ruslan Ermilov.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Thu, 04 Feb 2016 20:25:29 +0300
parents	29f35e60840b
children	39a806ccf21e

comparison

equal deleted inserted replaced

-:392959224560
+:85dea406e18f
 help=no
 NGX_PREFIX=
 NGX_SBIN_PATH=
+NGX_MODULES_PATH=
 NGX_CONF_PREFIX=
 NGX_CONF_PATH=
 NGX_ERROR_LOG_PATH=
 NGX_PID_PATH=
 NGX_LOCK_PATH=
 STREAM_ACCESS=YES
 STREAM_UPSTREAM_HASH=YES
 STREAM_UPSTREAM_LEAST_CONN=YES
 STREAM_UPSTREAM_ZONE=YES
+DYNAMIC_MODULES=
 NGX_ADDONS=
+NGX_ADDON_DEPS=
+DYNAMIC_ADDONS=
 USE_PCRE=NO
 PCRE=NONE
 PCRE_OPT=
 PCRE_CONF_OPT=
 USE_PERL=NO
 NGX_PERL=perl
 USE_LIBXSLT=NO
 USE_LIBGD=NO
+USE_GEOIP=NO
 NGX_GOOGLE_PERFTOOLS=NO
 NGX_CPP_TEST=NO
 NGX_LIBATOMIC=NO
 --help)                          help=yes                   ;;
 --prefix=)                       NGX_PREFIX="!"             ;;
 --prefix=*)                      NGX_PREFIX="$value"        ;;
 --sbin-path=*)                   NGX_SBIN_PATH="$value"     ;;
+--modules-path=*)                NGX_MODULES_PATH="$value"  ;;
 --conf-path=*)                   NGX_CONF_PATH="$value"     ;;
 --error-log-path=*)              NGX_ERROR_LOG_PATH="$value";;
 --pid-path=*)                    NGX_PID_PATH="$value"      ;;
 --lock-path=*)                   NGX_LOCK_PATH="$value"     ;;
 --user=*)                        NGX_USER="$value"          ;;
 --with-http_ssl_module)          HTTP_SSL=YES               ;;
 --with-http_v2_module)           HTTP_V2=YES                ;;
 --with-http_realip_module)       HTTP_REALIP=YES            ;;
 --with-http_addition_module)     HTTP_ADDITION=YES          ;;
 --with-http_xslt_module)         HTTP_XSLT=YES              ;;
+--with-http_xslt_module=dynamic) HTTP_XSLT=DYNAMIC          ;;
 --with-http_image_filter_module) HTTP_IMAGE_FILTER=YES      ;;
+--with-http_image_filter_module=dynamic)
+HTTP_IMAGE_FILTER=DYNAMIC  ;;
 --with-http_geoip_module)        HTTP_GEOIP=YES             ;;
+--with-http_geoip_module=dynamic)
+HTTP_GEOIP=DYNAMIC         ;;
 --with-http_sub_module)          HTTP_SUB=YES               ;;
 --with-http_dav_module)          HTTP_DAV=YES               ;;
 --with-http_flv_module)          HTTP_FLV=YES               ;;
 --with-http_mp4_module)          HTTP_MP4=YES               ;;
 --with-http_gunzip_module)       HTTP_GUNZIP=YES            ;;
 # STUB
 --with-http_stub_status_module)  HTTP_STUB_STATUS=YES       ;;
 --with-mail)                     MAIL=YES                   ;;
+--with-mail=dynamic)             MAIL=DYNAMIC               ;;
 --with-mail_ssl_module)          MAIL_SSL=YES               ;;
 # STUB
 --with-imap)
 MAIL=YES
 NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
 --without-mail_pop3_module)      MAIL_POP3=NO               ;;
 --without-mail_imap_module)      MAIL_IMAP=NO               ;;
 --without-mail_smtp_module)      MAIL_SMTP=NO               ;;
 --with-stream)                   STREAM=YES                 ;;
+--with-stream=dynamic)           STREAM=DYNAMIC             ;;
 --with-stream_ssl_module)        STREAM_SSL=YES             ;;
 --without-stream_limit_conn_module)
 STREAM_LIMIT_CONN=NO       ;;
 --without-stream_access_module)  STREAM_ACCESS=NO           ;;
 --without-stream_upstream_hash_module)
 --with-google_perftools_module)  NGX_GOOGLE_PERFTOOLS=YES   ;;
 --with-cpp_test_module)          NGX_CPP_TEST=YES           ;;
 --add-module=*)                  NGX_ADDONS="$NGX_ADDONS $value" ;;
+--add-dynamic-module=*)          DYNAMIC_ADDONS="$DYNAMIC_ADDONS $value" ;;
 --with-cc=*)                     CC="$value"                ;;
 --with-cpp=*)                    CPP="$value"               ;;
 --with-cc-opt=*)                 NGX_CC_OPT="$value"        ;;
 --with-ld-opt=*)                 NGX_LD_OPT="$value"        ;;
 --help                             print this message
 --prefix=PATH                      set installation prefix
 --sbin-path=PATH                   set nginx binary pathname
+--modules-path=PATH                set modules path
 --conf-path=PATH                   set nginx.conf pathname
 --error-log-path=PATH              set error log pathname
 --pid-path=PATH                    set nginx.pid pathname
 --lock-path=PATH                   set nginx.lock pathname
 --with-http_ssl_module             enable ngx_http_ssl_module
 --with-http_v2_module              enable ngx_http_v2_module
 --with-http_realip_module          enable ngx_http_realip_module
 --with-http_addition_module        enable ngx_http_addition_module
 --with-http_xslt_module            enable ngx_http_xslt_module
+--with-http_xslt_module=dynamic    enable dynamic ngx_http_xslt_module
 --with-http_image_filter_module    enable ngx_http_image_filter_module
+--with-http_image_filter_module=dynamic
+enable dynamic ngx_http_image_filter_module
 --with-http_geoip_module           enable ngx_http_geoip_module
+--with-http_geoip_module=dynamic   enable dynamic ngx_http_geoip_module
 --with-http_sub_module             enable ngx_http_sub_module
 --with-http_dav_module             enable ngx_http_dav_module
 --with-http_flv_module             enable ngx_http_flv_module
 --with-http_mp4_module             enable ngx_http_mp4_module
 --with-http_gunzip_module          enable ngx_http_gunzip_module
 --without-http                     disable HTTP server
 --without-http-cache               disable HTTP cache
 --with-mail                        enable POP3/IMAP4/SMTP proxy module
+--with-mail=dynamic                enable dynamic POP3/IMAP4/SMTP proxy module
 --with-mail_ssl_module             enable ngx_mail_ssl_module
 --without-mail_pop3_module         disable ngx_mail_pop3_module
 --without-mail_imap_module         disable ngx_mail_imap_module
 --without-mail_smtp_module         disable ngx_mail_smtp_module
 --with-stream                      enable TCP proxy module
+--with-stream=dynamic              enable dynamic TCP proxy module
 --with-stream_ssl_module           enable ngx_stream_ssl_module
 --without-stream_limit_conn_module disable ngx_stream_limit_conn_module
 --without-stream_access_module     disable ngx_stream_access_module
 --without-stream_upstream_hash_module
 disable ngx_stream_upstream_hash_module
 disable ngx_stream_upstream_zone_module
 --with-google_perftools_module     enable ngx_google_perftools_module
 --with-cpp_test_module             enable ngx_cpp_test_module
---add-module=PATH                  enable an external module
+--add-module=PATH                  enable external module
+--add-dynamic-module=PATH          enable dynamic external module
 --with-cc=PATH                     set C compiler pathname
 --with-cpp=PATH                    set C preprocessor pathname
 --with-cc-opt=OPTIONS              set additional C compiler options
 --with-ld-opt=OPTIONS              set additional linker options
 NGX_WINE=$WINE
 fi
 NGX_SBIN_PATH=${NGX_SBIN_PATH:-sbin/nginx}
+NGX_MODULES_PATH=${NGX_MODULES_PATH:-modules}
 NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf}
 NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
 NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid}
 NGX_LOCK_PATH=${NGX_LOCK_PATH:-logs/nginx.lock}

Mercurial > hg > nginx

comparison auto/options @ 6383:85dea406e18f