diff options
| -rw-r--r-- | include/jlib.hrl | 4 | ||||
| -rw-r--r-- | include/xmpp.hrl | 4 | ||||
| -rw-r--r-- | rebar.config | 3 | ||||
| -rw-r--r-- | src/ext_mod.erl | 5 |
4 files changed, 3 insertions, 13 deletions
diff --git a/include/jlib.hrl b/include/jlib.hrl index 50a031334..5a3c1634e 100644 --- a/include/jlib.hrl +++ b/include/jlib.hrl @@ -19,11 +19,7 @@ %%%---------------------------------------------------------------------- -include("ns.hrl"). --ifdef(NO_EXT_LIB). -include("fxml.hrl"). --else. --include_lib("fast_xml/include/fxml.hrl"). --endif. -define(STANZA_ERROR(Code, Type, Condition), #xmlel{name = <<"error">>, diff --git a/include/xmpp.hrl b/include/xmpp.hrl index e1bdaeed0..f8a61590f 100644 --- a/include/xmpp.hrl +++ b/include/xmpp.hrl @@ -9,11 +9,7 @@ -include("ns.hrl"). -include("jid.hrl"). -include("xmpp_codec.hrl"). --ifdef(NO_EXT_LIB). -include("fxml.hrl"). --else. --include_lib("fast_xml/include/fxml.hrl"). --endif. -type iq_type() :: get | set | result | error. -type message_type() :: chat | error | groupchat | headline | normal. diff --git a/rebar.config b/rebar.config index fca8d19e2..966b746c1 100644 --- a/rebar.config +++ b/rebar.config @@ -1,4 +1,4 @@ -%%%------------------------------------------------------------------- +%------------------------------------------------------------------- %%% @author Evgeniy Khramtsov <ekhramtsov@process-one.net> %%% @copyright (C) 2013-2016, Evgeniy Khramtsov %%% @doc @@ -65,6 +65,7 @@ {erl_first_files, ["src/ejabberd_config.erl", "src/gen_mod.erl"]}. {erl_opts, [nowarn_deprecated_function, + {i, "include"}, {i, "deps/fast_xml/include"}, {if_var_false, debug, no_debug_info}, {if_var_true, debug, debug_info}, {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}}, diff --git a/src/ext_mod.erl b/src/ext_mod.erl index a2109e569..071fb827c 100644 --- a/src/ext_mod.erl +++ b/src/ext_mod.erl @@ -520,11 +520,8 @@ compile(_Module, _Spec, DestDir) -> filelib:ensure_dir(filename:join(Ebin, ".")), EjabBin = filename:dirname(code:which(ejabberd)), EjabInc = filename:join(filename:dirname(EjabBin), "include"), - XmlHrl = filename:join(EjabInc, "fxml.hrl"), - ExtLib = [{d, 'NO_EXT_LIB'} || filelib:is_file(XmlHrl)], Options = [{outdir, Ebin}, {i, "include"}, {i, EjabInc}, - verbose, report_errors, report_warnings] - ++ ExtLib, + verbose, report_errors, report_warnings], [file:copy(App, Ebin) || App <- filelib:wildcard("src/*.app")], %% Compile erlang files |