jinql
/
ngx-fancyindex
mirror of https://github.com/aperezdc/ngx-fancyindex
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #44 from vrnagy/master 

Support to be built as dynamic module
pull/45/head
Adrian Perez 2016-06-08 15:40:04 +03:00
parent ba8b4ece63 0e5f7c00b6
commit 06eda48a62
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -6,8 +6,9 @@ compiler:
env: env:
# At least try stable and mainline versions # At least try stable and mainline versions
- NGINX=1.9.11 - NGINX=1.10.0 TYPE=dynamic
- NGINX=1.8.1 - NGINX=1.9.15 TYPE=dynamic
- NGINX=1.8.1 TYPE=static
# Also, the oldest supported version # Also, the oldest supported version
# TODO: Fails building because it won't find IOV_MAX from header. # TODO: Fails building because it won't find IOV_MAX from header.
#- NGINX=0.7.69 #- NGINX=0.7.69
@ -25,5 +26,5 @@ cache: ccache
script: | script: |
wget -O - http://nginx.org/download/nginx-${NGINX}.tar.gz | tar -xzf - wget -O - http://nginx.org/download/nginx-${NGINX}.tar.gz | tar -xzf -
cd nginx-${NGINX} cd nginx-${NGINX}
./configure --add-module=.. --with-http_addition_module if [[ ${TYPE} = "dynamic" ]] ; then ./configure --add-dynamic-module=.. --with-http_addition_module ; else ./configure --add-module=.. --with-http_addition_module ; fi
make make

9
config
View File

@ -1,12 +1,19 @@
# vim:ft=sh: # vim:ft=sh:
ngx_addon_name=ngx_http_fancyindex_module ngx_addon_name=ngx_http_fancyindex_module
if test -n "$ngx_module_link"; then
ngx_module_type=HTTP
ngx_module_name=ngx_http_fancyindex_module
ngx_module_srcs="$ngx_addon_dir/ngx_http_fancyindex_module.c"
. auto/module
else
# XXX: Insert fancyindex module *after* index module! # XXX: Insert fancyindex module *after* index module!
# #
HTTP_MODULES=`echo "${HTTP_MODULES}" | sed -e \ HTTP_MODULES=`echo "${HTTP_MODULES}" | sed -e \
's/ngx_http_index_module/ngx_http_fancyindex_module ngx_http_index_module/'` 's/ngx_http_index_module/ngx_http_fancyindex_module ngx_http_index_module/'`
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fancyindex_module.c" NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fancyindex_module.c"
if [ $HTTP_ADDITION != YES ] ; then if [ $HTTP_ADDITION != YES ] ; then
echo " - The 'addition' filter is needed for fancyindex_{header,footer}, but it was disabled" echo " - The 'addition' filter is needed for fancyindex_{header,footer}, but it was disabled"
fi fi
fi