diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-05-06 21:41:29 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-05-06 21:41:29 +0200 |
| commit | d343447cc94822a220e2ef2948eac6dcfd860cae (patch) | |
| tree | 587a8cb8903573a2253f50bb10f56685c027d858 /rebar.config.script | |
| parent | XEP-0198: Use "mgmt_" prefix for all #state fields (diff) | |
| parent | Fix PEP broadcasting issue on ODBC (EJAB-1680) (diff) | |
Merge remote-tracking branch 'processone/master' into xep-0198
Conflicts:
doc/guide.tex
src/ejabberd_c2s.erl
Diffstat (limited to 'rebar.config.script')
| -rw-r--r-- | rebar.config.script | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/rebar.config.script b/rebar.config.script index 7a5e332c4..f6772e0e8 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -43,6 +43,7 @@ HiPE = case lists:keysearch(hipe, 1, Cfg) of end, Includes = [{i, "include"}, + {i, filename:join(["deps", "esip", "include"])}, {i, filename:join(["deps", "p1_xml", "include"])}], SrcDirs = lists:foldl( @@ -56,6 +57,7 @@ Deps = [{p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}}, {p1_tls, ".*", {git, "git://github.com/processone/tls"}}, {p1_stringprep, ".*", {git, "git://github.com/processone/stringprep"}}, {p1_xml, ".*", {git, "git://github.com/processone/xml"}}, + {esip, ".*", {git, "git://github.com/processone/p1_sip"}}, {p1_yaml, ".*", {git, "git://github.com/processone/p1_yaml"}}, {xmlrpc, ".*", {git, "git://github.com/rds13/xmlrpc"}}], @@ -77,6 +79,7 @@ XMLFlags = lists:foldl( PostHooks = [ConfigureCmd("p1_tls", ""), ConfigureCmd("p1_stringprep", ""), ConfigureCmd("p1_yaml", ""), + ConfigureCmd("esip", ""), ConfigureCmd("p1_xml", XMLFlags)], CfgDeps = lists:flatmap( |