From 244bd0312012338abc73eb3cadade38923a5452a 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: Mon, 7 Mar 2011 19:40:43 +0800
Subject: [PATCH] added more tests for --with-http_postgres_module and
 --with-http_iconv_module.

---
 t/sanity.t     | 206 ++++++++++++++++++++++++++++++++++++++++++++++++-
 util/configure |   2 +-
 2 files changed, 204 insertions(+), 4 deletions(-)

diff --git a/t/sanity.t b/t/sanity.t
index 36effd7..b91cfba 100644
--- a/t/sanity.t
+++ b/t/sanity.t
@@ -349,7 +349,7 @@ clean:
 
 
 
-=== TEST 5: --with-cc-opt
+=== TEST 6: --with-cc-opt
 --- cmd: ./configure --with-luajit --with-cc-opt="-O3" --dry-run
 --- out
 cp -r bundle/ build/
@@ -406,7 +406,7 @@ clean:
 
 
 
-=== TEST 5: --with-ld-opt
+=== TEST 7: --with-ld-opt
 --- cmd: ./configure --with-luajit --with-ld-opt="-llua" --dry-run
 --- out
 cp -r bundle/ build/
@@ -463,7 +463,7 @@ clean:
 
 
 
-=== TEST 5: --without-http_drizzle_module
+=== TEST 8: --without-http_drizzle_module
 --- cmd: ./configure --with-luajit --without-http_drizzle_module --dry-run
 --- out
 cp -r bundle/ build/
@@ -508,3 +508,203 @@ install:
 clean:
 	rm -rf build
 
+
+
+=== TEST 9: --with-luajit & --without-http_lua_module
+--- cmd: ./configure --with-luajit --without-http_lua_module --dry-run
+--- out
+cp -r bundle/ build/
+cd build
+cd libdrizzle-0.8
+./configure --prefix=/usr/local/openresty/libdrizzle
+make
+make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
+export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
+export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
+cd ..
+cd LuaJIT-2.0.0-beta6
+make PREFIX=/usr/local/openresty/luajit
+make install 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.0'
+cd ..
+cd nginx-0.8.54
+./configure --prefix=/usr/local/openresty/nginx \
+  --with-cc-opt='-O2' \
+  --add-module=../echo-nginx-module-0.36rc2 \
+  --add-module=../xss-nginx-module-0.03rc2 \
+  --add-module=../ngx_devel_kit-0.2.14 \
+  --add-module=../set-misc-nginx-module-0.21rc2 \
+  --add-module=../form-input-nginx-module-0.07rc4 \
+  --add-module=../encrypted-session-nginx-module-0.01 \
+  --add-module=../drizzle-nginx-module-0.0.15rc9 \
+  --add-module=../headers-more-nginx-module-0.14 \
+  --add-module=../srcache-nginx-module-0.12rc2 \
+  --add-module=../array-var-nginx-module-0.02 \
+  --add-module=../memc-nginx-module-0.12rc1 \
+  --add-module=../upstream-keepalive-nginx-module-0.3 \
+  --add-module=../auth-request-nginx-module-0.2 \
+  --add-module=../rds-json-nginx-module-0.11rc2 \
+  --with-ld-opt='-Wl,-rpath=/usr/local/openresty/libdrizzle/lib:/usr/local/openresty/luajit/lib' \
+  --with-http_ssl_module
+cd ../..
+--- makefile
+.PHONY: all install
+
+all:
+	cd build/libdrizzle-0.8 && $(MAKE)
+	cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
+	cd build/nginx-0.8.54 && $(MAKE)
+
+install:
+	cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
+	cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
+	cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
+
+clean:
+	rm -rf build
+
+
+
+=== TEST 10: --without-http_lua_module
+--- cmd: ./configure --without-http_lua_module --dry-run
+--- out
+cp -r bundle/ build/
+cd build
+cd libdrizzle-0.8
+./configure --prefix=/usr/local/openresty/libdrizzle
+make
+make install DESTDIR=$OPENRESTY_BUILD_DIR/libdrizzle-root
+export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/lib'
+export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
+cd ..
+cd nginx-0.8.54
+./configure --prefix=/usr/local/openresty/nginx \
+  --with-cc-opt='-O2' \
+  --add-module=../echo-nginx-module-0.36rc2 \
+  --add-module=../xss-nginx-module-0.03rc2 \
+  --add-module=../ngx_devel_kit-0.2.14 \
+  --add-module=../set-misc-nginx-module-0.21rc2 \
+  --add-module=../form-input-nginx-module-0.07rc4 \
+  --add-module=../encrypted-session-nginx-module-0.01 \
+  --add-module=../drizzle-nginx-module-0.0.15rc9 \
+  --add-module=../headers-more-nginx-module-0.14 \
+  --add-module=../srcache-nginx-module-0.12rc2 \
+  --add-module=../array-var-nginx-module-0.02 \
+  --add-module=../memc-nginx-module-0.12rc1 \
+  --add-module=../upstream-keepalive-nginx-module-0.3 \
+  --add-module=../auth-request-nginx-module-0.2 \
+  --add-module=../rds-json-nginx-module-0.11rc2 \
+  --with-ld-opt='-Wl,-rpath=/usr/local/openresty/libdrizzle/lib' \
+  --with-http_ssl_module
+cd ../..
+--- makefile
+.PHONY: all install
+
+all:
+	cd build/libdrizzle-0.8 && $(MAKE)
+	cd build/nginx-0.8.54 && $(MAKE)
+
+install:
+	cd build/libdrizzle-0.8 && $(MAKE) install DESTDIR=$(DESTDIR)
+	cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
+
+clean:
+	rm -rf build
+
+
+
+=== TEST 11: --without-http_drizzle_module & --with-http_postgres_module
+--- cmd: ./configure --with-luajit --without-http_drizzle_module --with-http_postgres_module --dry-run
+--- out
+cp -r bundle/ build/
+cd build
+cd LuaJIT-2.0.0-beta6
+make PREFIX=/usr/local/openresty/luajit
+make install 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.0'
+cd ..
+cd nginx-0.8.54
+./configure --prefix=/usr/local/openresty/nginx \
+  --with-cc-opt='-O2' \
+  --add-module=../echo-nginx-module-0.36rc2 \
+  --add-module=../xss-nginx-module-0.03rc2 \
+  --add-module=../ngx_devel_kit-0.2.14 \
+  --add-module=../set-misc-nginx-module-0.21rc2 \
+  --add-module=../form-input-nginx-module-0.07rc4 \
+  --add-module=../encrypted-session-nginx-module-0.01 \
+  --add-module=../ngx_postgres-0.8 \
+  --add-module=../ngx_lua-0.1.6rc2 \
+  --add-module=../headers-more-nginx-module-0.14 \
+  --add-module=../srcache-nginx-module-0.12rc2 \
+  --add-module=../array-var-nginx-module-0.02 \
+  --add-module=../memc-nginx-module-0.12rc1 \
+  --add-module=../upstream-keepalive-nginx-module-0.3 \
+  --add-module=../auth-request-nginx-module-0.2 \
+  --add-module=../rds-json-nginx-module-0.11rc2 \
+  --with-ld-opt='-Wl,-rpath=/usr/local/openresty/luajit/lib' \
+  --with-http_ssl_module
+cd ../..
+--- makefile
+.PHONY: all install
+
+all:
+	cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
+	cd build/nginx-0.8.54 && $(MAKE)
+
+install:
+	cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
+	cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
+
+clean:
+	rm -rf build
+
+
+
+=== TEST 12: --without-http_drizzle_module & --with-http_iconv_module
+--- cmd: ./configure --with-luajit --without-http_drizzle_module --with-http_iconv_module --dry-run
+--- out
+cp -r bundle/ build/
+cd build
+cd LuaJIT-2.0.0-beta6
+make PREFIX=/usr/local/openresty/luajit
+make install 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.0'
+cd ..
+cd nginx-0.8.54
+./configure --prefix=/usr/local/openresty/nginx \
+  --with-cc-opt='-O2' \
+  --add-module=../iconv-nginx-module-0.10rc3 \
+  --add-module=../echo-nginx-module-0.36rc2 \
+  --add-module=../xss-nginx-module-0.03rc2 \
+  --add-module=../ngx_devel_kit-0.2.14 \
+  --add-module=../set-misc-nginx-module-0.21rc2 \
+  --add-module=../form-input-nginx-module-0.07rc4 \
+  --add-module=../encrypted-session-nginx-module-0.01 \
+  --add-module=../ngx_lua-0.1.6rc2 \
+  --add-module=../headers-more-nginx-module-0.14 \
+  --add-module=../srcache-nginx-module-0.12rc2 \
+  --add-module=../array-var-nginx-module-0.02 \
+  --add-module=../memc-nginx-module-0.12rc1 \
+  --add-module=../upstream-keepalive-nginx-module-0.3 \
+  --add-module=../auth-request-nginx-module-0.2 \
+  --add-module=../rds-json-nginx-module-0.11rc2 \
+  --with-ld-opt='-Wl,-rpath=/usr/local/openresty/luajit/lib' \
+  --with-http_ssl_module
+cd ../..
+--- makefile
+.PHONY: all install
+
+all:
+	cd build/LuaJIT-2.0.0-beta6 && $(MAKE) PREFIX=/usr/local/openresty/luajit
+	cd build/nginx-0.8.54 && $(MAKE)
+
+install:
+	cd build/LuaJIT-2.0.0-beta6 && $(MAKE) install PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
+	cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
+
+clean:
+	rm -rf build
+
diff --git a/util/configure b/util/configure
index 01e4294..b166edf 100755
--- a/util/configure
+++ b/util/configure
@@ -25,7 +25,7 @@ my @modules = (
     [http_form_input => 'form-input-nginx-module'],
     [http_encrypted_session => 'encrypted-session-nginx-module'],
     [http_drizzle => 'drizzle-nginx-module'],
-    [http_postgres => 'drizzle-nginx-module', 'disabled'],
+    [http_postgres => 'ngx_postgres', 'disabled'],
     [http_lua => 'ngx_lua'],
     [http_headers_more => 'headers-more-nginx-module'],
     [http_srcache => 'srcache-nginx-module'],