From 5429150ab65e74417fa28bdeac2f5f8a142c75b7 Mon Sep 17 00:00:00 2001 From: "Yichun Zhang (agentzh)" Date: Thu, 14 Jul 2016 18:05:53 -0700 Subject: [PATCH] feature: added "/site/lualib/" to the default Lua module search paths used by OpenResty. This location is for 3rd-party Lua modules so that the users will not pollute the "/lualib/" directory with non-standard Lua module files. --- util/configure | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/util/configure b/util/configure index bf183d6..f4e6fe4 100755 --- a/util/configure +++ b/util/configure @@ -753,6 +753,7 @@ _END_ # build lua modules my $lualib_prefix = File::Spec->catfile($prefix, "lualib"); + my $site_lualib_prefix = File::Spec->catfile($prefix, "site/lualib"); my $ngx_lua_dir = auto_complete 'ngx_lua'; @@ -760,20 +761,11 @@ _END_ die "Cannot open $ngx_lua_dir/config for appending: $!\n"; { - my $path_prefix = $lualib_prefix; - - #if (File::Spec->rel2abs($lualib_prefix) ne File::Spec->canonpath($lualib_prefix) - #&& $platform eq 'msys') - #{ - # being a relative path and on MSYS - #$path_prefix = "!/$lualib_prefix"; - #} - print $in <<"_EOC_"; ngx_lua_dquote='"' -CFLAGS="\$CFLAGS -DLUA_DEFAULT_PATH='\${ngx_lua_dquote}$path_prefix/?.lua;$path_prefix/?/init.lua\$ngx_lua_dquote'" -CFLAGS="\$CFLAGS -DLUA_DEFAULT_CPATH='\${ngx_lua_dquote}$path_prefix/?.so\$ngx_lua_dquote'" +CFLAGS="\$CFLAGS -DLUA_DEFAULT_PATH='\${ngx_lua_dquote}$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'" _EOC_ }