Configure: the --build= option.

If set, its value is output in "nginx -v" and in the error log.

diff --git a/auto/configure b/auto/configure
index d7d8189af93f5f623f3ee87b671b089d8ae383ad..e8929b8f0b486cd19dae593967841618557aa54a 100755 (executable)
--- a/auto/configure
+++ b/auto/configure
@@ -108,4 +108,8 @@ have=NGX_HTTP_SCGI_TEMP_PATH value="\"$NGX_HTTP_SCGI_TEMP_PATH\""
 have=NGX_USER value="\"$NGX_USER\"" . auto/define
 have=NGX_GROUP value="\"$NGX_GROUP\"" . auto/define
 
+if [ ".$NGX_BUILD" != "." ]; then
+    have=NGX_BUILD value="\"$NGX_BUILD\"" . auto/define
+fi
+
 . auto/summary

diff --git a/auto/options b/auto/options
index 6cea8c7c20002ad6746dcddf698abce481eb561e..010a6bbe27081a2f2602e91b8ee8a2a97924edfd 100644 (file)
--- a/auto/options
+++ b/auto/options
@@ -14,6 +14,7 @@ NGX_PID_PATH=
 NGX_LOCK_PATH=
 NGX_USER=
 NGX_GROUP=
+NGX_BUILD=
 
 CC=${CC:-cc}
 CPP=
@@ -178,6 +179,7 @@ do
 
         --crossbuild=*)                  NGX_PLATFORM="$value"      ;;
 
+        --build=*)                       NGX_BUILD="$value"         ;;
         --builddir=*)                    NGX_OBJS="$value"          ;;
 
         --with-rtsig_module)             EVENT_RTSIG=YES            ;;
@@ -341,6 +343,7 @@ cat << END
   --group=GROUP                      set non-privileged group for
                                      worker processes
 
+  --build=NAME                       set build name
   --builddir=DIR                     set build directory
 
   --with-rtsig_module                enable rtsig module

diff --git a/src/core/nginx.c b/src/core/nginx.c
index 4cc80826edcb38a2487c914e9fe16a49c266d796..c75ee4fd71c3204988263cf5186c70d200055b89 100644 (file)
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -217,7 +217,7 @@ main(int argc, char *const *argv)
     }
 
     if (ngx_show_version) {
-        ngx_write_stderr("nginx version: " NGINX_VER NGX_LINEFEED);
+        ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED);
 
         if (ngx_show_help) {
             ngx_write_stderr(

diff --git a/src/core/nginx.h b/src/core/nginx.h
index 8c7800abe1966f694bea0132488ce040eda2e70f..12e6e8a862b1bb27a93df12392ba055da353ffb3 100644 (file)
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -13,6 +13,12 @@
 #define NGINX_VERSION      "1.7.1"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
+#ifdef NGX_BUILD
+#define NGINX_VER_BUILD    NGINX_VER " (" NGX_BUILD ")"
+#else
+#define NGINX_VER_BUILD    NGINX_VER
+#endif
+
 #define NGINX_VAR          "NGINX"
 #define NGX_OLDPID_EXT     ".oldbin"
 

diff --git a/src/os/unix/ngx_posix_init.c b/src/os/unix/ngx_posix_init.c
index 58e6f76143bff3bfd28fec20c6459015d49f29e8..9a4de022d6d949a57e508693af95093d34225bd1 100644 (file)
--- a/src/os/unix/ngx_posix_init.c
+++ b/src/os/unix/ngx_posix_init.c
@@ -82,7 +82,7 @@ ngx_os_init(ngx_log_t *log)
 void
 ngx_os_status(ngx_log_t *log)
 {
-    ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER);
+    ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER_BUILD);
 
 #ifdef NGX_COMPILER
     ngx_log_error(NGX_LOG_NOTICE, log, 0, "built by " NGX_COMPILER);

diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c
index f7153fcc418be77a5f5589b1ea05979cb5ada88b..6fa1a57e52339445d68ecd7b5e59dd3fdbbea1be 100644 (file)
--- a/src/os/win32/ngx_win32_init.c
+++ b/src/os/win32/ngx_win32_init.c
@@ -247,7 +247,7 @@ ngx_os_status(ngx_log_t *log)
 {
     ngx_osviex_stub_t  *osviex_stub;
 
-    ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER);
+    ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER_BUILD);
 
     if (osviex) {