bugfix: use to LUA_ORIGIN_DEFAULT_CPATH instead of LUA_DEFAULT_PATH avoid dquote in CFLAGS

fix this issue: https://github.com/openresty/openresty/issues/587
pull/591/head
jinhua.tan 5 years ago
parent 9e1d025f80
commit 545897af50

5
util/configure vendored

@ -962,9 +962,8 @@ int main(void) {
{
print $in <<"_EOC_";
ngx_lua_dquote='"'
CFLAGS="\$CFLAGS -DLUA_DEFAULT_PATH='\${ngx_lua_dquote}$site_lualib_prefix/?.ljbc;$site_lualib_prefix/?/init.ljbc;$lualib_prefix/?.ljbc;$lualib_prefix/?/init.ljbc;$site_lualib_prefix/?.lua;$site_lualib_prefix/?/init.lua;$lualib_prefix/?.lua;$lualib_prefix/?/init.lua\$ngx_lua_dquote'"
CFLAGS="\$CFLAGS -DLUA_DEFAULT_CPATH='\${ngx_lua_dquote}$site_lualib_prefix/?.so;$lualib_prefix/?.so\$ngx_lua_dquote'"
CFLAGS="\$CFLAGS -DLUA_ORIGIN_DEFAULT_PATH='$site_lualib_prefix/?.ljbc;$site_lualib_prefix/?/init.ljbc;$lualib_prefix/?.ljbc;$lualib_prefix/?/init.ljbc;$site_lualib_prefix/?.lua;$site_lualib_prefix/?/init.lua;$lualib_prefix/?.lua;$lualib_prefix/?/init.lua'"
CFLAGS="\$CFLAGS -DLUA_ORIGIN_DEFAULT_CPATH='$site_lualib_prefix/?.so;$lualib_prefix/?.so'"
_EOC_
}

@ -548,10 +548,10 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
#################################
ver=0.10.16rc4
$root/util/get-tarball "https://github.com/openresty/lua-nginx-module/archive/v$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1
ver=origin_default_path
$root/util/get-tarball "https://github.com/rainingmaster/lua-nginx-module/archive/$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
mv lua-nginx-module-$ver ngx_lua-$ver || exit 1
mv lua-nginx-module-$ver ngx_lua-0.10.16rc4 || exit 1
#################################
@ -562,10 +562,10 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1
#################################
ver=0.0.8rc2
$root/util/get-tarball "https://github.com/openresty/stream-lua-nginx-module/tarball/v$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1
ver=origin_default_path
$root/util/get-tarball "https://github.com/rainingmaster/stream-lua-nginx-module/tarball/$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1
tar -xzf stream-lua-nginx-module-$ver.tar.gz || exit 1
mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1
mv rainingmaster-stream-lua-nginx-module-* ngx_stream_lua-0.0.8rc2 || exit 1
#################################

Loading…
Cancel
Save