buildroot

From 0487178693143955ff57e3c9371fb6e7b164294c Mon Sep 17 00:00:00 2001

From: Johan Oudinet <johan.oudinet@gmail.com>

Date: Thu, 11 Jan 2018 12:49:38 +0100

Subject: [PATCH] correct includes

​

Use include_lib() instead of include() for files from external

libraries. See https://github.com/processone/ejabberd/pull/1446

​

Note: Philipp Huebner has a similar patch in Debian's port of ejabberd

but it was easier to redo this patch from scratch with the following sed

command on ejabberd git repository than adapting Huebner's patch format:

for f in src/*.erl include/*.hrl; do

    sed -i -e 's,esip/include,s1_sip/include,g' \

    -e 's,include("ns.hrl,include_lib("p1_xmpp/include/ns.hrl,g' \

    -e 's,include("fxml.hrl,include_lib("p1_xml/include/fxml.hrl,g' \

    -e 's,include("xmpp\.hrl,include_lib("p1_xmpp/include/xmpp.hrl,g' \

    -e 's,include("jid\.hrl,include_lib("p1_xmpp/include/jid.hrl,g' \

    "$f"

done

​

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>

---

 include/jlib.hrl                  | 4 ++--

 src/acl.erl                       | 2 +-

 src/acme_challenge.erl            | 2 +-

 src/ejabberd_acme.erl             | 2 +-

 src/ejabberd_acme_comm.erl        | 2 +-

 src/ejabberd_auth_anonymous.erl   | 2 +-

 src/ejabberd_bosh.erl             | 2 +-

 src/ejabberd_c2s.erl              | 2 +-

 src/ejabberd_captcha.erl          | 2 +-

 src/ejabberd_http.erl             | 2 +-

 src/ejabberd_http_ws.erl          | 2 +-

 src/ejabberd_iq.erl               | 2 +-

 src/ejabberd_local.erl            | 2 +-

 src/ejabberd_oauth.erl            | 2 +-

 src/ejabberd_oauth_rest.erl       | 2 +-

 src/ejabberd_oauth_sql.erl        | 2 +-

 src/ejabberd_piefxis.erl          | 2 +-

 src/ejabberd_router.erl           | 2 +-

 src/ejabberd_router_multicast.erl | 2 +-

 src/ejabberd_s2s.erl              | 2 +-

 src/ejabberd_s2s_in.erl           | 2 +-

 src/ejabberd_s2s_out.erl          | 2 +-

 src/ejabberd_service.erl          | 2 +-

 src/ejabberd_sm.erl               | 2 +-

 src/ejabberd_socket.erl           | 2 +-

 src/ejabberd_system_monitor.erl   | 2 +-

 src/ejabberd_web.erl              | 2 +-

 src/ejabberd_web_admin.erl        | 2 +-

 src/ejabberd_websocket.erl        | 2 +-

 src/ejabberd_xmlrpc.erl           | 2 +-

 src/gen_iq_handler.erl            | 2 +-

 src/gen_pubsub_node.erl           | 2 +-

 src/gen_pubsub_nodetree.erl       | 2 +-

 src/jd2ejd.erl                    | 2 +-

 src/mod_adhoc.erl                 | 2 +-

 src/mod_admin_extra.erl           | 2 +-

 src/mod_admin_update_sql.erl      | 2 +-

 src/mod_announce.erl              | 2 +-

 src/mod_announce_mnesia.erl       | 2 +-

 src/mod_announce_riak.erl         | 2 +-

 src/mod_announce_sql.erl          | 2 +-