Skip to content

Dynamic module #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 25, 2016
Merged

Dynamic module #120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
892bdb2
nginx-clojure can now be compiled as a dynamic module
Apr 23, 2016
dbc63fd
Cleanup conversion to dynamic modules
LinuxJedi May 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions src/c/config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,35 @@
ngx_addon_name=ngx_http_clojure_module
HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_clojure_module"
#HTTP_MODULES="$HTTP_MODULES ngx_http_clojure_module"
NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
$ngx_addon_dir/ngx_http_clojure_mem.c \

CLOJURE_SRCS="$ngx_addon_dir/ngx_http_clojure_mem.c \
$ngx_addon_dir/ngx_http_clojure_jvm.c \
$ngx_addon_dir/ngx_http_clojure_module.c \
$ngx_addon_dir/ngx_http_clojure_socket.c \
$ngx_addon_dir/ngx_http_clojure_shared_map.c \
$ngx_addon_dir/ngx_http_clojure_shared_map_hashmap.c \
$ngx_addon_dir/ngx_http_clojure_shared_map_tinymap.c \
"
NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
$ngx_addon_dir/ngx_http_clojure_jvm.h \
$ngx_addon_dir/ngx_http_clojure_mem.h \
$ngx_addon_dir/ngx_http_clojure_socket.h \
$ngx_addon_dir/ngx_http_clojure_shared_map.h \
$ngx_addon_dir/ngx_http_clojure_shared_map_hashmap.h \
$ngx_addon_dir/ngx_http_clojure_shared_map_tinymap.h \
CLOJURE_DEPS="$NGX_ADDON_DEPS \
$ngx_addon_dir/ngx_http_clojure_jvm.h \
$ngx_addon_dir/ngx_http_clojure_mem.h \
$ngx_addon_dir/ngx_http_clojure_socket.h \
$ngx_addon_dir/ngx_http_clojure_shared_map.h \
$ngx_addon_dir/ngx_http_clojure_shared_map_hashmap.h \
$ngx_addon_dir/ngx_http_clojure_shared_map_tinymap.h \
"

if test -n "$ngx_module_link"; then
ngx_module_type=HTTP_AUX_FILTER
ngx_module_name=ngx_http_clojure_module
ngx_module_srcs=$CLOJURE_SRCS
ngx_module_deps=$CLOJURE_DEPS

. auto/module
else
HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_clojure_module"
#HTTP_MODULES="$HTTP_MODULES ngx_http_clojure_module"
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $CLOJURE_SRCS"
NGX_ADDON_DEPS="$NGX_ADDON_DEPS $CLOJURE_DEPS"
fi
HTTP_INCS="$HTTP_INCS $ngx_addon_dir"

USE_SHA1=YES
Expand Down