feature: added dynamic module support.

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

.gitignore

@@ -56,3 +56,4 @@ html_out/
 ebooks.sh
 *.pdf
 *.patch
+src/ngx_stream_lua_autoconf.h

config

@@ -153,14 +153,17 @@ else
     fi
 fi
 
+ngx_module_incs=
+ngx_module_libs=
+
 if [ $ngx_found = yes ]; then
     # this is a hack to persuade nginx's build system to favor
     # the paths set by our user environment
     CFLAGS="$ngx_lua_opt_I $CFLAGS"
     NGX_LD_OPT="$ngx_lua_opt_L $NGX_LD_OPT"
 
-    CORE_INCS="$CORE_INCS $ngx_feature_path"
-    CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+    ngx_module_incs="$ngx_module_incs $ngx_feature_path"
+    ngx_module_libs="$ngx_module_libs $ngx_feature_libs"
 else
     cat << END
     $0: error: ngx_stream_lua_module requires the LuaJIT library.
@@ -175,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
 
@@ -193,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
 
@@ -207,14 +212,17 @@ fi
 # ----------------------------------------
 
 ngx_feature="LuaJIT has FFI"
-ngx_feature_libs="$LUAJIT_LIB/libluajit-5.1.a $luajit_ld_opt"
-ngx_feature_run=yes
+CC_TEST_FLAGS="$ngx_lua_opt_I $CFLAGS"
+ngx_feature_libs="$ngx_module_libs"
+ngx_feature_run=no
 ngx_feature_incs="#include <lualib.h>
                   #include <lauxlib.h>
-                  #include <assert.h>"
+                  #include <assert.h>
+                  "
 ngx_feature_test="lua_State *L = luaL_newstate();
                   assert(L != NULL);
-                  luaopen_ffi(L);"
+                  luaopen_ffi(L);
+                  "
 
 . auto/feature
 
@@ -228,7 +236,7 @@ fi
 # ----------------------------------------
 
 ngx_addon_name=ngx_stream_lua_module
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
+STREAM_LUA_SRCS=" \
                 $ngx_addon_dir/src/ngx_stream_lua_api.c \
                 $ngx_addon_dir/src/ngx_stream_lua_request.c \
                 $ngx_addon_dir/src/ngx_stream_lua_module.c \
@@ -274,8 +282,9 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
                 $ngx_addon_dir/src/ngx_stream_lua_input_filters.c \
                 "
 
-NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
+STREAM_LUA_DEPS=" \
                 $ngx_addon_dir/src/ddebug.h \
+                $ngx_addon_dir/src/ngx_stream_lua_autoconf.h \
                 $ngx_addon_dir/src/api/ngx_stream_lua_api.h \
                 $ngx_addon_dir/src/ngx_stream_lua_request.h \
                 $ngx_addon_dir/src/ngx_stream_lua_common.h \
@@ -316,8 +325,6 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
                 $ngx_addon_dir/src/ngx_stream_lua_input_filters.h \
                 "
 
-STREAM_MODULES="$STREAM_MODULES $ngx_addon_name"
-
 # ----------------------------------------
 
 ngx_feature="export symbols by default (-E)"
@@ -379,6 +386,24 @@ ngx_feature_test='struct sigaction act;
 
 # ----------------------------------------
 
+if [ -n "$ngx_module_link" ]; then
+    ngx_module_type=STREAM
+    ngx_module_name=$ngx_addon_name
+    ngx_module_deps="$STREAM_LUA_DEPS"
+    ngx_module_srcs="$STREAM_LUA_SRCS"
+
+    . auto/module
+else
+    STREAM_MODULES="$STREAM_MODULES $ngx_addon_name"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $STREAM_LUA_SRCS"
+    NGX_ADDON_DEPS="$NGX_ADDON_DEPS $STREAM_LUA_DEPS"
+
+    CORE_INCS="$CORE_INCS $ngx_module_incs"
+    CORE_LIBS="$CORE_LIBS $ngx_module_libs"
+fi
+
+# ----------------------------------------
+
 if [ $USE_PCRE = YES -o $PCRE != NONE ] && [ $PCRE != NO -a $PCRE != YES ]; then
     # force pcre_version symbol to be required when PCRE is statically linked
     case "$NGX_PLATFORM" in
@@ -426,5 +451,4 @@ USE_SHA1=YES
 
 CORE_INCS="$CORE_INCS $ngx_addon_dir/src/api"
 
-#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_stream_lua_autoconf.h"

src/ngx_stream_lua_common.h

@@ -17,6 +17,8 @@
 #define _NGX_STREAM_LUA_COMMON_H_INCLUDED_
 
 
+#include "ngx_stream_lua_autoconf.h"
+
 #include <nginx.h>
 #include <ngx_core.h>
 #include <ngx_stream.h>