Add --enable-lua, and use that for luerl instead of --enable-tools (#3508)

--enable-tools is for development tools, but prosody2ejabberd is used at
runtime, so better move luerl to --enable-lua

4 files changed, 15 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index fe64d38d..faeb6714 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,10 +70,10 @@ AC_CONFIG_FILES([Makefile
 		 vars.config])
 
 AC_ARG_ENABLE(all,
-[AC_HELP_STRING([--enable-all], [same as --enable-odbc --enable-mysql --enable-pgsql --enable-sqlite --enable-pam --enable-zlib --enable-redis --enable-elixir --enable-stun --enable-sip --enable-debug --enable-tools (useful for Dialyzer checks, default: no)])],
+[AC_HELP_STRING([--enable-all], [same as --enable-odbc --enable-mysql --enable-pgsql --enable-sqlite --enable-pam --enable-zlib --enable-redis --enable-elixir --enable-stun --enable-sip --enable-debug --enable-lua --enable-tools (useful for Dialyzer checks, default: no)])],
 [case "${enableval}" in
-  yes) odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true redis=true elixir=true stun=true sip=true debug=true tools=true ;;
-  no) odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false redis=false elixir=false stun=false sip=false debug=false tools=false ;;
+  yes) odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true redis=true elixir=true stun=true sip=true debug=true lua=true tools=true ;;
+  no) odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false redis=false elixir=false stun=false sip=false debug=false lua=false tools=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
@@ -143,6 +143,14 @@ AC_ARG_ENABLE(latest_deps,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-latest-deps) ;;
 esac],[if test "x$latest_deps" = "x"; then latest_deps=false; fi])
 
+AC_ARG_ENABLE(lua,
+[AC_HELP_STRING([--enable-lua], [enable Lua support, to import from Prosody (default: no)])],
+[case "${enableval}" in
+  yes) lua=true ;;
+  no)  lua=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-lua) ;;
+esac],[if test "x$lua" = "x"; then lua=false; fi])
+
 AC_ARG_ENABLE(mssql,
 [AC_HELP_STRING([--enable-mssql], [use Microsoft SQL Server database (default: no, requires --enable-odbc)])],
 [case "${enableval}" in
@@ -304,6 +312,7 @@ AC_SUBST(elixir)
 AC_SUBST(stun)
 AC_SUBST(sip)
 AC_SUBST(debug)
+AC_SUBST(lua)
 AC_SUBST(tools)
 AC_SUBST(latest_deps)
 AC_SUBST(system_deps)
diff --git a/mix.exs b/mix.exs
index 63c20bd9..e3052e7a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -130,7 +130,7 @@ defmodule Ejabberd.Mixfile do
                          {config(:redis), {:eredis, "~> 1.0"}},
                          {config(:zlib), {:ezlib, "~> 1.0"}},
                          {config(:pam), {:epam, "~> 1.0"}},
-                         {config(:tools), {:luerl, "~> 0.3.1"}}], do:
+                         {config(:lua), {:luerl, "~> 0.3.1"}}], do:
       dep
   end
 
diff --git a/rebar.config b/rebar.config
index 30975732..8c89a365 100644
--- a/rebar.config
+++ b/rebar.config
@@ -40,7 +40,7 @@
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "1.0.5"}}},
         {jose, ".*", {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.9.0"}}},
         {lager, ".*", {git, "https://github.com/erlang-lager/lager", {tag, "3.6.10"}}},
-        {if_var_true, tools,
+        {if_var_true, lua,
          {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.3"}}}},
         {mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.12"}}},
         {p1_acme, ".*", {git, "https://github.com/processone/p1_acme", {tag, "1.0.11"}}},
diff --git a/vars.config.in b/vars.config.in
index 696c761f..49cabf52 100644
--- a/vars.config.in
+++ b/vars.config.in
@@ -40,6 +40,7 @@
 {elixir, @elixir@}.
 {stun, @stun@}.
 {sip, @sip@}.
+{lua, @lua@}.
 
 %% Version
 {vsn, "@PACKAGE_VERSION@"}.