diff --git a/configure b/configure
index c0c21e2ac..74ee556e0 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for ejabberd community.
+# Generated by GNU Autoconf 2.69 for ejabberd community.
 #
 # Report bugs to <ejabberd@process-one.net>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +89,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -135,6 +134,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -213,14 +238,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -323,6 +359,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -444,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -478,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -499,28 +547,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1084,7 +1112,7 @@ Try \`$0 --help' for more information"
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1135,8 +1163,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1408,9 +1434,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 ejabberd configure community
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1458,7 +1484,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_erl_try_run
@@ -1467,7 +1493,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by ejabberd $as_me community, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -1725,7 +1751,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -1822,7 +1848,7 @@ REQUIRE_ERLANG_MAX="9.0.0 (No Max)"
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -1895,7 +1921,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1915,7 +1941,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -1973,7 +1999,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -1993,7 +2019,7 @@ do
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -2063,7 +2089,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}erl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ERL+set}" = set; then :
+if ${ac_cv_path_ERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ERL in
@@ -2077,7 +2103,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2106,7 +2132,7 @@ if test -z "$ac_cv_path_ERL"; then
 set dummy erl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_ERL+set}" = set; then :
+if ${ac_cv_path_ac_pt_ERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_ERL in
@@ -2120,7 +2146,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_ERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2161,7 +2187,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}erlc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ERLC+set}" = set; then :
+if ${ac_cv_path_ERLC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ERLC in
@@ -2175,7 +2201,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ERLC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2204,7 +2230,7 @@ if test -z "$ac_cv_path_ERLC"; then
 set dummy erlc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_ERLC+set}" = set; then :
+if ${ac_cv_path_ac_pt_ERLC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_ERLC in
@@ -2218,7 +2244,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_ERLC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2266,7 +2292,7 @@ else
 set dummy ${ac_tool_prefix}erl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ERL+set}" = set; then :
+if ${ac_cv_path_ERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ERL in
@@ -2280,7 +2306,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2309,7 +2335,7 @@ if test -z "$ac_cv_path_ERL"; then
 set dummy erl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_ERL+set}" = set; then :
+if ${ac_cv_path_ac_pt_ERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_ERL in
@@ -2323,7 +2349,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_ERL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2375,7 +2401,7 @@ else
 set dummy ${ac_tool_prefix}erlc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ERLC+set}" = set; then :
+if ${ac_cv_path_ERLC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ERLC in
@@ -2389,7 +2415,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ERLC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2418,7 +2444,7 @@ if test -z "$ac_cv_path_ERLC"; then
 set dummy erlc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_ERLC+set}" = set; then :
+if ${ac_cv_path_ac_pt_ERLC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_ERLC in
@@ -2432,7 +2458,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_ERLC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2482,10 +2508,168 @@ fi
 
 	case "$enable_erlang_version_check" in
 	yes|'')
-		ERLANG_VERSION_CHECK($REQUIRE_ERLANG_MIN,$REQUIRE_ERLANG_MAX)
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang/OTP version" >&5
+$as_echo_n "checking Erlang/OTP version... " >&6; }
+		cat > conftest.erl <<EOF
+-module(conftest).
+-export([start/0]).
+
+start() ->
+    ERTS = erlang:system_info(version),
+    RequiredMin = "$REQUIRE_ERLANG_MIN",
+    RequiredMax = "$REQUIRE_ERLANG_MAX",
+    Status =
+        case {string:tokens(RequiredMin, " "),
+              string:tokens(RequiredMax, " ")} of
+	    {[MinStr | _], [MaxStr | _]} ->
+                case check(ERTS, {MinStr, MaxStr}) of
+                    less ->
+                         list_to_binary([ERTS, " found, ", RequiredMin, " required"]);
+                    greater ->
+                         list_to_binary([ERTS, " found, ", RequiredMax, " or earlier required"]);
+                    ok ->
+	                 <<"ok">>
+                end;
+	    _ ->
+	        list_to_binary([ERTS, " found, ", RequiredMin, " required"])
+	end,
+    file:write_file("conftest.out", Status),
+    halt().
+
+check(CurStr, {MinStr, MaxStr}) ->
+    Cur = parse(CurStr),
+    Min = parse(MinStr),
+    Max = parse(MaxStr),
+    case {less_or_equal(Min, Cur), less_or_equal(Cur, Max)} of
+        {false, true} -> less;
+        {true, true} -> ok;
+        {true, false} -> greater
+    end.
+
+parse(Version) ->
+    lists:map(fun(A) -> {Int,[]} = string:to_integer(A), Int end,
+              string:tokens(Version, ".")).
+
+less_or_equal([], []) ->
+    true;
+less_or_equal([Left| Rl], [Right| Rr]) ->
+    case {Left < Right, Left == Right} of
+        {true, _}  ->
+            true;
+        {false, false} ->
+            false;
+        {false, true} ->
+            less_or_equal(Rl, Rr)
+    end.
+
+EOF
+
+	$ERLC conftest.erl || as_fn_error $? "\"Could not compile Erlang/OTP version check program using '$ERLC'\"" "$LINENO" 5
+
+	if ! $ERL -s conftest -noshell -o ! -f conftest.out ; then
+	   as_fn_error $? "\"Could not run Erlang/OTP version check program using '$ERL'\"" "$LINENO" 5
+	fi
+
+	if test "x`cat conftest.out`" != "xok"; then
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+	   X="`cat conftest.out`"
+	   if test "" == "warn"; then
+	      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $X" >&5
+$as_echo "$as_me: WARNING: $X" >&2;}
+	   else
+	      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "$X
+See \`config.log' for more details" "$LINENO" 5; }
+	   fi
+	else
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+	fi
+
 		;;
 	no)
-		ERLANG_VERSION_CHECK($REQUIRE_ERLANG_MIN,$REQUIRE_ERLANG_MAX,warn)
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang/OTP version" >&5
+$as_echo_n "checking Erlang/OTP version... " >&6; }
+		cat > conftest.erl <<EOF
+-module(conftest).
+-export([start/0]).
+
+start() ->
+    ERTS = erlang:system_info(version),
+    RequiredMin = "$REQUIRE_ERLANG_MIN",
+    RequiredMax = "$REQUIRE_ERLANG_MAX",
+    Status =
+        case {string:tokens(RequiredMin, " "),
+              string:tokens(RequiredMax, " ")} of
+	    {[MinStr | _], [MaxStr | _]} ->
+                case check(ERTS, {MinStr, MaxStr}) of
+                    less ->
+                         list_to_binary([ERTS, " found, ", RequiredMin, " required"]);
+                    greater ->
+                         list_to_binary([ERTS, " found, ", RequiredMax, " or earlier required"]);
+                    ok ->
+	                 <<"ok">>
+                end;
+	    _ ->
+	        list_to_binary([ERTS, " found, ", RequiredMin, " required"])
+	end,
+    file:write_file("conftest.out", Status),
+    halt().
+
+check(CurStr, {MinStr, MaxStr}) ->
+    Cur = parse(CurStr),
+    Min = parse(MinStr),
+    Max = parse(MaxStr),
+    case {less_or_equal(Min, Cur), less_or_equal(Cur, Max)} of
+        {false, true} -> less;
+        {true, true} -> ok;
+        {true, false} -> greater
+    end.
+
+parse(Version) ->
+    lists:map(fun(A) -> {Int,[]} = string:to_integer(A), Int end,
+              string:tokens(Version, ".")).
+
+less_or_equal([], []) ->
+    true;
+less_or_equal([Left| Rl], [Right| Rr]) ->
+    case {Left < Right, Left == Right} of
+        {true, _}  ->
+            true;
+        {false, false} ->
+            false;
+        {false, true} ->
+            less_or_equal(Rl, Rr)
+    end.
+
+EOF
+
+	$ERLC conftest.erl || as_fn_error $? "\"Could not compile Erlang/OTP version check program using '$ERLC'\"" "$LINENO" 5
+
+	if ! $ERL -s conftest -noshell -o ! -f conftest.out ; then
+	   as_fn_error $? "\"Could not run Erlang/OTP version check program using '$ERL'\"" "$LINENO" 5
+	fi
+
+	if test "x`cat conftest.out`" != "xok"; then
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+	   X="`cat conftest.out`"
+	   if test "warn" == "warn"; then
+	      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $X" >&5
+$as_echo "$as_me: WARNING: $X" >&2;}
+	   else
+	      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "$X
+See \`config.log' for more details" "$LINENO" 5; }
+	   fi
+	else
+	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+	fi
+
 		;;
 esac
 
@@ -2493,7 +2677,7 @@ esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP root directory" >&5
 $as_echo_n "checking for Erlang/OTP root directory... " >&6; }
-if test "${ac_cv_erlang_root_dir+set}" = set; then :
+if ${ac_cv_erlang_root_dir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -2503,7 +2687,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -2525,7 +2709,7 @@ else
 	 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -2550,7 +2734,7 @@ ERLANG_ROOT_DIR=$ac_cv_erlang_root_dir
 set dummy escript; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ESCRIPT+set}" = set; then :
+if ${ac_cv_path_ESCRIPT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ESCRIPT in
@@ -2564,7 +2748,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ESCRIPT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2592,7 +2776,7 @@ fi
 set dummy make; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_MAKE+set}" = set; then :
+if ${ac_cv_prog_MAKE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MAKE"; then
@@ -2604,7 +2788,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MAKE="make"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2642,7 +2826,7 @@ if test "${enable_hipe+set}" = set; then :
   enableval=$enable_hipe; case "${enableval}" in
   yes) hipe=true ;;
   no)  hipe=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-hipe" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-hipe" "$LINENO" 5 ;;
 esac
 else
   hipe=false
@@ -2654,7 +2838,7 @@ if test "${enable_roster_gateway_workaround+set}" = set; then :
   enableval=$enable_roster_gateway_workaround; case "${enableval}" in
   yes) roster_gateway_workaround=true ;;
   no)  roster_gateway_workaround=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-roster-gateway-workaround" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-roster-gateway-workaround" "$LINENO" 5 ;;
 esac
 else
   roster_gateway_workaround=false
@@ -2666,7 +2850,7 @@ if test "${enable_transient_supervisors+set}" = set; then :
   enableval=$enable_transient_supervisors; case "${enableval}" in
   yes) transient_supervisors=true ;;
   no)  transient_supervisors=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-transient_supervisors" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-transient_supervisors" "$LINENO" 5 ;;
 esac
 else
   transient_supervisors=false
@@ -2678,7 +2862,7 @@ if test "${enable_full_xml+set}" = set; then :
   enableval=$enable_full_xml; case "${enableval}" in
   yes) full_xml=true ;;
   no)  full_xml=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-full-xml" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-full-xml" "$LINENO" 5 ;;
 esac
 else
   full_xml=false
@@ -2690,7 +2874,7 @@ if test "${enable_mssql+set}" = set; then :
   enableval=$enable_mssql; case "${enableval}" in
   yes) db_type=mssql ;;
   no)  db_type=generic ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-mssql" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-mssql" "$LINENO" 5 ;;
 esac
 else
   db_type=generic
@@ -2702,7 +2886,7 @@ if test "${enable_tools+set}" = set; then :
   enableval=$enable_tools; case "${enableval}" in
   yes) tools=true ;;
   no)  tools=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-tools" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-tools" "$LINENO" 5 ;;
 esac
 else
   tools=false
@@ -2714,7 +2898,7 @@ if test "${enable_all+set}" = set; then :
   enableval=$enable_all; case "${enableval}" in
   yes) nif=true odbc=true mysql=true pgsql=true pam=true zlib=true stun=true json=true iconv=true debug=true http=true ;;
   no) nif=false odbc=false mysql=false pgsql=false pam=false zlib=false stun=false json=false iconv=false debug=false http=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-all" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-all" "$LINENO" 5 ;;
 esac
 fi
 
@@ -2724,7 +2908,7 @@ if test "${enable_nif+set}" = set; then :
   enableval=$enable_nif; case "${enableval}" in
   yes) nif=true ;;
   no)  nif=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-nif" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-nif" "$LINENO" 5 ;;
 esac
 else
   if test "x$nif" = "x"; then nif=false; fi
@@ -2736,7 +2920,7 @@ if test "${enable_odbc+set}" = set; then :
   enableval=$enable_odbc; case "${enableval}" in
   yes) odbc=true ;;
   no)  odbc=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-odbc" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-odbc" "$LINENO" 5 ;;
 esac
 else
   if test "x$odbc" = "x"; then odbc=false; fi
@@ -2748,7 +2932,7 @@ if test "${enable_mysql+set}" = set; then :
   enableval=$enable_mysql; case "${enableval}" in
   yes) mysql=true ;;
   no)  mysql=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-mysql" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-mysql" "$LINENO" 5 ;;
 esac
 else
   if test "x$mysql" = "x"; then mysql=false; fi
@@ -2760,7 +2944,7 @@ if test "${enable_pgsql+set}" = set; then :
   enableval=$enable_pgsql; case "${enableval}" in
   yes) pgsql=true ;;
   no)  pgsql=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-pgsql" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-pgsql" "$LINENO" 5 ;;
 esac
 else
   if test "x$pgsql" = "x"; then pgsql=false; fi
@@ -2772,7 +2956,7 @@ if test "${enable_pam+set}" = set; then :
   enableval=$enable_pam; case "${enableval}" in
   yes) pam=true ;;
   no)  pam=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-pam" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-pam" "$LINENO" 5 ;;
 esac
 else
   if test "x$pam" = "x"; then pam=false; fi
@@ -2784,7 +2968,7 @@ if test "${enable_zlib+set}" = set; then :
   enableval=$enable_zlib; case "${enableval}" in
   yes) zlib=true ;;
   no)  zlib=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-zlib" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-zlib" "$LINENO" 5 ;;
 esac
 else
   if test "x$zlib" = "x"; then zlib=true; fi
@@ -2796,7 +2980,7 @@ if test "${enable_stun+set}" = set; then :
   enableval=$enable_stun; case "${enableval}" in
   yes) stun=true ;;
   no)  stun=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-stun" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-stun" "$LINENO" 5 ;;
 esac
 else
   if test "x$stun" = "x"; then stun=false; fi
@@ -2808,7 +2992,7 @@ if test "${enable_json+set}" = set; then :
   enableval=$enable_json; case "${enableval}" in
   yes) json=true ;;
   no)  json=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-json" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-json" "$LINENO" 5 ;;
 esac
 else
   if test "x$json" = "x"; then json=false; fi
@@ -2820,7 +3004,7 @@ if test "${enable_iconv+set}" = set; then :
   enableval=$enable_iconv; case "${enableval}" in
   yes) iconv=true ;;
   no)  iconv=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-iconv" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-iconv" "$LINENO" 5 ;;
 esac
 else
   if test "x$iconv" = "x"; then iconv=true; fi
@@ -2832,7 +3016,7 @@ if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; case "${enableval}" in
   yes) debug=true ;;
   no)  debug=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
 esac
 else
   if test "x$debug" = "x"; then debug=true; fi
@@ -2844,7 +3028,7 @@ if test "${enable_http+set}" = set; then :
   enableval=$enable_http; case "${enableval}" in
   yes) http=true ;;
   no)  http=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-http" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-http" "$LINENO" 5 ;;
 esac
 else
   if test "x$http" = "x"; then http=false; fi
@@ -2856,7 +3040,7 @@ if test "${enable_lager+set}" = set; then :
   enableval=$enable_lager; case "${enableval}" in
   yes) lager=true ;;
   no)  lager=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-lager" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-lager" "$LINENO" 5 ;;
 esac
 else
   if test "x$lager" = "x"; then lager=false; fi
@@ -2884,7 +3068,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'sasl' library subdirectory" >&5
 $as_echo_n "checking for Erlang/OTP 'sasl' library subdirectory... " >&6; }
-if test "${ac_cv_erlang_lib_dir_sasl+set}" = set; then :
+if ${ac_cv_erlang_lib_dir_sasl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -2894,7 +3078,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -2921,7 +3105,7 @@ else
 	     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 	 else
 	     ac_cv_erlang_lib_dir_sasl="not found"
 	     rm -f conftest.out
@@ -2942,7 +3126,7 @@ fi
 $as_echo "$ac_cv_erlang_lib_dir_sasl" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'sasl' library version" >&5
 $as_echo_n "checking for Erlang/OTP 'sasl' library version... " >&6; }
-if test "${ac_cv_erlang_lib_ver_sasl+set}" = set; then :
+if ${ac_cv_erlang_lib_ver_sasl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_erlang_lib_dir_sasl" = "not found"; then :
@@ -2963,7 +3147,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'crypto' library subdirectory" >&5
 $as_echo_n "checking for Erlang/OTP 'crypto' library subdirectory... " >&6; }
-if test "${ac_cv_erlang_lib_dir_crypto+set}" = set; then :
+if ${ac_cv_erlang_lib_dir_crypto+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -2973,7 +3157,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -3000,7 +3184,7 @@ else
 	     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 	 else
 	     ac_cv_erlang_lib_dir_crypto="not found"
 	     rm -f conftest.out
@@ -3021,7 +3205,7 @@ fi
 $as_echo "$ac_cv_erlang_lib_dir_crypto" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'crypto' library version" >&5
 $as_echo_n "checking for Erlang/OTP 'crypto' library version... " >&6; }
-if test "${ac_cv_erlang_lib_ver_crypto+set}" = set; then :
+if ${ac_cv_erlang_lib_ver_crypto+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_erlang_lib_dir_crypto" = "not found"; then :
@@ -3042,7 +3226,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'public_key' library subdirectory" >&5
 $as_echo_n "checking for Erlang/OTP 'public_key' library subdirectory... " >&6; }
-if test "${ac_cv_erlang_lib_dir_public_key+set}" = set; then :
+if ${ac_cv_erlang_lib_dir_public_key+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -3052,7 +3236,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -3079,7 +3263,7 @@ else
 	     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 	 else
 	     ac_cv_erlang_lib_dir_public_key="not found"
 	     rm -f conftest.out
@@ -3100,7 +3284,7 @@ fi
 $as_echo "$ac_cv_erlang_lib_dir_public_key" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'public_key' library version" >&5
 $as_echo_n "checking for Erlang/OTP 'public_key' library version... " >&6; }
-if test "${ac_cv_erlang_lib_ver_public_key+set}" = set; then :
+if ${ac_cv_erlang_lib_ver_public_key+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_erlang_lib_dir_public_key" = "not found"; then :
@@ -3121,7 +3305,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'ssl' library subdirectory" >&5
 $as_echo_n "checking for Erlang/OTP 'ssl' library subdirectory... " >&6; }
-if test "${ac_cv_erlang_lib_dir_ssl+set}" = set; then :
+if ${ac_cv_erlang_lib_dir_ssl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -3131,7 +3315,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -3158,7 +3342,7 @@ else
 	     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 	 else
 	     ac_cv_erlang_lib_dir_ssl="not found"
 	     rm -f conftest.out
@@ -3179,7 +3363,7 @@ fi
 $as_echo "$ac_cv_erlang_lib_dir_ssl" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'ssl' library version" >&5
 $as_echo_n "checking for Erlang/OTP 'ssl' library version... " >&6; }
-if test "${ac_cv_erlang_lib_ver_ssl+set}" = set; then :
+if ${ac_cv_erlang_lib_ver_ssl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_erlang_lib_dir_ssl" = "not found"; then :
@@ -3200,7 +3384,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'mnesia' library subdirectory" >&5
 $as_echo_n "checking for Erlang/OTP 'mnesia' library subdirectory... " >&6; }
-if test "${ac_cv_erlang_lib_dir_mnesia+set}" = set; then :
+if ${ac_cv_erlang_lib_dir_mnesia+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -3210,7 +3394,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -3237,7 +3421,7 @@ else
 	     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 	 else
 	     ac_cv_erlang_lib_dir_mnesia="not found"
 	     rm -f conftest.out
@@ -3258,7 +3442,7 @@ fi
 $as_echo "$ac_cv_erlang_lib_dir_mnesia" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'mnesia' library version" >&5
 $as_echo_n "checking for Erlang/OTP 'mnesia' library version... " >&6; }
-if test "${ac_cv_erlang_lib_ver_mnesia+set}" = set; then :
+if ${ac_cv_erlang_lib_ver_mnesia+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_erlang_lib_dir_mnesia" = "not found"; then :
@@ -3279,7 +3463,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'inets' library subdirectory" >&5
 $as_echo_n "checking for Erlang/OTP 'inets' library subdirectory... " >&6; }
-if test "${ac_cv_erlang_lib_dir_inets+set}" = set; then :
+if ${ac_cv_erlang_lib_dir_inets+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -3289,7 +3473,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -3316,7 +3500,7 @@ else
 	     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 	 else
 	     ac_cv_erlang_lib_dir_inets="not found"
 	     rm -f conftest.out
@@ -3337,7 +3521,7 @@ fi
 $as_echo "$ac_cv_erlang_lib_dir_inets" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'inets' library version" >&5
 $as_echo_n "checking for Erlang/OTP 'inets' library version... " >&6; }
-if test "${ac_cv_erlang_lib_ver_inets+set}" = set; then :
+if ${ac_cv_erlang_lib_ver_inets+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_erlang_lib_dir_inets" = "not found"; then :
@@ -3358,7 +3542,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'compiler' library subdirectory" >&5
 $as_echo_n "checking for Erlang/OTP 'compiler' library subdirectory... " >&6; }
-if test "${ac_cv_erlang_lib_dir_compiler+set}" = set; then :
+if ${ac_cv_erlang_lib_dir_compiler+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -3368,7 +3552,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -3395,7 +3579,7 @@ else
 	     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 	 else
 	     ac_cv_erlang_lib_dir_compiler="not found"
 	     rm -f conftest.out
@@ -3416,7 +3600,7 @@ fi
 $as_echo "$ac_cv_erlang_lib_dir_compiler" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'compiler' library version" >&5
 $as_echo_n "checking for Erlang/OTP 'compiler' library version... " >&6; }
-if test "${ac_cv_erlang_lib_ver_compiler+set}" = set; then :
+if ${ac_cv_erlang_lib_ver_compiler+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_erlang_lib_dir_compiler" = "not found"; then :
@@ -3438,7 +3622,7 @@ fi
 if test "x$odbc" = "xtrue"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'odbc' library subdirectory" >&5
 $as_echo_n "checking for Erlang/OTP 'odbc' library subdirectory... " >&6; }
-if test "${ac_cv_erlang_lib_dir_odbc+set}" = set; then :
+if ${ac_cv_erlang_lib_dir_odbc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -3448,7 +3632,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -3475,7 +3659,7 @@ else
 	     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 	 else
 	     ac_cv_erlang_lib_dir_odbc="not found"
 	     rm -f conftest.out
@@ -3496,7 +3680,7 @@ fi
 $as_echo "$ac_cv_erlang_lib_dir_odbc" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'odbc' library version" >&5
 $as_echo_n "checking for Erlang/OTP 'odbc' library version... " >&6; }
-if test "${ac_cv_erlang_lib_ver_odbc+set}" = set; then :
+if ${ac_cv_erlang_lib_ver_odbc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_erlang_lib_dir_odbc" = "not found"; then :
@@ -3519,7 +3703,7 @@ fi
 if test "x$tools" = "xtrue"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'tools' library subdirectory" >&5
 $as_echo_n "checking for Erlang/OTP 'tools' library subdirectory... " >&6; }
-if test "${ac_cv_erlang_lib_dir_tools+set}" = set; then :
+if ${ac_cv_erlang_lib_dir_tools+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -3529,7 +3713,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -3556,7 +3740,7 @@ else
 	     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 	 else
 	     ac_cv_erlang_lib_dir_tools="not found"
 	     rm -f conftest.out
@@ -3577,7 +3761,7 @@ fi
 $as_echo "$ac_cv_erlang_lib_dir_tools" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'tools' library version" >&5
 $as_echo_n "checking for Erlang/OTP 'tools' library version... " >&6; }
-if test "${ac_cv_erlang_lib_ver_tools+set}" = set; then :
+if ${ac_cv_erlang_lib_ver_tools+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_erlang_lib_dir_tools" = "not found"; then :
@@ -3598,7 +3782,7 @@ fi
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'runtime_tools' library subdirectory" >&5
 $as_echo_n "checking for Erlang/OTP 'runtime_tools' library subdirectory... " >&6; }
-if test "${ac_cv_erlang_lib_dir_runtime_tools+set}" = set; then :
+if ${ac_cv_erlang_lib_dir_runtime_tools+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=erl
@@ -3608,7 +3792,7 @@ ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&5 && echo "#!/bin/sh" > con
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat > conftest.$ac_ext <<_ACEOF
 -module(conftest).
@@ -3635,7 +3819,7 @@ else
 	     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "test Erlang program execution failed
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 	 else
 	     ac_cv_erlang_lib_dir_runtime_tools="not found"
 	     rm -f conftest.out
@@ -3656,7 +3840,7 @@ fi
 $as_echo "$ac_cv_erlang_lib_dir_runtime_tools" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Erlang/OTP 'runtime_tools' library version" >&5
 $as_echo_n "checking for Erlang/OTP 'runtime_tools' library version... " >&6; }
-if test "${ac_cv_erlang_lib_ver_runtime_tools+set}" = set; then :
+if ${ac_cv_erlang_lib_ver_runtime_tools+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_erlang_lib_dir_runtime_tools" = "not found"; then :
@@ -3760,10 +3944,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -3831,7 +4026,7 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -3932,6 +4127,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4127,16 +4323,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -4196,28 +4392,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -4239,7 +4423,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by ejabberd $as_me community, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4292,10 +4476,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 ejabberd config.status community
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -4373,7 +4557,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -4406,7 +4590,7 @@ do
     "vars.config") CONFIG_FILES="$CONFIG_FILES vars.config" ;;
     "src/ejabberd.app.src") CONFIG_FILES="$CONFIG_FILES src/ejabberd.app.src" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -4427,9 +4611,10 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -4437,12 +4622,13 @@ $debug ||
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -4464,7 +4650,7 @@ else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -4492,7 +4678,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -4540,7 +4726,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -4572,7 +4758,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -4612,7 +4798,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -4631,7 +4817,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -4640,7 +4826,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -4666,8 +4852,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -4797,21 +4983,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;