From b5cc4a3a7d59136022bcfeca4dda7fd11344d4ca Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Sun, 12 Jul 2015 20:58:22 +0200
Subject: [PATCH] Remove "--enable-nif" flag

Specifying "--enable-nif" or "--disable-nif" when running ejabberd's
configure script has no effect anymore: NIF support is enabled by
default and can only be disabled by building the p1_xml dependency with
"--disable-nif".
---
 configure.ac        | 15 +++------------
 rebar.config.script |  6 +-----
 vars.config.in      |  1 -
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 57b9aa747..13b1fe13b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,10 +100,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 (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-riak --enable-redis --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 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 redis=false elixir=false iconv=false debug=false lager=false tools=false ;;
+  yes) 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 ;;
+  no) 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 ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
@@ -115,14 +115,6 @@ AC_ARG_ENABLE(tools,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-tools) ;;
 esac],[if test "x$tools" = "x"; then tools=false; fi])
 
-AC_ARG_ENABLE(nif,
-[AC_HELP_STRING([--enable-nif], [replace some functions with C equivalents. Requires Erlang R13B04 or higher (default: no)])],
-[case "${enableval}" in
-  yes) nif=true ;;
-  no)  nif=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-nif) ;;
-esac],[if test "x$nif" = "x"; then nif=false; fi])
-
 AC_ARG_ENABLE(odbc,
 [AC_HELP_STRING([--enable-odbc], [enable pure ODBC support (default: no)])],
 [case "${enableval}" in
@@ -249,7 +241,6 @@ fi
 AC_SUBST(hipe)
 AC_SUBST(roster_gateway_workaround)
 AC_SUBST(full_xml)
-AC_SUBST(nif)
 AC_SUBST(db_type)
 AC_SUBST(odbc)
 AC_SUBST(mysql)
diff --git a/rebar.config.script b/rebar.config.script
index 0204e7b70..2642fc682 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -19,8 +19,6 @@ Cfg = case file:consult("vars.config") of
 Macros = lists:flatmap(
            fun({roster_gateway_workaround, true}) ->
                    [{d, 'ROSTER_GATEWAY_WORKAROUND'}];
-              ({nif, true}) ->
-                   [{d, 'NIF'}];
               ({db_type, mssql}) ->
                    [{d, 'mssql'}];
               ({lager, true}) ->
@@ -76,9 +74,7 @@ ConfigureCmd = fun(Pkg, Flags) ->
                end,
 
 XMLFlags = lists:foldl(
-             fun({nif, true}, Acc) ->
-                     Acc ++ " --enable-nif";
-                ({full_xml, true}, Acc) ->
+             fun({full_xml, true}, Acc) ->
                      Acc ++ " --enable-full-xml";
                 (_, Acc) ->
                      Acc
diff --git a/vars.config.in b/vars.config.in
index 5c37fb976..313e40b8d 100644
--- a/vars.config.in
+++ b/vars.config.in
@@ -9,7 +9,6 @@
 %% Macros
 {roster_gateway_workaround, @roster_gateway_workaround@}.
 {full_xml, @full_xml@}.
-{nif, @nif@}.
 {db_type, @db_type@}.
 {debug, @debug@}.
 {hipe, @hipe@}.