rbnacl-libsodium 1.0.11 → 1.0.13

data/vendor/libsodium/autom4te.cache/output.1

@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.11.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.13.
 @%:@
 @%:@ Report bugs to <https://github.com/jedisct1/libsodium/issues>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libsodium'
 PACKAGE_TARNAME='libsodium'
-PACKAGE_VERSION='1.0.11'
-PACKAGE_STRING='libsodium 1.0.11'
+PACKAGE_VERSION='1.0.13'
+PACKAGE_STRING='libsodium 1.0.13'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -691,10 +691,12 @@ CCASDEPMODE
 CCASFLAGS
 CCAS
 VALGRIND_CHECK_RULES
-VALGRIND_HAVE_TOOL_exp_sgcheck
-VALGRIND_HAVE_TOOL_drd
-VALGRIND_HAVE_TOOL_helgrind
-VALGRIND_HAVE_TOOL_memcheck
+valgrind_enabled_tools
+valgrind_tools
+ENABLE_VALGRIND_sgcheck
+ENABLE_VALGRIND_drd
+ENABLE_VALGRIND_helgrind
+ENABLE_VALGRIND_memcheck
 VALGRIND_ENABLED
 VALGRIND_ENABLED_FALSE
 VALGRIND_ENABLED_TRUE
@@ -721,6 +723,7 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+SODIUM_LIBRARY_MINIMAL_DEF
 MINIMAL_FALSE
 MINIMAL_TRUE
 DLL_VERSION
@@ -824,6 +827,10 @@ with_safecode
 enable_debug
 enable_opt
 enable_valgrind
+enable_valgrind_memcheck
+enable_valgrind_helgrind
+enable_valgrind_drd
+enable_valgrind_sgcheck
 enable_soname_versions
 enable_shared
 enable_static
@@ -1389,7 +1396,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libsodium 1.0.11 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1459,7 +1466,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 1.0.11:";;
+     short | recursive ) echo "Configuration of libsodium 1.0.13:";;
    esac
   cat <<\_ACEOF
 
@@ -1477,7 +1484,9 @@ Optional Features:
   --disable-dependency-tracking 
                           speeds up one-time build
   --disable-ssp           Do not compile with -fstack-protector
-  --disable-asm           Disable assembly implementations
+  --disable-asm           Do not compile assembly code -- This disables all
+                          (including non-assembly) platform-specific
+                          optimizations on Unix systems
   --disable-pie           Do not produce position independent executables
   --enable-blocking-random 
                           Enable this switch only if /dev/urandom is totally
@@ -1489,6 +1498,13 @@ Optional Features:
                           will be faster but not portable
   --enable-valgrind       Whether to enable Valgrind on the unit tests
                           (requires GNU make)
+  --disable-valgrind-memcheck 
+                          Whether to skip memcheck during the Valgrind tests
+  --disable-valgrind-helgrind 
+                          Whether to skip helgrind during the Valgrind tests
+  --disable-valgrind-drd  Whether to skip drd during the Valgrind tests
+  --disable-valgrind-sgcheck 
+                          Whether to skip sgcheck during the Valgrind tests
   --enable-soname-versions 
                           enable soname versions (must be disabled for
                           Android) (default: enabled)
@@ -1598,7 +1614,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 1.0.11
+libsodium configure 1.0.13
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1967,7 +1983,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libsodium $as_me 1.0.11, which was
+It was created by libsodium $as_me 1.0.13, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2903,7 +2919,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='1.0.11'
+ VERSION='1.0.13'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3199,9 +3215,9 @@ ISODATE=`date +%Y-%m-%d`
 
 
 SODIUM_LIBRARY_VERSION_MAJOR=9
-SODIUM_LIBRARY_VERSION_MINOR=3
+SODIUM_LIBRARY_VERSION_MINOR=5
 DLL_VERSION=8
-SODIUM_LIBRARY_VERSION=19:1:1
+SODIUM_LIBRARY_VERSION=21:0:3
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -3218,6 +3234,7 @@ SODIUM_LIBRARY_VERSION=19:1:1
 
 
 
+
 LX_CFLAGS=${CFLAGS-NONE}
 
 
@@ -3317,6 +3334,10 @@ if test "${enable_minimal+set}" = set; then :
   if test "x$enableval" = "xyes"; then :
   
     enable_minimal="yes"
+    SODIUM_LIBRARY_MINIMAL_DEF="#define SODIUM_LIBRARY_MINIMAL 1"
+    
+$as_echo "@%:@define MINIMAL 1" >>confdefs.h
+
   
 else
   
@@ -3340,6 +3361,7 @@ fi
 
 
 
+
 @%:@ Check whether --with-pthreads was given.
 if test "${with_pthreads+set}" = set; then :
   withval=$with_pthreads;  
@@ -4728,17 +4750,17 @@ ax_pthread_ok=no
 # etcetera environment variables, and if threads linking works using
 # them:
 if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-	ax_pthread_save_CC="$CC"
-	ax_pthread_save_CFLAGS="$CFLAGS"
-	ax_pthread_save_LIBS="$LIBS"
-	if test "x$PTHREAD_CC" != "x"; then :
+        ax_pthread_save_CC="$CC"
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        if test "x$PTHREAD_CC" != "x"; then :
   CC="$PTHREAD_CC"
 fi
-	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-	LIBS="$PTHREAD_LIBS $LIBS"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5
 $as_echo_n "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; }
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -4761,15 +4783,15 @@ if ac_fn_c_try_link "$LINENO"; then :
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
 $as_echo "$ax_pthread_ok" >&6; }
-	if test "x$ax_pthread_ok" = "xno"; then
-		PTHREAD_LIBS=""
-		PTHREAD_CFLAGS=""
-	fi
-	CC="$ax_pthread_save_CC"
-	CFLAGS="$ax_pthread_save_CFLAGS"
-	LIBS="$ax_pthread_save_LIBS"
+        if test "x$ax_pthread_ok" = "xno"; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        CC="$ax_pthread_save_CC"
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
 fi
 
 # We must check for the threads library under a number of different
@@ -4806,36 +4828,36 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --
 
 case $host_os in
 
-	freebsd*)
+        freebsd*)
 
-	# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-	# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
 
-	ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-	;;
+        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
+        ;;
 
-	hpux*)
+        hpux*)
 
-	# From the cc(1) man page: "[-mt] Sets various -D flags to enable
-	# multi-threading and also sets -lpthread."
+        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
+        # multi-threading and also sets -lpthread."
 
-	ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-	;;
+        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
+        ;;
 
-	openedition*)
+        openedition*)
 
-	# IBM z/OS requires a feature-test macro to be defined in order to
-	# enable POSIX threads at all, so give the user a hint if this is
-	# not set. (We don't define these ourselves, as they can affect
-	# other portions of the system API in unpredictable ways.)
+        # IBM z/OS requires a feature-test macro to be defined in order to
+        # enable POSIX threads at all, so give the user a hint if this is
+        # not set. (We don't define these ourselves, as they can affect
+        # other portions of the system API in unpredictable ways.)
 
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#	     if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-	     AX_PTHREAD_ZOS_MISSING
-#	     endif
-	    
+#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
+             AX_PTHREAD_ZOS_MISSING
+#            endif
+            
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1; then :
@@ -4844,20 +4866,20 @@ $as_echo "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREAD
 fi
 rm -f conftest*
 
-	;;
+        ;;
 
-	solaris*)
+        solaris*)
 
-	# On Solaris (at least, for some versions), libc contains stubbed
-	# (non-functional) versions of the pthreads routines, so link-based
-	# tests will erroneously succeed. (N.B.: The stubs are missing
-	# pthread_cleanup_push, or rather a function called by this macro,
-	# so we could check for that, but who knows whether they'll stub
-	# that too in a future libc.)  So we'll check first for the
-	# standard Solaris way of linking pthreads (-mt -lpthread).
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed. (N.B.: The stubs are missing
+        # pthread_cleanup_push, or rather a function called by this macro,
+        # so we could check for that, but who knows whether they'll stub
+        # that too in a future libc.)  So we'll check first for the
+        # standard Solaris way of linking pthreads (-mt -lpthread).
 
-	ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
-	;;
+        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
+        ;;
 esac
 
 # GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
@@ -4871,17 +4893,17 @@ fi
 # correctly enabled
 
 case $host_os in
-	darwin* | hpux* | linux* | osf* | solaris*)
-	ax_pthread_check_macro="_REENTRANT"
-	;;
+        darwin* | hpux* | linux* | osf* | solaris*)
+        ax_pthread_check_macro="_REENTRANT"
+        ;;
 
-	aix* | freebsd*)
-	ax_pthread_check_macro="_THREAD_SAFE"
-	;;
+        aix*)
+        ax_pthread_check_macro="_THREAD_SAFE"
+        ;;
 
-	*)
-	ax_pthread_check_macro="--"
-	;;
+        *)
+        ax_pthread_check_macro="--"
+        ;;
 esac
 if test "x$ax_pthread_check_macro" = "x--"; then :
   ax_pthread_check_cond=0
@@ -4899,13 +4921,13 @@ else
   ax_cv_PTHREAD_CLANG=no
      # Note that Autoconf sets GCC=yes for Clang as well as GCC
      if test "x$GCC" = "xyes"; then
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-#	     if defined(__clang__) && defined(__llvm__)
-	     AX_PTHREAD_CC_IS_CLANG
-#	     endif
-	    
+#            if defined(__clang__) && defined(__llvm__)
+             AX_PTHREAD_CC_IS_CLANG
+#            endif
+            
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1; then :
@@ -4927,70 +4949,70 @@ ax_pthread_clang_warning=no
 
 if test "x$ax_pthread_clang" = "xyes"; then
 
-	# Clang takes -pthread; it has never supported any other flag
-
-	# (Note 1: This will need to be revisited if a system that Clang
-	# supports has POSIX threads in a separate library.  This tends not
-	# to be the way of modern systems, but it's conceivable.)
-
-	# (Note 2: On some systems, notably Darwin, -pthread is not needed
-	# to get POSIX threads support; the API is always present and
-	# active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-	# -pthread does define _REENTRANT, and while the Darwin headers
-	# ignore this macro, third-party headers might not.)
-
-	PTHREAD_CFLAGS="-pthread"
-	PTHREAD_LIBS=
-
-	ax_pthread_ok=yes
-
-	# However, older versions of Clang make a point of warning the user
-	# that, in an invocation where only linking and no compilation is
-	# taking place, the -pthread option has no effect ("argument unused
-	# during compilation").  They expect -pthread to be passed in only
-	# when source code is being compiled.
-	#
-	# Problem is, this is at odds with the way Automake and most other
-	# C build frameworks function, which is that the same flags used in
-	# compilation (CFLAGS) are also used in linking.  Many systems
-	# supported by AX_PTHREAD require exactly this for POSIX threads
-	# support, and in fact it is often not straightforward to specify a
-	# flag that is used only in the compilation phase and not in
-	# linking.  Such a scenario is extremely rare in practice.
-	#
-	# Even though use of the -pthread flag in linking would only print
-	# a warning, this can be a nuisance for well-run software projects
-	# that build with -Werror.  So if the active version of Clang has
-	# this misfeature, we search for an option to squash it.
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5
+        # Clang takes -pthread; it has never supported any other flag
+
+        # (Note 1: This will need to be revisited if a system that Clang
+        # supports has POSIX threads in a separate library.  This tends not
+        # to be the way of modern systems, but it's conceivable.)
+
+        # (Note 2: On some systems, notably Darwin, -pthread is not needed
+        # to get POSIX threads support; the API is always present and
+        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
+        # -pthread does define _REENTRANT, and while the Darwin headers
+        # ignore this macro, third-party headers might not.)
+
+        PTHREAD_CFLAGS="-pthread"
+        PTHREAD_LIBS=
+
+        ax_pthread_ok=yes
+
+        # However, older versions of Clang make a point of warning the user
+        # that, in an invocation where only linking and no compilation is
+        # taking place, the -pthread option has no effect ("argument unused
+        # during compilation").  They expect -pthread to be passed in only
+        # when source code is being compiled.
+        #
+        # Problem is, this is at odds with the way Automake and most other
+        # C build frameworks function, which is that the same flags used in
+        # compilation (CFLAGS) are also used in linking.  Many systems
+        # supported by AX_PTHREAD require exactly this for POSIX threads
+        # support, and in fact it is often not straightforward to specify a
+        # flag that is used only in the compilation phase and not in
+        # linking.  Such a scenario is extremely rare in practice.
+        #
+        # Even though use of the -pthread flag in linking would only print
+        # a warning, this can be a nuisance for well-run software projects
+        # that build with -Werror.  So if the active version of Clang has
+        # this misfeature, we search for an option to squash it.
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5
 $as_echo_n "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; }
 if ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-	     # Create an alternate version of $ac_link that compiles and
-	     # links in two steps (.c -> .o, .o -> exe) instead of one
-	     # (.c -> exe), because the warning occurs only in the second
-	     # step
-	     ax_pthread_save_ac_link="$ac_link"
-	     ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-	     ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
-	     ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-	     ax_pthread_save_CFLAGS="$CFLAGS"
-	     for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-		if test "x$ax_pthread_try" = "xunknown"; then :
+             # Create an alternate version of $ac_link that compiles and
+             # links in two steps (.c -> .o, .o -> exe) instead of one
+             # (.c -> exe), because the warning occurs only in the second
+             # step
+             ax_pthread_save_ac_link="$ac_link"
+             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
+             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
+             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
+             ax_pthread_save_CFLAGS="$CFLAGS"
+             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
+                if test "x$ax_pthread_try" = "xunknown"; then :
   break
 fi
-		CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-		ac_link="$ax_pthread_save_ac_link"
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+                ac_link="$ax_pthread_save_ac_link"
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void){return 0;}
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_link="$ax_pthread_2step_ac_link"
-		     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void){return 0;}
 _ACEOF
@@ -4999,53 +5021,53 @@ if ac_fn_c_try_link "$LINENO"; then :
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-		    
+                    
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	     done
-	     ac_link="$ax_pthread_save_ac_link"
-	     CFLAGS="$ax_pthread_save_CFLAGS"
-	     if test "x$ax_pthread_try" = "x"; then :
+             done
+             ac_link="$ax_pthread_save_ac_link"
+             CFLAGS="$ax_pthread_save_CFLAGS"
+             if test "x$ax_pthread_try" = "x"; then :
   ax_pthread_try=no
 fi
-	     ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-	    
+             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
+            
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5
 $as_echo "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; }
 
-	case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-		no | unknown) ;;
-		*) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-	esac
+        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
+                no | unknown) ;;
+                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
+        esac
 
 fi # $ax_pthread_clang = yes
 
 if test "x$ax_pthread_ok" = "xno"; then
 for ax_pthread_try_flag in $ax_pthread_flags; do
 
-	case $ax_pthread_try_flag in
-		none)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
+        case $ax_pthread_try_flag in
+                none)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
 $as_echo_n "checking whether pthreads work without any flags... " >&6; }
-		;;
+                ;;
 
-		-mt,pthread)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with -mt -lpthread" >&5
+                -mt,pthread)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with -mt -lpthread" >&5
 $as_echo_n "checking whether pthreads work with -mt -lpthread... " >&6; }
-		PTHREAD_CFLAGS="-mt"
-		PTHREAD_LIBS="-lpthread"
-		;;
+                PTHREAD_CFLAGS="-mt"
+                PTHREAD_LIBS="-lpthread"
+                ;;
 
-		-*)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5
+                -*)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5
 $as_echo_n "checking whether pthreads work with $ax_pthread_try_flag... " >&6; }
-		PTHREAD_CFLAGS="$ax_pthread_try_flag"
-		;;
+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                ;;
 
-		pthread-config)
-		# Extract the first word of "pthread-config", so it can be a program name with args.
+                pthread-config)
+                # Extract the first word of "pthread-config", so it can be a program name with args.
 set dummy pthread-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -5083,52 +5105,52 @@ $as_echo "no" >&6; }
 fi
 
 
-		if test "x$ax_pthread_config" = "xno"; then :
+                if test "x$ax_pthread_config" = "xno"; then :
   continue
 fi
-		PTHREAD_CFLAGS="`pthread-config --cflags`"
-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-		;;
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
 
-		*)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5
+                *)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5
 $as_echo_n "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; }
-		PTHREAD_LIBS="-l$ax_pthread_try_flag"
-		;;
-	esac
+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                ;;
+        esac
 
-	ax_pthread_save_CFLAGS="$CFLAGS"
-	ax_pthread_save_LIBS="$LIBS"
-	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-	LIBS="$PTHREAD_LIBS $LIBS"
-
-	# Check for various functions.  We must include pthread.h,
-	# since some functions may be macros.  (On the Sequent, we
-	# need a special flag -Kthread to make this header compile.)
-	# We check for pthread_join because it is in -lpthread on IRIX
-	# while pthread_create is in libc.  We check for pthread_attr_init
-	# due to DEC craziness with -lpthreads.  We check for
-	# pthread_cleanup_push because it is one of the few pthread
-	# functions on Solaris that doesn't have a non-functional libc stub.
-	# We try pthread_create on general principles.
-
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
-#			if $ax_pthread_check_cond
-#			 error "$ax_pthread_check_macro must be defined"
-#			endif
-			static void routine(void *a) { a = 0; }
-			static void *start_routine(void *a) { return a; }
+#                       if $ax_pthread_check_cond
+#                        error "$ax_pthread_check_macro must be defined"
+#                       endif
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }
 int
 main ()
 {
 pthread_t th; pthread_attr_t attr;
-			pthread_create(&th, 0, start_routine, 0);
-			pthread_join(th, 0);
-			pthread_attr_init(&attr);
-			pthread_cleanup_push(routine, 0);
-			pthread_cleanup_pop(0) /* ; */
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */
   ;
   return 0;
 }
@@ -5139,36 +5161,36 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-	CFLAGS="$ax_pthread_save_CFLAGS"
-	LIBS="$ax_pthread_save_LIBS"
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
 $as_echo "$ax_pthread_ok" >&6; }
-	if test "x$ax_pthread_ok" = "xyes"; then :
+        if test "x$ax_pthread_ok" = "xyes"; then :
   break
 fi
 
-	PTHREAD_LIBS=""
-	PTHREAD_CFLAGS=""
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
 done
 fi
 
 # Various other checks:
 if test "x$ax_pthread_ok" = "xyes"; then
-	ax_pthread_save_CFLAGS="$CFLAGS"
-	ax_pthread_save_LIBS="$LIBS"
-	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-	LIBS="$PTHREAD_LIBS $LIBS"
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
 
-	# Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
 $as_echo_n "checking for joinable pthread attribute... " >&6; }
 if ${ax_cv_PTHREAD_JOINABLE_ATTR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-	     for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-		 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
@@ -5184,45 +5206,45 @@ if ac_fn_c_try_link "$LINENO"; then :
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	     done
-	    
+             done
+            
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5
 $as_echo "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; }
-	if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-	       test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-	       test "x$ax_pthread_joinable_attr_defined" != "xyes"; then :
+        if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
+               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
+               test "x$ax_pthread_joinable_attr_defined" != "xyes"; then :
   
 cat >>confdefs.h <<_ACEOF
 @%:@define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR
 _ACEOF
 
-	       ax_pthread_joinable_attr_defined=yes
-	      
+               ax_pthread_joinable_attr_defined=yes
+              
 fi
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5
 $as_echo_n "checking whether more special flags are required for pthreads... " >&6; }
 if ${ax_cv_PTHREAD_SPECIAL_FLAGS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ax_cv_PTHREAD_SPECIAL_FLAGS=no
-	     case $host_os in
-	     solaris*)
-	     ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-	     ;;
-	     esac
-	    
+             case $host_os in
+             solaris*)
+             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+             ;;
+             esac
+            
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5
 $as_echo "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; }
-	if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-	       test "x$ax_pthread_special_flags_added" != "xyes"; then :
+        if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
+               test "x$ax_pthread_special_flags_added" != "xyes"; then :
   PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-	       ax_pthread_special_flags_added=yes
+               ax_pthread_special_flags_added=yes
 fi
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
 $as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; }
 if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5245,30 +5267,30 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	    
+            
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
 $as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
-	if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-	       test "x$ax_pthread_prio_inherit_defined" != "xyes"; then :
+        if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
+               test "x$ax_pthread_prio_inherit_defined" != "xyes"; then :
   
 $as_echo "@%:@define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h
 
-	       ax_pthread_prio_inherit_defined=yes
-	      
+               ax_pthread_prio_inherit_defined=yes
+              
 fi
 
-	CFLAGS="$ax_pthread_save_CFLAGS"
-	LIBS="$ax_pthread_save_LIBS"
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
 
-	# More AIX lossage: compile with *_r variant
-	if test "x$GCC" != "xyes"; then
-	    case $host_os in
-		aix*)
-		case "x/$CC" in @%:@(
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != "xyes"; then
+            case $host_os in
+                aix*)
+                case "x/$CC" in @%:@(
   x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6) :
     #handle absolute path differently from PATH based program lookup
-		     case "x$CC" in @%:@(
+                     case "x$CC" in @%:@(
   x/*) :
     if as_fn_executable_p ${CC}_r; then :
   PTHREAD_CC="${CC}_r"
@@ -5321,9 +5343,9 @@ esac ;; @%:@(
   *) :
      ;;
 esac
-		;;
-	    esac
-	fi
+                ;;
+            esac
+        fi
 fi
 
 test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
@@ -5334,17 +5356,17 @@ test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
 
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test "x$ax_pthread_ok" = "xyes"; then
-	
+        
     
 $as_echo "@%:@define HAVE_PTHREAD 1" >>confdefs.h
 
     LIBS="$PTHREAD_LIBS $LIBS"
     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
     CC="$PTHREAD_CC"
-	:
+        :
 else
-	ax_pthread_ok=no
-	
+        ax_pthread_ok=no
+        
 fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5407,8 +5429,79 @@ if test "${enable_opt+set}" = set; then :
   enableval=$enable_opt; 
   if test "x$enableval" = "xyes"; then :
   
-    CFLAGS="$CFLAGS -O3 -march=native"
-    LDFLAGS="$LDFLAGS -O3 -march=native"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Ofast" >&5
+$as_echo_n "checking whether C compiler accepts -Ofast... " >&6; }
+if ${ax_cv_check_cflags___Ofast+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -Ofast"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.h>
+int
+main ()
+{
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_cflags___Ofast=yes
+else
+  ax_cv_check_cflags___Ofast=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Ofast" >&5
+$as_echo "$ax_cv_check_cflags___Ofast" >&6; }
+if test "x$ax_cv_check_cflags___Ofast" = xyes; then :
+  CFLAGS="$CFLAGS -Ofast"
+else
+  :
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -march=native" >&5
+$as_echo_n "checking whether C compiler accepts -march=native... " >&6; }
+if ${ax_cv_check_cflags___march_native+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -march=native"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.h>
+int
+main ()
+{
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_cflags___march_native=yes
+else
+  ax_cv_check_cflags___march_native=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___march_native" >&5
+$as_echo "$ax_cv_check_cflags___march_native" >&6; }
+if test "x$ax_cv_check_cflags___march_native" = xyes; then :
+  CFLAGS="$CFLAGS -march=native"
+else
+  :
+fi
+
+  
 fi
 
 fi
@@ -5497,101 +5590,236 @@ fi
 
 
 	# Check for Valgrind tools we care about.
+	valgrind_enabled_tools=
 	
+		@%:@ Check whether --enable-valgrind-memcheck was given.
+if test "${enable_valgrind_memcheck+set}" = set; then :
+  enableval=$enable_valgrind_memcheck; enable_valgrind_memcheck=$enableval
+else
+  enable_valgrind_memcheck=
+fi
 
-	if test "$VALGRIND" != ""; then :
+		if test "$enable_valgrind" = "no"; then :
+  
+			enable_valgrind_memcheck=no
+elif test "$enable_valgrind_memcheck" != "no"; then :
   
-		
-			
-			
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Valgrind tool memcheck" >&5
 $as_echo_n "checking for Valgrind tool memcheck... " >&6; }
 if ${ax_cv_valgrind_tool_memcheck+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
-				ax_cv_valgrind_tool_memcheck=
+				ax_cv_valgrind_tool_memcheck=no
+				
 				if `$VALGRIND --tool=memcheck --help >/dev/null 2>&1`; then :
   
-					ax_cv_valgrind_tool_memcheck="memcheck"
+					ax_cv_valgrind_tool_memcheck=yes
 				
 fi
 			
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_valgrind_tool_memcheck" >&5
 $as_echo "$ax_cv_valgrind_tool_memcheck" >&6; }
-
-			VALGRIND_HAVE_TOOL_memcheck=$ax_cv_valgrind_tool_memcheck
-
-		
+			if test "$ax_cv_valgrind_tool_memcheck" = "no"; then :
+  
+				if test "$enable_valgrind_memcheck" = "yes"; then :
+  
+					as_fn_error $? "Valgrind does not support memcheck; reconfigure with --disable-valgrind-memcheck" "$LINENO" 5
+				
+else
+  
+					enable_valgrind_memcheck=no
+				
+fi
 			
+else
+  
+				enable_valgrind_memcheck=yes
 			
+fi
+		
+fi
+		if test "$enable_valgrind_memcheck" = "yes"; then :
+  
+			valgrind_enabled_tools="$valgrind_enabled_tools memcheck"
+		
+fi
+		ENABLE_VALGRIND_memcheck=$enable_valgrind_memcheck
+
+	
+		@%:@ Check whether --enable-valgrind-helgrind was given.
+if test "${enable_valgrind_helgrind+set}" = set; then :
+  enableval=$enable_valgrind_helgrind; enable_valgrind_helgrind=$enableval
+else
+  enable_valgrind_helgrind=
+fi
+
+		if test "$enable_valgrind" = "no"; then :
+  
+			enable_valgrind_helgrind=no
+elif test "$enable_valgrind_helgrind" != "no"; then :
+  
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Valgrind tool helgrind" >&5
 $as_echo_n "checking for Valgrind tool helgrind... " >&6; }
 if ${ax_cv_valgrind_tool_helgrind+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
-				ax_cv_valgrind_tool_helgrind=
+				ax_cv_valgrind_tool_helgrind=no
+				
 				if `$VALGRIND --tool=helgrind --help >/dev/null 2>&1`; then :
   
-					ax_cv_valgrind_tool_helgrind="helgrind"
+					ax_cv_valgrind_tool_helgrind=yes
 				
 fi
 			
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_valgrind_tool_helgrind" >&5
 $as_echo "$ax_cv_valgrind_tool_helgrind" >&6; }
-
-			VALGRIND_HAVE_TOOL_helgrind=$ax_cv_valgrind_tool_helgrind
-
-		
+			if test "$ax_cv_valgrind_tool_helgrind" = "no"; then :
+  
+				if test "$enable_valgrind_helgrind" = "yes"; then :
+  
+					as_fn_error $? "Valgrind does not support helgrind; reconfigure with --disable-valgrind-helgrind" "$LINENO" 5
+				
+else
+  
+					enable_valgrind_helgrind=no
+				
+fi
 			
+else
+  
+				enable_valgrind_helgrind=yes
 			
+fi
+		
+fi
+		if test "$enable_valgrind_helgrind" = "yes"; then :
+  
+			valgrind_enabled_tools="$valgrind_enabled_tools helgrind"
+		
+fi
+		ENABLE_VALGRIND_helgrind=$enable_valgrind_helgrind
+
+	
+		@%:@ Check whether --enable-valgrind-drd was given.
+if test "${enable_valgrind_drd+set}" = set; then :
+  enableval=$enable_valgrind_drd; enable_valgrind_drd=$enableval
+else
+  enable_valgrind_drd=
+fi
+
+		if test "$enable_valgrind" = "no"; then :
+  
+			enable_valgrind_drd=no
+elif test "$enable_valgrind_drd" != "no"; then :
+  
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Valgrind tool drd" >&5
 $as_echo_n "checking for Valgrind tool drd... " >&6; }
 if ${ax_cv_valgrind_tool_drd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
-				ax_cv_valgrind_tool_drd=
+				ax_cv_valgrind_tool_drd=no
+				
 				if `$VALGRIND --tool=drd --help >/dev/null 2>&1`; then :
   
-					ax_cv_valgrind_tool_drd="drd"
+					ax_cv_valgrind_tool_drd=yes
 				
 fi
 			
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_valgrind_tool_drd" >&5
 $as_echo "$ax_cv_valgrind_tool_drd" >&6; }
-
-			VALGRIND_HAVE_TOOL_drd=$ax_cv_valgrind_tool_drd
-
-		
+			if test "$ax_cv_valgrind_tool_drd" = "no"; then :
+  
+				if test "$enable_valgrind_drd" = "yes"; then :
+  
+					as_fn_error $? "Valgrind does not support drd; reconfigure with --disable-valgrind-drd" "$LINENO" 5
+				
+else
+  
+					enable_valgrind_drd=no
+				
+fi
 			
+else
+  
+				enable_valgrind_drd=yes
 			
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Valgrind tool exp-sgcheck" >&5
-$as_echo_n "checking for Valgrind tool exp-sgcheck... " >&6; }
-if ${ax_cv_valgrind_tool_exp_sgcheck+:} false; then :
+fi
+		
+fi
+		if test "$enable_valgrind_drd" = "yes"; then :
+  
+			valgrind_enabled_tools="$valgrind_enabled_tools drd"
+		
+fi
+		ENABLE_VALGRIND_drd=$enable_valgrind_drd
+
+	
+		@%:@ Check whether --enable-valgrind-sgcheck was given.
+if test "${enable_valgrind_sgcheck+set}" = set; then :
+  enableval=$enable_valgrind_sgcheck; enable_valgrind_sgcheck=$enableval
+else
+  enable_valgrind_sgcheck=
+fi
+
+		if test "$enable_valgrind" = "no"; then :
+  
+			enable_valgrind_sgcheck=no
+elif test "$enable_valgrind_sgcheck" != "no"; then :
+  
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Valgrind tool sgcheck" >&5
+$as_echo_n "checking for Valgrind tool sgcheck... " >&6; }
+if ${ax_cv_valgrind_tool_sgcheck+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
-				ax_cv_valgrind_tool_exp_sgcheck=
+				ax_cv_valgrind_tool_sgcheck=no
+				
 				if `$VALGRIND --tool=exp-sgcheck --help >/dev/null 2>&1`; then :
   
-					ax_cv_valgrind_tool_exp_sgcheck="exp-sgcheck"
+					ax_cv_valgrind_tool_sgcheck=yes
 				
 fi
 			
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_valgrind_tool_exp_sgcheck" >&5
-$as_echo "$ax_cv_valgrind_tool_exp_sgcheck" >&6; }
-
-			VALGRIND_HAVE_TOOL_exp_sgcheck=$ax_cv_valgrind_tool_exp_sgcheck
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_valgrind_tool_sgcheck" >&5
+$as_echo "$ax_cv_valgrind_tool_sgcheck" >&6; }
+			if test "$ax_cv_valgrind_tool_sgcheck" = "no"; then :
+  
+				if test "$enable_valgrind_sgcheck" = "yes"; then :
+  
+					as_fn_error $? "Valgrind does not support sgcheck; reconfigure with --disable-valgrind-sgcheck" "$LINENO" 5
+				
+else
+  
+					enable_valgrind_sgcheck=no
+				
+fi
+			
+else
+  
+				enable_valgrind_sgcheck=yes
+			
+fi
+		
+fi
+		if test "$enable_valgrind_sgcheck" = "yes"; then :
+  
+			valgrind_enabled_tools="$valgrind_enabled_tools sgcheck"
 		
-	
 fi
+		ENABLE_VALGRIND_sgcheck=$enable_valgrind_sgcheck
+
+	
+	valgrind_tools="memcheck helgrind drd sgcheck"
+
+	valgrind_enabled_tools=$valgrind_enabled_tools
+
 
 VALGRIND_CHECK_RULES='
 # Valgrind check
@@ -5613,7 +5841,6 @@ VALGRIND_drd_FLAGS ?=
 VALGRIND_sgcheck_FLAGS ?=
 
 # Internal use
-valgrind_tools = memcheck helgrind drd sgcheck
 valgrind_log_files = $(addprefix test-suite-,$(addsuffix .log,$(valgrind_tools)))
 
 valgrind_memcheck_flags = --tool=memcheck $(VALGRIND_memcheck_FLAGS)
@@ -5624,6 +5851,9 @@ valgrind_sgcheck_flags = --tool=exp-sgcheck $(VALGRIND_sgcheck_FLAGS)
 valgrind_quiet = $(valgrind_quiet_$(V))
 valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY))
 valgrind_quiet_0 = --quiet
+valgrind_v_use   = $(valgrind_v_use_$(V))
+valgrind_v_use_  = $(valgrind_v_use_$(AM_DEFAULT_VERBOSITY))
+valgrind_v_use_0 = @echo "  USE   " $(patsubst check-valgrind-%,%,$''@):;
 
 # Support running with and without libtool.
 ifneq ($(LIBTOOL),)
@@ -5635,13 +5865,10 @@ endif
 # Use recursive makes in order to ignore errors during check
 check-valgrind:
 ifeq ($(VALGRIND_ENABLED),yes)
-	-$(foreach tool,$(valgrind_tools), \
-		$(if $(VALGRIND_HAVE_TOOL_$(tool))$(VALGRIND_HAVE_TOOL_exp_$(tool)), \
-			$(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-tool VALGRIND_TOOL=$(tool); \
-		) \
-	)
+	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \
+		$(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool))
 else
-	@echo "Need to reconfigure with --enable-valgrind"
+	@echo "Need to use GNU make and reconfigure with --enable-valgrind"
 endif
 
 # Valgrind running
@@ -5655,16 +5882,22 @@ VALGRIND_LOG_COMPILER = \
 	$(valgrind_lt) \
 	$(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS)
 
-check-valgrind-tool:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_$(VALGRIND_TOOL)_flags)" \
-		TEST_SUITE_LOG=test-suite-$(VALGRIND_TOOL).log
+define valgrind_tool_rule =
+check-valgrind-$(1):
+ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes)
+	$$(valgrind_v_use)$$(MAKE) check-TESTS \
+		TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \
+		LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \
+		LOG_FLAGS="$$(valgrind_$(1)_flags)" \
+		TEST_SUITE_LOG=test-suite-$(1).log
+else ifeq ($$(VALGRIND_ENABLED),yes)
+	@echo "Need to reconfigure with --enable-valgrind-$(1)"
 else
 	@echo "Need to reconfigure with --enable-valgrind"
 endif
+endef
+
+$(foreach tool,$(valgrind_tools),$(eval $(call valgrind_tool_rule,$(tool))))
 
 A''M_DISTCHECK_CONFIGURE_FLAGS ?=
 A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
@@ -5672,16 +5905,17 @@ A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
 MOSTLYCLEANFILES ?=
 MOSTLYCLEANFILES += $(valgrind_log_files)
 
-.PHONY: check-valgrind check-valgrind-tool
+.PHONY: check-valgrind $(add-prefix check-valgrind-,$(valgrind_tools))
 '
 
 	if test "$enable_valgrind" != "yes"; then :
   
-VALGRIND_CHECK_RULES='
+		VALGRIND_CHECK_RULES='
 check-valgrind:
 	@echo "Need to use GNU make and reconfigure with --enable-valgrind"'
-
+	
 fi
+
 	
 	
 
@@ -6270,21 +6504,22 @@ else
   CFLAGS="$CFLAGS  -D_FORTIFY_SOURCE=2"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___D_FORTIFY_SOURCE_2=yes
 else
   ax_cv_check_cflags___D_FORTIFY_SOURCE_2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___D_FORTIFY_SOURCE_2" >&5
@@ -6308,21 +6543,22 @@ else
   CFLAGS="$CFLAGS  -fvisibility=hidden"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___fvisibility_hidden=yes
 else
   ax_cv_check_cflags___fvisibility_hidden=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5
@@ -6349,65 +6585,28 @@ else
   CFLAGS="$CFLAGS  -fPIC"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___fPIC=yes
 else
   ax_cv_check_cflags___fPIC=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fPIC" >&5
 $as_echo "$ax_cv_check_cflags___fPIC" >&6; }
 if test "x$ax_cv_check_cflags___fPIC" = xyes; then :
-  
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIC" >&5
-$as_echo_n "checking whether the linker accepts -fPIC... " >&6; }
-if ${ax_cv_check_ldflags___fPIC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS  -fPIC"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-char x[42U];if (fgets(x,1000,stdin)) puts(x)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_check_ldflags___fPIC=yes
-else
-  ax_cv_check_ldflags___fPIC=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___fPIC" >&5
-$as_echo "$ax_cv_check_ldflags___fPIC" >&6; }
-if test "x$ax_cv_check_ldflags___fPIC" = xyes; then :
   CFLAGS="$CFLAGS -fPIC"
-    
-else
-  :
-fi
-
-  
 else
   :
 fi
@@ -6427,59 +6626,29 @@ else
   CFLAGS="$CFLAGS  -fPIE"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___fPIE=yes
 else
   ax_cv_check_cflags___fPIE=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fPIE" >&5
 $as_echo "$ax_cv_check_cflags___fPIE" >&6; }
 if test "x$ax_cv_check_cflags___fPIE" = xyes; then :
   
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIE" >&5
-$as_echo_n "checking whether the linker accepts -fPIE... " >&6; }
-if ${ax_cv_check_ldflags___fPIE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  
-  ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS  -fPIE"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-char x[42U];if (fgets(x,1000,stdin)) puts(x)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_check_ldflags___fPIE=yes
-else
-  ax_cv_check_ldflags___fPIE=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___fPIE" >&5
-$as_echo "$ax_cv_check_ldflags___fPIE" >&6; }
-if test "x$ax_cv_check_ldflags___fPIE" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -pie" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -pie" >&5
 $as_echo_n "checking whether the linker accepts -pie... " >&6; }
 if ${ax_cv_check_ldflags___pie+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -6489,11 +6658,11 @@ else
   LDFLAGS="$LDFLAGS  -pie"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U];if (fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
@@ -6510,12 +6679,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___pie" >&5
 $as_echo "$ax_cv_check_ldflags___pie" >&6; }
 if test "x$ax_cv_check_ldflags___pie" = xyes; then :
-  CFLAGS="$CFLAGS -fPIE"
-         LDFLAGS="$LDFLAGS -pie"
-else
-  :
-fi
-
+  
+      CFLAGS="$CFLAGS -fPIE"
+       LDFLAGS="$LDFLAGS -pie"
     
 else
   :
@@ -6539,21 +6705,22 @@ else
   CFLAGS="$CFLAGS  -fno-strict-aliasing"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___fno_strict_aliasing=yes
 else
   ax_cv_check_cflags___fno_strict_aliasing=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_strict_aliasing" >&5
@@ -6574,21 +6741,22 @@ else
   CFLAGS="$CFLAGS  -fno-strict-overflow"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___fno_strict_overflow=yes
 else
   ax_cv_check_cflags___fno_strict_overflow=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_strict_overflow" >&5
@@ -6607,21 +6775,22 @@ else
   CFLAGS="$CFLAGS  -fwrapv"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___fwrapv=yes
 else
   ax_cv_check_cflags___fwrapv=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fwrapv" >&5
@@ -6664,21 +6833,22 @@ else
   CFLAGS="$CFLAGS  -flax-vector-conversions"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___flax_vector_conversions=yes
 else
   ax_cv_check_cflags___flax_vector_conversions=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___flax_vector_conversions" >&5
@@ -6728,11 +6898,11 @@ else
   LDFLAGS="$LDFLAGS  -Wl,--dynamicbase"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U];if (fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
@@ -6764,11 +6934,11 @@ else
   LDFLAGS="$LDFLAGS  -Wl,--high-entropy-va"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U];if (fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
@@ -6800,11 +6970,11 @@ else
   LDFLAGS="$LDFLAGS  -Wl,--nxcompat"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U];if (fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
@@ -6849,21 +7019,22 @@ else
   CFLAGS="$CFLAGS  -fstack-protector"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___fstack_protector=yes
 else
   ax_cv_check_cflags___fstack_protector=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_protector" >&5
@@ -6880,11 +7051,11 @@ else
   LDFLAGS="$LDFLAGS  -fstack-protector"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U];if (fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
@@ -6929,21 +7100,22 @@ else
   CFLAGS="$CFLAGS  -Wwrite-strings"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___Wwrite_strings=yes
 else
   ax_cv_check_cflags___Wwrite_strings=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Wwrite_strings" >&5
@@ -6964,21 +7136,22 @@ else
   CFLAGS="$CFLAGS  -Wdiv-by-zero"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___Wdiv_by_zero=yes
 else
   ax_cv_check_cflags___Wdiv_by_zero=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Wdiv_by_zero" >&5
@@ -6999,21 +7172,22 @@ else
   CFLAGS="$CFLAGS  -Wsometimes-uninitialized"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___Wsometimes_uninitialized=yes
 else
   ax_cv_check_cflags___Wsometimes_uninitialized=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Wsometimes_uninitialized" >&5
@@ -7038,21 +7212,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wall"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7075,21 +7250,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wextra"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7133,21 +7309,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wno-unknown-warning-option"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7178,21 +7355,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wbad-function-cast"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7215,21 +7393,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wcast-align"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7252,21 +7431,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wcast-qual"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7289,21 +7469,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wduplicated-cond"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7326,21 +7507,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wfloat-equal"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7363,21 +7545,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wformat=2"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7400,21 +7583,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wmissing-declarations"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7437,21 +7621,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wmissing-prototypes"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7474,21 +7659,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wnested-externs"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7511,21 +7697,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wno-unknown-pragmas"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7548,21 +7735,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wnormalized=id"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7585,21 +7773,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wnull-dereference"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7622,21 +7811,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wpointer-arith"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7659,28 +7849,67 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wredundant-decls"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+  CWFLAGS="$CWFLAGS -Wredundant-decls"
+else
+  :
+fi
+
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wshorten-64-to-32" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wshorten-64-to-32" >&5
+$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wshorten-64-to-32... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  $CWFLAGS -Wshorten-64-to-32"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.h>
+int
+main ()
+{
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-  CWFLAGS="$CWFLAGS -Wredundant-decls"
+  CWFLAGS="$CWFLAGS -Wshorten-64-to-32"
 else
   :
 fi
@@ -7696,21 +7925,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wstrict-prototypes"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7733,21 +7963,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wswitch-enum"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7770,21 +8001,22 @@ else
   CFLAGS="$CFLAGS  $CWFLAGS -Wvariable-decl"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_CACHEVAR=yes"
 else
   eval "$as_CACHEVAR=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 eval ac_res=\$$as_CACHEVAR
@@ -7796,6 +8028,44 @@ else
   :
 fi
 
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wno-type-limits" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wno-type-limits" >&5
+$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wno-type-limits... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  $CWFLAGS -Wno-type-limits"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.h>
+int
+main ()
+{
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+  CWFLAGS="$CWFLAGS -Wno-type-limits"
+else
+  :
+fi
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,relro" >&5
 $as_echo_n "checking whether the linker accepts -Wl,-z,relro... " >&6; }
@@ -7807,11 +8077,11 @@ else
   LDFLAGS="$LDFLAGS  -Wl,-z,relro"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U];if (fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
@@ -7843,11 +8113,11 @@ else
   LDFLAGS="$LDFLAGS  -Wl,-z,now"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U];if (fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
@@ -7879,11 +8149,11 @@ else
   LDFLAGS="$LDFLAGS  -Wl,-z,noexecstack"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U];if (fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
@@ -7906,6 +8176,68 @@ else
 fi
 
 
+    
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether segmentation violations can be caught when using the C compiler" >&5
+$as_echo_n "checking whether segmentation violations can be caught when using the C compiler... " >&6; }
+if ${ax_cv_check_cCATCHABLE_SEGV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+        if test "$cross_compiling" = yes; then :
+  ax_cv_check_cCATCHABLE_SEGV=unknown
+        
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+            
+#include <signal.h>
+#include <stdlib.h>
+static void sig(int _) { exit(0); }
+            
+int
+main ()
+{
+
+volatile unsigned char * volatile x = (volatile unsigned char *) malloc(8);
+size_t i;
+
+signal(SIGSEGV, sig);
+signal(SIGBUS, sig);
+#if !defined(__SANITIZE_ADDRESS__) && !defined(__EMSCRIPTEN__)
+for (i = 0; i < 10000000; i += 1024) { x[-i] = x[i] = (unsigned char) i; }
+#endif
+free((void *) x);
+exit(1)
+            
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ax_cv_check_cCATCHABLE_SEGV=yes
+else
+  ax_cv_check_cCATCHABLE_SEGV=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cCATCHABLE_SEGV" >&5
+$as_echo "$ax_cv_check_cCATCHABLE_SEGV" >&6; }
+    if test "x$ax_cv_check_cCATCHABLE_SEGV" = xyes; then :
+  
+$as_echo "@%:@define HAVE_CATCHABLE_SEGV 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: On this platform, segmentation violations cannot be caught using signal handlers. This is expected if you enabled a tool such as Address Sanitizer (-fsanitize=address), but be aware that using Address Sanitizer may also significantly reduce performance." >&5
+$as_echo "$as_me: WARNING: On this platform, segmentation violations cannot be caught using signal handlers. This is expected if you enabled a tool such as Address Sanitizer (-fsanitize=address), but be aware that using Address Sanitizer may also significantly reduce performance." >&2;}
+    
+fi
+    
+
 case `pwd` in
   *\ * | *\	*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -15606,8 +15938,6 @@ fi
 if test "x$EMSCRIPTEN" = "x" -a "$host_os" != "pnacl"; then :
   
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MMX instructions set" >&5
-$as_echo_n "checking for MMX instructions set... " >&6; }
   oldcflags="$CFLAGS"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mmmx" >&5
 $as_echo_n "checking whether C compiler accepts -mmmx... " >&6; }
@@ -15619,21 +15949,22 @@ else
   CFLAGS="$CFLAGS  -mmmx"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___mmmx=yes
 else
   ax_cv_check_cflags___mmmx=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mmmx" >&5
@@ -15644,6 +15975,8 @@ else
   :
 fi
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MMX instructions set" >&5
+$as_echo_n "checking for MMX instructions set... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15674,21 +16007,22 @@ else
   CFLAGS="$CFLAGS  -mmmx"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___mmmx=yes
 else
   ax_cv_check_cflags___mmmx=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mmmx" >&5
@@ -15706,8 +16040,6 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$oldcflags"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSE2 instructions set" >&5
-$as_echo_n "checking for SSE2 instructions set... " >&6; }
   oldcflags="$CFLAGS"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -msse2" >&5
 $as_echo_n "checking whether C compiler accepts -msse2... " >&6; }
@@ -15719,21 +16051,22 @@ else
   CFLAGS="$CFLAGS  -msse2"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___msse2=yes
 else
   ax_cv_check_cflags___msse2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___msse2" >&5
@@ -15744,6 +16077,8 @@ else
   :
 fi
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSE2 instructions set" >&5
+$as_echo_n "checking for SSE2 instructions set... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15757,7 +16092,7 @@ int
 main ()
 {
  __m128d x = _mm_setzero_pd();
-       __m128i y = _mm_srli_epi64(_mm_setzero_si128(), 26); 
+       __m128i z = _mm_srli_epi64(_mm_setzero_si128(), 26); 
   ;
   return 0;
 }
@@ -15778,21 +16113,22 @@ else
   CFLAGS="$CFLAGS  -msse2"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___msse2=yes
 else
   ax_cv_check_cflags___msse2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___msse2" >&5
@@ -15821,21 +16157,22 @@ else
   CFLAGS="$CFLAGS  -msse3"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___msse3=yes
 else
   ax_cv_check_cflags___msse3=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___msse3" >&5
@@ -15879,21 +16216,22 @@ else
   CFLAGS="$CFLAGS  -msse3"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___msse3=yes
 else
   ax_cv_check_cflags___msse3=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___msse3" >&5
@@ -15922,21 +16260,22 @@ else
   CFLAGS="$CFLAGS  -mssse3"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___mssse3=yes
 else
   ax_cv_check_cflags___mssse3=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mssse3" >&5
@@ -15979,21 +16318,22 @@ else
   CFLAGS="$CFLAGS  -mssse3"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___mssse3=yes
 else
   ax_cv_check_cflags___mssse3=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mssse3" >&5
@@ -16022,21 +16362,22 @@ else
   CFLAGS="$CFLAGS  -msse4.1"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___msse4_1=yes
 else
   ax_cv_check_cflags___msse4_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___msse4_1" >&5
@@ -16079,21 +16420,22 @@ else
   CFLAGS="$CFLAGS  -msse4.1"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___msse4_1=yes
 else
   ax_cv_check_cflags___msse4_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___msse4_1" >&5
@@ -16122,21 +16464,22 @@ else
   CFLAGS="$CFLAGS  -mavx"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___mavx=yes
 else
   ax_cv_check_cflags___mavx=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mavx" >&5
@@ -16182,21 +16525,22 @@ else
   CFLAGS="$CFLAGS  -mavx"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___mavx=yes
 else
   ax_cv_check_cflags___mavx=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mavx" >&5
@@ -16225,21 +16569,22 @@ else
   CFLAGS="$CFLAGS  -mavx2"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___mavx2=yes
 else
   ax_cv_check_cflags___mavx2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mavx2" >&5
@@ -16264,7 +16609,11 @@ $as_echo_n "checking for AVX2 instructions set... " >&6; }
 int
 main ()
 {
- __m256i x = _mm256_abs_epi8(_mm256_setzero_si256()); 
+
+__m256 x = _mm256_set1_ps(3.14);
+__m256 y = _mm256_permutevar8x32_ps(x, _mm256_set1_epi32(42));
+return _mm256_movemask_ps(_mm256_cmp_ps(x, y, _CMP_NEQ_OQ));
+
   ;
   return 0;
 }
@@ -16285,27 +16634,28 @@ else
   CFLAGS="$CFLAGS  -mavx2"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___mavx2=yes
 else
   ax_cv_check_cflags___mavx2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mavx2" >&5
 $as_echo "$ax_cv_check_cflags___mavx2" >&6; }
 if test "x$ax_cv_check_cflags___mavx2" = xyes; then :
-  CFLAGS_AVX="-mavx2"
+  CFLAGS_AVX2="-mavx2"
 else
   :
 fi
@@ -16359,21 +16709,22 @@ else
   CFLAGS="$CFLAGS  -maes"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___maes=yes
 else
   ax_cv_check_cflags___maes=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___maes" >&5
@@ -16394,21 +16745,22 @@ else
   CFLAGS="$CFLAGS  -mpclmul"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___mpclmul=yes
 else
   ax_cv_check_cflags___mpclmul=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mpclmul" >&5
@@ -16456,21 +16808,22 @@ else
   CFLAGS="$CFLAGS  -maes"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___maes=yes
 else
   ax_cv_check_cflags___maes=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___maes" >&5
@@ -16491,21 +16844,22 @@ else
   CFLAGS="$CFLAGS  -mpclmul"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <time.h>
 int
 main ()
 {
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+time_t x; int fodder = 0; if (fodder > -1000 && time(&x)) return (int) x
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ax_cv_check_cflags___mpclmul=yes
 else
   ax_cv_check_cflags___mpclmul=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS=$ax_check_save_flags
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mpclmul" >&5
@@ -16537,12 +16891,13 @@ fi
 
 
 
-for ac_header in sys/mman.h
+for ac_header in sys/mman.h intrin.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mman_h" = xyes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_SYS_MMAN_H 1
+@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  
 fi
@@ -16550,6 +16905,32 @@ fi
 done
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if _xgetbv() is available" >&5
+$as_echo_n "checking if _xgetbv() is available... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ #include <intrin.h> 
+int
+main ()
+{
+ (void) _xgetbv(0) 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+   
+$as_echo "@%:@define HAVE__XGETBV 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
@@ -17226,6 +17607,37 @@ $as_echo "@%:@define CPU_UNALIGNED_ACCESS 1" >>confdefs.h
 
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if atomic operations are supported" >&5
+$as_echo_n "checking if atomic operations are supported... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ 
+int
+main ()
+{
+
+static volatile int _sodium_lock;
+__sync_lock_test_and_set(&_sodium_lock, 1);
+__sync_lock_release(&_sodium_lock);
+
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ 
+$as_echo "@%:@define HAVE_ATOMIC_OPS 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
 
 if test "x$EMSCRIPTEN" = "x"; then :
   
@@ -17647,7 +18059,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile dist-build/Makefile libsodium.pc libsodium-uninstalled.pc msvc-scripts/Makefile src/Makefile src/libsodium/Makefile src/libsodium/include/Makefile src/libsodium/include/sodium/version.h test/default/Makefile test/Makefile"
+ac_config_files="$ac_config_files Makefile contrib/Makefile dist-build/Makefile libsodium.pc libsodium-uninstalled.pc msvc-scripts/Makefile src/Makefile src/libsodium/Makefile src/libsodium/include/Makefile src/libsodium/include/sodium/version.h test/default/Makefile test/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18255,7 +18667,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libsodium $as_me 1.0.11, which was
+This file was extended by libsodium $as_me 1.0.13, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18313,7 +18725,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libsodium config.status 1.0.11
+libsodium config.status 1.0.13
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -18719,6 +19131,7 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
     "dist-build/Makefile") CONFIG_FILES="$CONFIG_FILES dist-build/Makefile" ;;
     "libsodium.pc") CONFIG_FILES="$CONFIG_FILES libsodium.pc" ;;
     "libsodium-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libsodium-uninstalled.pc" ;;