From 5eab6e315e9390d918fa3e185ff679e1fb3b90c4 Mon Sep 17 00:00:00 2001
From: Christophe Romain <christophe.romain@process-one.net>
Date: Fri, 25 Sep 2015 16:08:34 +0200
Subject: [PATCH] Revert "Remove "--enable-json" flag"

This reverts commit 5bb137940c11fbd5d0c4da493e3a4560fbfe2d97.
This is needed for mod_http_api
---
 configure.ac              | 15 ++++++++++++---
 rebar.config.script       |  4 ++++
 rel/reltool.config.script |  1 +
 vars.config.in            |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 69fd3cef5..85d208c10 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-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 --enable-oauth (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 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 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 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 ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
@@ -195,6 +195,14 @@ AC_ARG_ENABLE(redis,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-redis) ;;
 esac],[if test "x$redis" = "x"; then redis=false; fi])
 
+AC_ARG_ENABLE(json,
+[AC_HELP_STRING([--enable-json], [enable JSON support for mod_bosh (default: no)])],
+[case "${enableval}" in
+  yes) json=true ;;
+  no)  json=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-json) ;;
+esac],[if test "x$json" = "x"; then json=false; fi])
+
 AC_ARG_ENABLE(elixir,
 [AC_HELP_STRING([--enable-elixir], [enable Elixir support (default: no)])],
 [case "${enableval}" in
@@ -276,6 +284,7 @@ AC_SUBST(pam)
 AC_SUBST(zlib)
 AC_SUBST(riak)
 AC_SUBST(redis)
+AC_SUBST(json)
 AC_SUBST(elixir)
 AC_SUBST(iconv)
 AC_SUBST(debug)
diff --git a/rebar.config.script b/rebar.config.script
index 2ecb39c25..fb5f4126e 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -97,6 +97,8 @@ CfgDeps = lists:flatmap(
                     [{p1_zlib, ".*", {git, "https://github.com/processone/zlib"}}];
                ({riak, true}) ->
                     [{riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", {tag, "1.4.2"}}}];
+               ({json, true}) ->
+                    [{jiffy, ".*", {git, "https://github.com/davisp/jiffy"}}];
                ({elixir, true}) ->
                     [{rebar_elixir_plugin, ".*", {git, "https://github.com/yrashk/rebar_elixir_plugin"}},
                      {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {branch, "v1.0"}}}];
@@ -142,6 +144,8 @@ CfgXrefs = lists:flatmap(
 		({riak, true}) ->
 		     % used in map-reduce function called from riak vm
 		     ["(\"riak_object\":_/_)"];
+		({json, false}) ->
+		    ["(\"jiffy\":_/_)"];
 		({zlib, false}) ->
 		     ["(\"ezlib\":_/_)"];
 		({http, false}) ->
diff --git a/rel/reltool.config.script b/rel/reltool.config.script
index 7d495b8a4..09dd83657 100644
--- a/rel/reltool.config.script
+++ b/rel/reltool.config.script
@@ -36,6 +36,7 @@ DepConfiguredApps = lists:flatmap(
                          ({pam, true}) -> [p1_pam];
                          ({zlib, true}) -> [p1_zlib];
                          ({stun, true}) -> [p1_stun];
+                         ({json, true}) -> [jiffy];
                          ({iconv, true}) -> [p1_iconv];
                          ({lager, true}) -> [lager, goldrush];
                          ({lager, false}) -> [p1_logger];
diff --git a/vars.config.in b/vars.config.in
index 74904724a..bb5b2ae0c 100644
--- a/vars.config.in
+++ b/vars.config.in
@@ -28,6 +28,7 @@
 {zlib, @zlib@}.
 {riak, @riak@}.
 {redis, @redis@}.
+{json, @json@}.
 {elixir, @elixir@}.
 {lager, @lager@}.
 {iconv, @iconv@}.