util/dist-check: enabled ngx_iconv in the test build.

This commit is contained in:
agentzh (Yichun Zhang) 2013-04-16 17:30:28 -07:00
parent 977c5b1d51
commit 09598a3e19
1 changed files with 4 additions and 3 deletions

View File

@ -29,12 +29,13 @@ if ($^O eq 'freebsd' || $^O eq 'solaris') {
$make = 'make'; $make = 'make';
} }
my $cfg_opts = "--with-http_iconv_module";
my $prefix; my $prefix;
warn "=== Normal Build ===\n"; warn "=== Normal Build ===\n";
$prefix = "/usr/local/openresty"; $prefix = "/usr/local/openresty";
unless ($opts{f}) { unless ($opts{f}) {
sh "./configure --with-luajit -j$jobs > /dev/null"; sh "./configure --with-luajit $cfg_opts -j$jobs > /dev/null";
} }
sh "$make -j$jobs > /dev/null"; sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null"; sh "sudo $make install > /dev/null";
@ -48,7 +49,7 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop";
warn "\n=== Debug Build ===\n"; warn "\n=== Debug Build ===\n";
$prefix = "/usr/local/openresty-debug"; $prefix = "/usr/local/openresty-debug";
unless ($opts{f}) { unless ($opts{f}) {
sh "./configure --with-debug --prefix=$prefix --with-luajit -j$jobs > /dev/null"; sh "./configure --with-debug $cfg_opts --prefix=$prefix --with-luajit -j$jobs > /dev/null";
} }
sh "$make -j$jobs > /dev/null"; sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null"; sh "sudo $make install > /dev/null";
@ -63,7 +64,7 @@ sh "sudo $prefix/nginx/sbin/nginx -sstop";
warn "\n=== DTrace Build ===\n"; warn "\n=== DTrace Build ===\n";
$prefix = "/usr/local/openresty-dtrace"; $prefix = "/usr/local/openresty-dtrace";
unless ($opts{f}) { unless ($opts{f}) {
sh "./configure --with-dtrace-probes --prefix=$prefix --with-luajit -j$jobs > /dev/null"; sh "./configure $cfg_opts --with-dtrace-probes --prefix=$prefix --with-luajit -j$jobs > /dev/null";
} }
sh "$make -j$jobs > /dev/null"; sh "$make -j$jobs > /dev/null";
sh "sudo $make install > /dev/null"; sh "sudo $make install > /dev/null";