added --with-libdrizzle option to specify the (lib)drizzle installation prefix. now ngx_drizzle is disabled by default. you need to enable it via the --with-http_drizzle_module option.
This commit is contained in:
parent
7fcf5e3e82
commit
5a7890001b
66
t/sanity.t
66
t/sanity.t
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
use t::Config;
|
use t::Config;
|
||||||
|
|
||||||
plan tests => 4 * blocks() - 3;
|
plan tests => 4 * blocks() - 4;
|
||||||
|
|
||||||
#no_diff();
|
#no_diff();
|
||||||
|
|
||||||
|
@ -44,6 +44,7 @@ __DATA__
|
||||||
|
|
||||||
--without-lua51 disable the bundled Lua 5.1 interpreter
|
--without-lua51 disable the bundled Lua 5.1 interpreter
|
||||||
--with-luajit enable LuaJIT 2.0
|
--with-luajit enable LuaJIT 2.0
|
||||||
|
--with-libdrizzle=DIR specify the libdrizzle 1.0 installation prefix
|
||||||
|
|
||||||
Options directly inherited from nginx
|
Options directly inherited from nginx
|
||||||
|
|
||||||
|
@ -595,6 +596,7 @@ clean:
|
||||||
|
|
||||||
--without-lua51 disable the bundled Lua 5.1 interpreter
|
--without-lua51 disable the bundled Lua 5.1 interpreter
|
||||||
--with-luajit enable LuaJIT 2.0
|
--with-luajit enable LuaJIT 2.0
|
||||||
|
--with-libdrizzle=DIR specify the libdrizzle 1.0 installation prefix
|
||||||
|
|
||||||
Options directly inherited from nginx
|
Options directly inherited from nginx
|
||||||
|
|
||||||
|
@ -867,3 +869,65 @@ install:
|
||||||
clean:
|
clean:
|
||||||
rm -rf build
|
rm -rf build
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
=== TEST 15: ngx_drizzle not enabled but specify --with-libdrizzle
|
||||||
|
--- cmd: ./configure --with-libdrizzle=/opt/drizzle --dry-run
|
||||||
|
--- out
|
||||||
|
platform: linux (linux)
|
||||||
|
--- err
|
||||||
|
The http_drizzle_module is not enabled while --with-libdrizzle is specified.
|
||||||
|
--- exit: 255
|
||||||
|
|
||||||
|
|
||||||
|
=== TEST 16: ngx_drizzle enabled and --with-libdrizzle is specified
|
||||||
|
--- cmd: ./configure --with-libdrizzle=/opt/drizzle --with-http_drizzle_module --dry-run
|
||||||
|
--- out
|
||||||
|
platform: linux (linux)
|
||||||
|
cp -rp bundle/ build/
|
||||||
|
cd build
|
||||||
|
export LIBDRIZZLE_LIB='/opt/drizzle/lib'
|
||||||
|
export LIBDRIZZLE_INC='/opt/drizzle/include/libdrizzle-1.0'
|
||||||
|
cd lua-5.1.4
|
||||||
|
make linux
|
||||||
|
make install INSTALL_TOP=/home/agentz/git/ngx_openresty/ngx_openresty-0.8.54.8rc1/build/lua-root/usr/local/openresty/lua
|
||||||
|
export LUA_LIB='/home/agentz/git/ngx_openresty/ngx_openresty-0.8.54.8rc1/build/lua-root/usr/local/openresty/lua/lib'
|
||||||
|
export LUA_INC='/home/agentz/git/ngx_openresty/ngx_openresty-0.8.54.8rc1/build/lua-root/usr/local/openresty/lua/include'
|
||||||
|
cd ..
|
||||||
|
cd nginx-0.8.54
|
||||||
|
./configure --prefix=/usr/local/openresty/nginx \
|
||||||
|
--with-cc-opt='-O2' \
|
||||||
|
--add-module=../echo-nginx-module-0.36rc4 \
|
||||||
|
--add-module=../xss-nginx-module-0.03rc3 \
|
||||||
|
--add-module=../ngx_devel_kit-0.2.17 \
|
||||||
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
|
--add-module=../drizzle-nginx-module-0.0.15rc13 \
|
||||||
|
--add-module=../ngx_lua-0.1.6rc15 \
|
||||||
|
--add-module=../headers-more-nginx-module-0.15rc3 \
|
||||||
|
--add-module=../srcache-nginx-module-0.12rc5 \
|
||||||
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
|
--add-module=../memc-nginx-module-0.12rc2 \
|
||||||
|
--add-module=../redis2-nginx-module-0.07rc3 \
|
||||||
|
--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,/opt/drizzle/lib' \
|
||||||
|
--with-http_ssl_module
|
||||||
|
cd ../..
|
||||||
|
--- err
|
||||||
|
--- makefile
|
||||||
|
.PHONY: all install
|
||||||
|
|
||||||
|
all:
|
||||||
|
cd build/lua-5.1.4 && $(MAKE) linux
|
||||||
|
cd build/nginx-0.8.54 && $(MAKE)
|
||||||
|
|
||||||
|
install:
|
||||||
|
cd build/lua-5.1.4 && $(MAKE) install INSTALL_TOP=$(DESTDIR)/usr/local/openresty/lua
|
||||||
|
cd build/nginx-0.8.54 && $(MAKE) install DESTDIR=$(DESTDIR)
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -rf build
|
||||||
|
|
||||||
|
|
|
@ -148,6 +148,9 @@ for my $opt (@ARGV) {
|
||||||
} elsif ($opt eq '--with-luajit') {
|
} elsif ($opt eq '--with-luajit') {
|
||||||
$resty_opts{luajit} = 1;
|
$resty_opts{luajit} = 1;
|
||||||
|
|
||||||
|
} elsif ($opt =~ /^--with-libdrizzle=(.*)/) {
|
||||||
|
$resty_opts{libdrizzle} = $1;
|
||||||
|
|
||||||
} elsif ($opt eq '--with-http_ssl_module') {
|
} elsif ($opt eq '--with-http_ssl_module') {
|
||||||
$resty_opts{http_ssl} = 1;
|
$resty_opts{http_ssl} = 1;
|
||||||
push @ngx_opts, $opt;
|
push @ngx_opts, $opt;
|
||||||
|
@ -258,6 +261,10 @@ sub build_resty_opts {
|
||||||
push @ngx_opts, '--with-http_ssl_module';
|
push @ngx_opts, '--with-http_ssl_module';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (! $opts->{http_drizzle} && $opts->{libdrizzle}) {
|
||||||
|
die "The http_drizzle_module is not enabled while --with-libdrizzle is specified.\n";
|
||||||
|
}
|
||||||
|
|
||||||
if ($platform eq 'linux' && $opts->{luajit} && ! can_run("ldconfig")) {
|
if ($platform eq 'linux' && $opts->{luajit} && ! can_run("ldconfig")) {
|
||||||
die "you need to have ldconfig in your PATH env when enabling luajit.\n";
|
die "you need to have ldconfig in your PATH env when enabling luajit.\n";
|
||||||
}
|
}
|
||||||
|
@ -288,6 +295,13 @@ sub build_resty_opts {
|
||||||
|
|
||||||
# build 3rd-party C libraries if required
|
# build 3rd-party C libraries if required
|
||||||
|
|
||||||
|
if (my $drizzle_prefix = $opts->{libdrizzle}) {
|
||||||
|
my $drizzle_lib = "$drizzle_prefix/lib";
|
||||||
|
env LIBDRIZZLE_LIB => "$drizzle_prefix/lib";
|
||||||
|
env LIBDRIZZLE_INC => "$drizzle_prefix/include/libdrizzle-1.0";
|
||||||
|
push @ngx_rpaths, $drizzle_lib;
|
||||||
|
}
|
||||||
|
|
||||||
if ($opts->{luajit}) {
|
if ($opts->{luajit}) {
|
||||||
my $luajit_src = auto_complete 'LuaJIT';
|
my $luajit_src = auto_complete 'LuaJIT';
|
||||||
my $luajit_prefix = "$prefix/luajit";
|
my $luajit_prefix = "$prefix/luajit";
|
||||||
|
@ -442,6 +456,7 @@ _EOC_
|
||||||
|
|
||||||
--without-lua51 disable the bundled Lua 5.1 interpreter
|
--without-lua51 disable the bundled Lua 5.1 interpreter
|
||||||
--with-luajit enable LuaJIT 2.0
|
--with-luajit enable LuaJIT 2.0
|
||||||
|
--with-libdrizzle=DIR specify the libdrizzle 1.0 installation prefix
|
||||||
|
|
||||||
Options directly inherited from nginx
|
Options directly inherited from nginx
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue