mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
bundle new component lua-resty-redis which is enabled by default. also added option --without-lua_resty_redis to ./configure for disabling it.
This commit is contained in:
18
util/configure
vendored
18
util/configure
vendored
@ -158,6 +158,9 @@ for my $opt (@ARGV) {
|
||||
} elsif ($opt eq '--without-lua_resty_memcached') {
|
||||
$resty_opts{no_lua_resty_memcached} = 1;
|
||||
|
||||
} elsif ($opt eq '--without-lua_resty_redis') {
|
||||
$resty_opts{no_lua_resty_redis} = 1;
|
||||
|
||||
} elsif ($opt eq '--without-lua_rds_parser') {
|
||||
$resty_opts{no_lua_rds_parser} = 1;
|
||||
|
||||
@ -765,6 +768,20 @@ _EOC_
|
||||
push @make_install_cmds, "cd $root_dir/build/$dir && " .
|
||||
"\$(MAKE) install$extra_opts";
|
||||
}
|
||||
|
||||
unless ($opts->{no_lua_resty_redis}) {
|
||||
my $name = 'lua-resty-redis';
|
||||
my $dir = auto_complete $name;
|
||||
if (!defined $dir) {
|
||||
die "No $name found";
|
||||
}
|
||||
|
||||
my $extra_opts = " DESTDIR=\$(DESTDIR) LUA_LIB_DIR=$lualib_prefix"
|
||||
." INSTALL=$root_dir/build/install";
|
||||
|
||||
push @make_install_cmds, "cd $root_dir/build/$dir && " .
|
||||
"\$(MAKE) install$extra_opts";
|
||||
}
|
||||
}
|
||||
|
||||
# prepare nginx configure line
|
||||
@ -864,6 +881,7 @@ _EOC_
|
||||
--without-lua_redis_parser disable the lua-redis-parser library
|
||||
--without-lua_rds_parser disable the lua-rds-parser library
|
||||
--without-lua_resty_memcached disable the lua-resty-memcached library
|
||||
--without-lua_resty_redis disable the lua-resty-redis library
|
||||
|
||||
--without-lua51 disable the bundled Lua 5.1 interpreter
|
||||
--with-lua51=PATH specify the external installation of Lua 5.1 by PATH
|
||||
|
@ -263,6 +263,13 @@ mv agentzh-lua-resty-memcached-* lua-resty-memcached-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
ver=0.05
|
||||
$root/util/get-tarball "http://github.com/agentzh/lua-resty-redis/tarball/v$ver" -O "lua-resty-redis-$ver.tar.gz" || exit 1
|
||||
tar -xzf lua-resty-redis-$ver.tar.gz || exit 1
|
||||
mv agentzh-lua-resty-redis-* lua-resty-redis-$ver || exit 1
|
||||
|
||||
#################################
|
||||
|
||||
rm *.tar.gz
|
||||
|
||||
cd ..
|
||||
|
Reference in New Issue
Block a user