bugfix: FFI availability feature test was broken on Windows.

bugfix: we now avoided passing -DLUA_DEFAULT_PATH=... and -DLUA_DEFAULT_CPATH=... options via CFLAGS. This is know to cause problems in some cases. openresty/openresty#587.

bugfix: some LuaJIT related feature tests may cause unwanted C compiler errors due to `#endif;`.

Author: agentzh

config

@@ -178,7 +178,8 @@ ngx_feature_run=no
 ngx_feature_incs="#include <luajit.h>"
 ngx_feature_test="#if !defined(LUAJIT_VERSION_NUM) || LUAJIT_VERSION_NUM < 20000
                   #    error unsupported LuaJIT version
-                  #endif"
+                  #endif
+                  "
 
 . auto/feature
 
@@ -196,7 +197,8 @@ ngx_feature_run=no
 ngx_feature_incs="#include <lua.h>"
 ngx_feature_test="#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM != 501
                   #   error unsupported Lua language version
-                  #endif"
+                  #endif
+                  "
 
 . auto/feature
 
@@ -210,8 +212,8 @@ fi
 # ----------------------------------------
 
 ngx_feature="LuaJIT has FFI"
-ngx_feature_libs="$LUAJIT_LIB/libluajit-5.1.a $luajit_ld_opt"
-ngx_feature_run=yes
+ngx_feature_libs="$ngx_module_libs"
+ngx_feature_run=no
 ngx_feature_incs="#include <lualib.h>
                   #include <lauxlib.h>
                   #include <assert.h>"
@@ -295,6 +297,7 @@ HTTP_LUA_SRCS=" \
 
 HTTP_LUA_DEPS=" \
             $ngx_addon_dir/src/ddebug.h \
+            $ngx_addon_dir/src/ngx_http_lua_autoconf.h \
             $ngx_addon_dir/src/ngx_http_lua_script.h \
             $ngx_addon_dir/src/ngx_http_lua_log.h \
             $ngx_addon_dir/src/ngx_http_lua_subrequest.h \
@@ -554,5 +557,5 @@ NGX_TAPSET_SRCS="$NGX_TAPSET_SRCS $ngx_addon_dir/tapset/ngx_lua.stp"
 CORE_INCS="$CORE_INCS $ngx_addon_dir/src/api"
 
 CFLAGS="$CFLAGS -DNDK_SET_VAR"
-#CFLAGS=$"$CFLAGS -DLUA_DEFAULT_PATH='\"/usr/local/openresty/lualib/?.lua\"'"
-#CFLAGS=$"$CFLAGS -DLUA_DEFAULT_CPATH='\"/usr/local/openresty/lualib/?.so\"'"
+
+echo "/* DO NOT EDIT! This file was automatically generated by config */" > "$ngx_addon_dir/src/ngx_http_lua_autoconf.h"

src/ngx_http_lua_common.h

@@ -9,6 +9,8 @@
 #define _NGX_HTTP_LUA_COMMON_H_INCLUDED_
 
 
+#include "ngx_http_lua_autoconf.h"
+
 #include <nginx.h>
 #include <ngx_core.h>
 #include <ngx_http.h>