Skip to content

Commit da21f78

Browse files
committed
Fix include paths for system yajl and msgpuck
Don't add third_party/yajl and third_party/msgpuck to include_paths if submodules are not initialized.
1 parent 82c09f1 commit da21f78

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

config

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,25 @@ ngx_addon_name="ngx_http_tnt_module"
22

33
libs="-lyajl -lmsgpuck"
44

5+
include_paths=" \
6+
$ngx_addon_dir/src \
7+
$ngx_addon_dir/third_party \
8+
"
9+
510
test -f $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a &&
611
test -f $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a && {
712
libs=" \
813
$ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \
914
$ngx_addon_dir/third_party/msgpuck/libmsgpuck.a \
1015
"
11-
}
12-
13-
module_src_dir="$ngx_addon_dir/src"
1416

15-
include_paths=" \
16-
$ngx_addon_dir/src \
17-
$ngx_addon_dir/third_party \
17+
include_paths="${include_path} \
1818
$ngx_addon_dir/third_party/msgpuck \
1919
$ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/include \
2020
"
21+
}
22+
23+
module_src_dir="$ngx_addon_dir/src"
2124

2225
sources=" \
2326
$module_src_dir/json_encoders.c \

0 commit comments

Comments
 (0)