From a3dfc21c1ae86dbc239cd3796bf44932105e13b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?=
 <agentzh@gmail.com>
Date: Wed, 10 Aug 2011 18:14:01 +0800
Subject: [PATCH] documented the --without-lua_cjson option in the ./configure
 usage output. released ngx_openresty 1.0.5.0rc2.

---
 t/sanity.t     | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-
 util/configure |  1 +
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/t/sanity.t b/t/sanity.t
index 1346046..c95e1d5 100644
--- a/t/sanity.t
+++ b/t/sanity.t
@@ -2,7 +2,7 @@
 
 use t::Config;
 
-plan tests => 120;
+plan tests => 124;
 
 #no_diff();
 
@@ -45,6 +45,7 @@ __DATA__
   --with-http_drizzle_module         enable ngx_http_drizzle_module
   --with-http_postgres_module        enable ngx_http_postgres_module
 
+  --without-lua_cjson                disable the lua-cjson library
   --without-lua51                    disable the bundled Lua 5.1 interpreter
   --with-luajit                      enable LuaJIT 2.0
   --with-libdrizzle=DIR              specify the libdrizzle 1.0 (or drizzle) installation prefix
@@ -636,6 +637,7 @@ clean:
   --with-http_drizzle_module         enable ngx_http_drizzle_module
   --with-http_postgres_module        enable ngx_http_postgres_module
 
+  --without-lua_cjson                disable the lua-cjson library
   --without-lua51                    disable the bundled Lua 5.1 interpreter
   --with-luajit                      enable LuaJIT 2.0
   --with-libdrizzle=DIR              specify the libdrizzle 1.0 (or drizzle) installation prefix
@@ -1680,3 +1682,53 @@ install:
 clean:
 	rm -rf build
 
+
+
+=== TEST 33: --without-lua_cjson
+--- cmd: ./configure --dry-run --without-lua_cjson
+--- out
+platform: linux (linux)
+cp -rp bundle/ build/
+cd build
+cd lua-5.1.4
+gmake linux
+gmake install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua
+export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib'
+export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
+cd ..
+cd nginx-1.0.5
+./configure --prefix=/usr/local/openresty/nginx \
+  --add-module=../ngx_devel_kit-0.2.17 \
+  --add-module=../echo-nginx-module-0.37rc1 \
+  --add-module=../xss-nginx-module-0.03rc3 \
+  --add-module=../set-misc-nginx-module-0.22rc2 \
+  --add-module=../form-input-nginx-module-0.07rc5 \
+  --add-module=../encrypted-session-nginx-module-0.01 \
+  --add-module=../ngx_lua-0.2.1rc4 \
+  --add-module=../headers-more-nginx-module-0.15 \
+  --add-module=../srcache-nginx-module-0.12 \
+  --add-module=../array-var-nginx-module-0.03rc1 \
+  --add-module=../memc-nginx-module-0.12 \
+  --add-module=../redis2-nginx-module-0.07 \
+  --add-module=../upstream-keepalive-nginx-module-0.3 \
+  --add-module=../auth-request-nginx-module-0.2 \
+  --add-module=../rds-json-nginx-module-0.12rc1 \
+  --with-http_ssl_module
+cd ../..
+Type the following commands to build and install:
+    gmake
+    gmake install
+--- makefile
+.PHONY: all install clean
+
+all:
+	cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) linux
+	cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE)
+
+install:
+	cd $OPENRESTY_BUILD_DIR/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
+	cd $OPENRESTY_BUILD_DIR/nginx-1.0.5 && $(MAKE) install DESTDIR=$(DESTDIR)
+
+clean:
+	rm -rf build
+
diff --git a/util/configure b/util/configure
index c66a1f9..8de4d90 100755
--- a/util/configure
+++ b/util/configure
@@ -675,6 +675,7 @@ _EOC_
 
     $msg .= <<'_EOC_';
 
+  --without-lua_cjson                disable the lua-cjson library
   --without-lua51                    disable the bundled Lua 5.1 interpreter
   --with-luajit                      enable LuaJIT 2.0
   --with-libdrizzle=DIR              specify the libdrizzle 1.0 (or drizzle) installation prefix