From: Christophe Romain <christophe.romain@process-one.net>
Date: Fri, 25 Nov 2016 09:05:01 +0000 (+0100)
Subject: Merge branch 'enable-elixir-in-mix' of https://github.com/ukutaht/ejabberd into ukuta... 
X-Git-Tag: 16.12-beta1~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9432a16893262f94c97332bbbdcb25d52f970ffd;p=ejabberd

Merge branch 'enable-elixir-in-mix' of https://github.com/ukutaht/ejabberd into ukutaht-enable-elixir-in-mix
---

9432a16893262f94c97332bbbdcb25d52f970ffd
diff --cc mix.exs
index d1ef0fbbb,fc9fcea01..b9ff8794e
--- a/mix.exs
+++ b/mix.exs
@@@ -34,8 -35,8 +34,8 @@@ defmodule Ejabberd.Mixfile d
  
    defp erlc_options do
      # Use our own includes + includes from all dependencies
 -    includes = ["include"] ++ Path.wildcard(Path.join("..", "/*/include"))
 +    includes = ["include"] ++ Path.wildcard("deps/*/include")
-     [:debug_info] ++ Enum.map(includes, fn(path) -> {:i, path} end)
+     [:debug_info, {:d, :ELIXIR_ENABLED}] ++ Enum.map(includes, fn(path) -> {:i, path} end)
    end
  
    defp deps do