Skip to content

Commit da11207

Browse files
agentzhagentzh
committed
added the --with-libpq=DIR option to the ./configure script. also released ngx_openresty 1.0.4.2rc4.
1 parent 5c20832 commit da11207

File tree

4 files changed

+177
-42
lines changed

4 files changed

+177
-42
lines changed

‎t/sanity.t‎

Lines changed: 152 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use t::Config;
44

5-
plan tests => 4 * blocks() - 4;
5+
plan tests => 83;
66

77
#no_diff();
88

@@ -44,7 +44,8 @@ __DATA__
4444
4545
--without-lua51 disable the bundled Lua 5.1 interpreter
4646
--with-luajit enable LuaJIT 2.0
47-
--with-libdrizzle=DIR specify the libdrizzle 1.0 installation prefix
47+
--with-libdrizzle=DIR specify the libdrizzle 1.0 (or drizzle) installation prefix
48+
--with-libpq=DIR specify the libpq (or postgresql) installation prefix
4849
4950
Options directly inherited from nginx
5051
@@ -187,10 +188,10 @@ export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
187188
cd ..
188189
cd nginx-1.0.4
189190
./configure --prefix=/usr/local/openresty/nginx \
191+
--add-module=../ngx_devel_kit-0.2.17 \
190192
--add-module=../echo-nginx-module-0.37rc1 \
191193
--add-module=../xss-nginx-module-0.03rc3 \
192-
--add-module=../ngx_devel_kit-0.2.17 \
193-
--add-module=../set-misc-nginx-module-0.22rc1 \
194+
--add-module=../set-misc-nginx-module-0.22rc2 \
194195
--add-module=../form-input-nginx-module-0.07rc5 \
195196
--add-module=../encrypted-session-nginx-module-0.01 \
196197
--add-module=../ngx_lua-0.2.1rc2 \
@@ -236,10 +237,10 @@ cd nginx-1.0.4
236237
./configure --prefix=/usr/local/openresty/nginx \
237238
--with-debug \
238239
--with-cc-opt='-O0' \
240+
--add-module=../ngx_devel_kit-0.2.17 \
239241
--add-module=../echo-nginx-module-0.37rc1 \
240242
--add-module=../xss-nginx-module-0.03rc3 \
241-
--add-module=../ngx_devel_kit-0.2.17 \
242-
--add-module=../set-misc-nginx-module-0.22rc1 \
243+
--add-module=../set-misc-nginx-module-0.22rc2 \
243244
--add-module=../form-input-nginx-module-0.07rc5 \
244245
--add-module=../encrypted-session-nginx-module-0.01 \
245246
--add-module=../ngx_lua-0.2.1rc2 \
@@ -293,10 +294,10 @@ export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/i
293294
cd ..
294295
cd nginx-1.0.4
295296
./configure --prefix=/usr/local/openresty/nginx \
297+
--add-module=../ngx_devel_kit-0.2.17 \
296298
--add-module=../echo-nginx-module-0.37rc1 \
297299
--add-module=../xss-nginx-module-0.03rc3 \
298-
--add-module=../ngx_devel_kit-0.2.17 \
299-
--add-module=../set-misc-nginx-module-0.22rc1 \
300+
--add-module=../set-misc-nginx-module-0.22rc2 \
300301
--add-module=../form-input-nginx-module-0.07rc5 \
301302
--add-module=../encrypted-session-nginx-module-0.01 \
302303
--add-module=../ngx_lua-0.2.1rc2 \
@@ -342,10 +343,10 @@ cd ..
342343
cd nginx-1.0.4
343344
./configure --prefix=/usr/local/openresty/nginx \
344345
--with-cc-opt='-O3' \
346+
--add-module=../ngx_devel_kit-0.2.17 \
345347
--add-module=../echo-nginx-module-0.37rc1 \
346348
--add-module=../xss-nginx-module-0.03rc3 \
347-
--add-module=../ngx_devel_kit-0.2.17 \
348-
--add-module=../set-misc-nginx-module-0.22rc1 \
349+
--add-module=../set-misc-nginx-module-0.22rc2 \
349350
--add-module=../form-input-nginx-module-0.07rc5 \
350351
--add-module=../encrypted-session-nginx-module-0.01 \
351352
--add-module=../ngx_lua-0.2.1rc2 \
@@ -390,10 +391,10 @@ export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/i
390391
cd ..
391392
cd nginx-1.0.4
392393
./configure --prefix=/usr/local/openresty/nginx \
394+
--add-module=../ngx_devel_kit-0.2.17 \
393395
--add-module=../echo-nginx-module-0.37rc1 \
394396
--add-module=../xss-nginx-module-0.03rc3 \
395-
--add-module=../ngx_devel_kit-0.2.17 \
396-
--add-module=../set-misc-nginx-module-0.22rc1 \
397+
--add-module=../set-misc-nginx-module-0.22rc2 \
397398
--add-module=../form-input-nginx-module-0.07rc5 \
398399
--add-module=../encrypted-session-nginx-module-0.01 \
399400
--add-module=../ngx_lua-0.2.1rc2 \
@@ -438,10 +439,10 @@ export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/i
438439
cd ..
439440
cd nginx-1.0.4
440441
./configure --prefix=/usr/local/openresty/nginx \
442+
--add-module=../ngx_devel_kit-0.2.17 \
441443
--add-module=../echo-nginx-module-0.37rc1 \
442444
--add-module=../xss-nginx-module-0.03rc3 \
443-
--add-module=../ngx_devel_kit-0.2.17 \
444-
--add-module=../set-misc-nginx-module-0.22rc1 \
445+
--add-module=../set-misc-nginx-module-0.22rc2 \
445446
--add-module=../form-input-nginx-module-0.07rc5 \
446447
--add-module=../encrypted-session-nginx-module-0.01 \
447448
--add-module=../headers-more-nginx-module-0.15 \
@@ -479,10 +480,10 @@ cp -rp bundle/ build/
479480
cd build
480481
cd nginx-1.0.4
481482
./configure --prefix=/usr/local/openresty/nginx \
483+
--add-module=../ngx_devel_kit-0.2.17 \
482484
--add-module=../echo-nginx-module-0.37rc1 \
483485
--add-module=../xss-nginx-module-0.03rc3 \
484-
--add-module=../ngx_devel_kit-0.2.17 \
485-
--add-module=../set-misc-nginx-module-0.22rc1 \
486+
--add-module=../set-misc-nginx-module-0.22rc2 \
486487
--add-module=../form-input-nginx-module-0.07rc5 \
487488
--add-module=../encrypted-session-nginx-module-0.01 \
488489
--add-module=../headers-more-nginx-module-0.15 \
@@ -523,10 +524,10 @@ export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/opt/blah/lua/include'
523524
cd ..
524525
cd nginx-1.0.4
525526
./configure --prefix=/opt/blah/nginx \
527+
--add-module=../ngx_devel_kit-0.2.17 \
526528
--add-module=../echo-nginx-module-0.37rc1 \
527529
--add-module=../xss-nginx-module-0.03rc3 \
528-
--add-module=../ngx_devel_kit-0.2.17 \
529-
--add-module=../set-misc-nginx-module-0.22rc1 \
530+
--add-module=../set-misc-nginx-module-0.22rc2 \
530531
--add-module=../form-input-nginx-module-0.07rc5 \
531532
--add-module=../encrypted-session-nginx-module-0.01 \
532533
--add-module=../ngx_lua-0.2.1rc2 \
@@ -590,7 +591,8 @@ clean:
590591
591592
--without-lua51 disable the bundled Lua 5.1 interpreter
592593
--with-luajit enable LuaJIT 2.0
593-
--with-libdrizzle=DIR specify the libdrizzle 1.0 installation prefix
594+
--with-libdrizzle=DIR specify the libdrizzle 1.0 (or drizzle) installation prefix
595+
--with-libpq=DIR specify the libpq (or postgresql) installation prefix
594596
595597
Options directly inherited from nginx
596598
@@ -733,10 +735,10 @@ export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
733735
cd ..
734736
cd nginx-1.0.4
735737
./configure --prefix=/usr/local/openresty/nginx \
738+
--add-module=../ngx_devel_kit-0.2.17 \
736739
--add-module=../echo-nginx-module-0.37rc1 \
737740
--add-module=../xss-nginx-module-0.03rc3 \
738-
--add-module=../ngx_devel_kit-0.2.17 \
739-
--add-module=../set-misc-nginx-module-0.22rc1 \
741+
--add-module=../set-misc-nginx-module-0.22rc2 \
740742
--add-module=../form-input-nginx-module-0.07rc5 \
741743
--add-module=../encrypted-session-nginx-module-0.01 \
742744
--add-module=../ngx_lua-0.2.1rc2 \
@@ -780,13 +782,13 @@ export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
780782
cd ..
781783
cd nginx-1.0.4
782784
./configure --prefix=/usr/local/openresty/nginx \
785+
--add-module=../ngx_devel_kit-0.2.17 \
783786
--add-module=../echo-nginx-module-0.37rc1 \
784787
--add-module=../xss-nginx-module-0.03rc3 \
785-
--add-module=../ngx_devel_kit-0.2.17 \
786-
--add-module=../set-misc-nginx-module-0.22rc1 \
788+
--add-module=../set-misc-nginx-module-0.22rc2 \
787789
--add-module=../form-input-nginx-module-0.07rc5 \
788790
--add-module=../encrypted-session-nginx-module-0.01 \
789-
--add-module=../drizzle-nginx-module-0.1.1rc2 \
791+
--add-module=../drizzle-nginx-module-0.1.1rc3 \
790792
--add-module=../ngx_lua-0.2.1rc2 \
791793
--add-module=../headers-more-nginx-module-0.15 \
792794
--add-module=../srcache-nginx-module-0.12 \
@@ -828,13 +830,13 @@ export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
828830
cd ..
829831
cd nginx-1.0.4
830832
./configure --prefix=/usr/local/openresty/nginx \
833+
--add-module=../ngx_devel_kit-0.2.17 \
831834
--add-module=../echo-nginx-module-0.37rc1 \
832835
--add-module=../xss-nginx-module-0.03rc3 \
833-
--add-module=../ngx_devel_kit-0.2.17 \
834-
--add-module=../set-misc-nginx-module-0.22rc1 \
836+
--add-module=../set-misc-nginx-module-0.22rc2 \
835837
--add-module=../form-input-nginx-module-0.07rc5 \
836838
--add-module=../encrypted-session-nginx-module-0.01 \
837-
--add-module=../drizzle-nginx-module-0.1.1rc2 \
839+
--add-module=../drizzle-nginx-module-0.1.1rc3 \
838840
--add-module=../ngx_lua-0.2.1rc2 \
839841
--add-module=../headers-more-nginx-module-0.15 \
840842
--add-module=../srcache-nginx-module-0.12 \
@@ -882,19 +884,19 @@ export LIBDRIZZLE_LIB='/opt/drizzle/lib'
882884
export LIBDRIZZLE_INC='/opt/drizzle/include/libdrizzle-1.0'
883885
cd lua-5.1.4
884886
make linux
885-
make install INSTALL_TOP=/home/agentz/git/ngx_openresty/ngx_openresty-1.0.4.1/build/lua-root/usr/local/openresty/lua
886-
export LUA_LIB='/home/agentz/git/ngx_openresty/ngx_openresty-1.0.4.1/build/lua-root/usr/local/openresty/lua/lib'
887-
export LUA_INC='/home/agentz/git/ngx_openresty/ngx_openresty-1.0.4.1/build/lua-root/usr/local/openresty/lua/include'
887+
make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua
888+
export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib'
889+
export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
888890
cd ..
889891
cd nginx-1.0.4
890892
./configure --prefix=/usr/local/openresty/nginx \
893+
--add-module=../ngx_devel_kit-0.2.17 \
891894
--add-module=../echo-nginx-module-0.37rc1 \
892895
--add-module=../xss-nginx-module-0.03rc3 \
893-
--add-module=../ngx_devel_kit-0.2.17 \
894-
--add-module=../set-misc-nginx-module-0.22rc1 \
896+
--add-module=../set-misc-nginx-module-0.22rc2 \
895897
--add-module=../form-input-nginx-module-0.07rc5 \
896898
--add-module=../encrypted-session-nginx-module-0.01 \
897-
--add-module=../drizzle-nginx-module-0.1.1rc2 \
899+
--add-module=../drizzle-nginx-module-0.1.1rc3 \
898900
--add-module=../ngx_lua-0.2.1rc2 \
899901
--add-module=../headers-more-nginx-module-0.15 \
900902
--add-module=../srcache-nginx-module-0.12 \
@@ -938,10 +940,10 @@ export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
938940
cd ..
939941
cd nginx-1.0.4
940942
./configure --prefix=/usr/local/openresty/nginx \
943+
--add-module=../ngx_devel_kit-0.2.17 \
941944
--add-module=../echo-nginx-module-0.37rc1 \
942945
--add-module=../xss-nginx-module-0.03rc3 \
943-
--add-module=../ngx_devel_kit-0.2.17 \
944-
--add-module=../set-misc-nginx-module-0.22rc1 \
946+
--add-module=../set-misc-nginx-module-0.22rc2 \
945947
--add-module=../form-input-nginx-module-0.07rc5 \
946948
--add-module=../encrypted-session-nginx-module-0.01 \
947949
--add-module=../ngx_lua-0.2.1rc2 \
@@ -987,10 +989,10 @@ cd nginx-1.0.4
987989
./configure --prefix=/usr/local/openresty/nginx \
988990
--with-debug \
989991
--with-cc-opt='-O0' \
992+
--add-module=../ngx_devel_kit-0.2.17 \
990993
--add-module=../echo-nginx-module-0.37rc1 \
991994
--add-module=../xss-nginx-module-0.03rc3 \
992-
--add-module=../ngx_devel_kit-0.2.17 \
993-
--add-module=../set-misc-nginx-module-0.22rc1 \
995+
--add-module=../set-misc-nginx-module-0.22rc2 \
994996
--add-module=../form-input-nginx-module-0.07rc5 \
995997
--add-module=../encrypted-session-nginx-module-0.01 \
996998
--add-module=../ngx_lua-0.2.1rc2 \
@@ -1037,10 +1039,10 @@ cd nginx-1.0.4
10371039
./configure --prefix=/usr/local/openresty/nginx \
10381040
--with-debug \
10391041
--with-cc-opt='-O0' \
1042+
--add-module=../ngx_devel_kit-0.2.17 \
10401043
--add-module=../echo-nginx-module-0.37rc1 \
10411044
--add-module=../xss-nginx-module-0.03rc3 \
1042-
--add-module=../ngx_devel_kit-0.2.17 \
1043-
--add-module=../set-misc-nginx-module-0.22rc1 \
1045+
--add-module=../set-misc-nginx-module-0.22rc2 \
10441046
--add-module=../form-input-nginx-module-0.07rc5 \
10451047
--add-module=../encrypted-session-nginx-module-0.01 \
10461048
--add-module=../ngx_lua-0.2.1rc2 \
@@ -1069,3 +1071,114 @@ install:
10691071
clean:
10701072
rm -rf build
10711073
1074+
1075+
1076+
=== TEST 20: ngx_postgres not enabled but specify --with-libpq
1077+
--- cmd: ./configure --with-libpq=/opt/postgres --dry-run
1078+
--- out
1079+
platform: linux (linux)
1080+
--- err
1081+
The http_postgres_module is not enabled while --with-libpq is specified.
1082+
--- exit: 255
1083+
1084+
1085+
1086+
=== TEST 21: ngx_postgres enabled and --with-libpq is specified
1087+
--- cmd: ./configure --with-libpq=/opt/postgres --with-http_postgres_module --dry-run
1088+
--- out
1089+
platform: linux (linux)
1090+
cp -rp bundle/ build/
1091+
cd build
1092+
export LIBPQ_LIB='/opt/postgres/lib'
1093+
export LIBPQ_INC='/opt/postgres/include'
1094+
cd lua-5.1.4
1095+
make linux
1096+
make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua
1097+
export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib'
1098+
export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
1099+
cd ..
1100+
cd nginx-1.0.4
1101+
./configure --prefix=/usr/local/openresty/nginx \
1102+
--add-module=../ngx_devel_kit-0.2.17 \
1103+
--add-module=../echo-nginx-module-0.37rc1 \
1104+
--add-module=../xss-nginx-module-0.03rc3 \
1105+
--add-module=../set-misc-nginx-module-0.22rc2 \
1106+
--add-module=../form-input-nginx-module-0.07rc5 \
1107+
--add-module=../encrypted-session-nginx-module-0.01 \
1108+
--add-module=../ngx_postgres-0.9rc1 \
1109+
--add-module=../ngx_lua-0.2.1rc2 \
1110+
--add-module=../headers-more-nginx-module-0.15 \
1111+
--add-module=../srcache-nginx-module-0.12 \
1112+
--add-module=../array-var-nginx-module-0.03rc1 \
1113+
--add-module=../memc-nginx-module-0.12 \
1114+
--add-module=../redis2-nginx-module-0.07 \
1115+
--add-module=../upstream-keepalive-nginx-module-0.3 \
1116+
--add-module=../auth-request-nginx-module-0.2 \
1117+
--add-module=../rds-json-nginx-module-0.12rc1 \
1118+
--with-ld-opt='-Wl,-rpath,/opt/postgres/lib' \
1119+
--with-http_ssl_module
1120+
cd ../..
1121+
--- err
1122+
--- makefile
1123+
.PHONY: all install clean
1124+
1125+
all:
1126+
cd build/lua-5.1.4 && $(MAKE) linux
1127+
cd build/nginx-1.0.4 && $(MAKE)
1128+
1129+
install:
1130+
cd build/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
1131+
cd build/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
1132+
1133+
clean:
1134+
rm -rf build
1135+
1136+
1137+
1138+
=== TEST 22: with iconv
1139+
--- cmd: ./configure --with-http_iconv_module --dry-run
1140+
--- out
1141+
platform: linux (linux)
1142+
cp -rp bundle/ build/
1143+
cd build
1144+
cd lua-5.1.4
1145+
make linux
1146+
make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua
1147+
export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib'
1148+
export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
1149+
cd ..
1150+
cd nginx-1.0.4
1151+
./configure --prefix=/usr/local/openresty/nginx \
1152+
--add-module=../ngx_devel_kit-0.2.17 \
1153+
--add-module=../iconv-nginx-module-0.10rc4 \
1154+
--add-module=../echo-nginx-module-0.37rc1 \
1155+
--add-module=../xss-nginx-module-0.03rc3 \
1156+
--add-module=../set-misc-nginx-module-0.22rc2 \
1157+
--add-module=../form-input-nginx-module-0.07rc5 \
1158+
--add-module=../encrypted-session-nginx-module-0.01 \
1159+
--add-module=../ngx_lua-0.2.1rc2 \
1160+
--add-module=../headers-more-nginx-module-0.15 \
1161+
--add-module=../srcache-nginx-module-0.12 \
1162+
--add-module=../array-var-nginx-module-0.03rc1 \
1163+
--add-module=../memc-nginx-module-0.12 \
1164+
--add-module=../redis2-nginx-module-0.07 \
1165+
--add-module=../upstream-keepalive-nginx-module-0.3 \
1166+
--add-module=../auth-request-nginx-module-0.2 \
1167+
--add-module=../rds-json-nginx-module-0.12rc1 \
1168+
--with-http_ssl_module
1169+
cd ../..
1170+
--- makefile
1171+
.PHONY: all install clean
1172+
1173+
all:
1174+
cd build/lua-5.1.4 && $(MAKE) linux
1175+
cd build/nginx-1.0.4 && $(MAKE)
1176+
1177+
install:
1178+
cd build/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
1179+
cd build/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
1180+
1181+
clean:
1182+
rm -rf build
1183+
1184+

0 commit comments

Comments
 (0)