From e2cc45933fcb80e1c5cfa4f12436dba0b91ffdd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
Date: Fri, 25 Sep 2015 16:39:47 +0200
Subject: [PATCH] Enable oauth unconditionally

---
 configure.ac        | 15 +++------------
 rebar.config.script |  9 +++------
 vars.config.in      |  1 -
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index 85d208c10..d03b50718 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,10 +108,10 @@ AC_ARG_ENABLE(mssql,
 esac],[db_type=generic])
 
 AC_ARG_ENABLE(all,
-[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-sqlite --enable-pam --enable-zlib --enable-riak --enable-redis --enable-json --enable-elixir --enable-iconv --enable-debug --enable-lager --enable-tools --enable-oauth (useful for Dialyzer checks, default: no)])],
+[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-sqlite --enable-pam --enable-zlib --enable-riak --enable-redis --enable-json --enable-elixir --enable-iconv --enable-debug --enable-lager --enable-tools (useful for Dialyzer checks, default: no)])],
 [case "${enableval}" in
-  yes) nif=true odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true riak=true redis=true json=true elixir=true iconv=true debug=true lager=true tools=true oauth=true ;;
-  no) nif=false odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false riak=false json=false redis=false elixir=false iconv=false debug=false lager=false tools=false oauth=false ;;
+  yes) nif=true odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true riak=true redis=true json=true elixir=true iconv=true debug=true lager=true tools=true ;;
+  no) nif=false odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false riak=false json=false redis=false elixir=false iconv=false debug=false lager=false tools=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
@@ -235,14 +235,6 @@ AC_ARG_ENABLE(lager,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-lager) ;;
 esac],[if test "x$lager" = "x"; then lager=true; fi])
 
-AC_ARG_ENABLE(oauth,
-[AC_HELP_STRING([--enable-oauth], [enable oauth support (default: yes)])],
-[case "${enableval}" in
-  yes) oauth=true ;;
-  no)  oauth=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-oauth) ;;
-esac],[if test "x$oauth" = "x"; then oauth=false; fi])
-
 AC_CONFIG_FILES([Makefile
 		 vars.config
 		 src/ejabberd.app.src])
@@ -290,6 +282,5 @@ AC_SUBST(iconv)
 AC_SUBST(debug)
 AC_SUBST(lager)
 AC_SUBST(tools)
-AC_SUBST(oauth)
 
 AC_OUTPUT
diff --git a/rebar.config.script b/rebar.config.script
index fb5f4126e..0176db175 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -61,7 +61,9 @@ Deps = [{p1_cache_tab, ".*", {git, "https://github.com/processone/cache_tab"}},
         {esip, ".*", {git, "https://github.com/processone/p1_sip"}},
         {p1_stun, ".*", {git, "https://github.com/processone/stun"}},
         {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml"}},
-        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils"}}],
+        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils"}},
+        {oauth2, ".*", {git, "https://github.com/IvanMartinez/oauth2.git"}},
+        {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc.git"}}],
 
 ConfigureCmd = fun(Pkg, Flags) ->
                        {'get-deps',
@@ -112,11 +114,6 @@ CfgDeps = lists:flatmap(
                     [{meck, "0.*", {git, "https://github.com/eproxus/meck"}}];
                ({redis, true}) ->
                     [{eredis, ".*", {git, "https://github.com/wooga/eredis"}}];
-               ({oauth, true}) ->
-                    %% ejabberd oauth support does not depends directly on xmlrpc.
-                    %% However, we include xmlrpc as it is convenient to document and test oauth
-                    [{oauth2, ".*", {git, "https://github.com/IvanMartinez/oauth2.git"}},
-                     {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc.git"}}];
                (_) ->
                     []
             end, Cfg),
diff --git a/vars.config.in b/vars.config.in
index bb5b2ae0c..2ccd5c76f 100644
--- a/vars.config.in
+++ b/vars.config.in
@@ -32,7 +32,6 @@
 {elixir, @elixir@}.
 {lager, @lager@}.
 {iconv, @iconv@}.
-{oauth, @oauth@}.
 
 %% Version
 {vsn, "@PACKAGE_VERSION@"}.