diff --git a/Headers/GNUstepBase/config.h.in b/Headers/GNUstepBase/config.h.in
index 5018d6873..95b594907 100644
--- a/Headers/GNUstepBase/config.h.in
+++ b/Headers/GNUstepBase/config.h.in
@@ -394,9 +394,6 @@
 /* Define to 1 if you have the `rt' library (-lrt). */
 #undef HAVE_LIBRT
 
-/* Define to 1 if you have the `sframe' library (-lsframe). */
-#undef HAVE_LIBSFRAME
-
 /* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 
@@ -439,6 +436,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the <minix/config.h> header file. */
+#undef HAVE_MINIX_CONFIG_H
+
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
@@ -595,13 +595,16 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
-/* Define to 1 if you have the `strerror_r' function. */
+/* Define if you have `strerror_r'. */
 #undef HAVE_STRERROR_R
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -894,7 +897,7 @@
 /* Description: Define setname function for pthread with three args */
 #undef PTHREAD_SETNAME
 
-/* Define to 1 if the `setpgrp' function takes no argument. */
+/* Define to 1 if the `setpgrp' function requires zero arguments. */
 #undef SETPGRP_VOID
 
 /* The size of `CONDITION_VARIABLE', as computed by sizeof. */
@@ -933,7 +936,9 @@
 /* The size of `void*', as computed by sizeof. */
 #undef SIZEOF_VOIDP
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Define to 1 if strerror_r returns char *. */
@@ -955,21 +960,87 @@
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
+/* Enable general extensions on macOS.  */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable threading extensions on Solaris.  */
+/* Enable X/Open compliant socket functions that do not require linking
+   with -lxnet on HP-UX 11.11.  */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
+/* Identify the host operating system as Minix.
+   This macro does not affect the system headers' behavior.
+   A future release of Autoconf may stop defining this macro.  */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+   Enable NetBSD compatibility extensions on Minix.  */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+   Oddly enough, this does nothing on OpenBSD.  */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior.  */
+#ifndef _POSIX_1_SOURCE
+# undef _POSIX_1_SOURCE
+#endif
+/* Enable POSIX-compatible threading on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009.  */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
+/* Enable X/Open extensions.  Define to 500 only if necessary
+   to make mbstate_t available.  */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
 #endif
 
 
@@ -994,11 +1065,6 @@
 # endif
 #endif
 
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
@@ -1008,16 +1074,6 @@
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
diff --git a/configure b/configure
index 72d7feb6c..96bfe585f 100755
--- a/configure
+++ b/configure
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.71.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -14,14 +15,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -31,46 +34,46 @@ esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -79,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -94,8 +90,12 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -107,30 +107,10 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -152,20 +132,22 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -185,42 +167,53 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -228,14 +221,21 @@ fi
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
 
-      if test "x$CONFIG_SHELL" != x; then :
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -253,18 +253,19 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -291,6 +292,7 @@ as_fn_unset ()
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -308,6 +310,14 @@ as_fn_exit ()
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -322,7 +332,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -331,7 +341,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -370,12 +380,13 @@ as_fn_executable_p ()
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -387,18 +398,27 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -410,9 +430,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -439,7 +459,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -483,7 +503,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -497,6 +517,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -510,6 +534,13 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -575,50 +606,46 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME=''
+PACKAGE_TARNAME=''
+PACKAGE_VERSION=''
+PACKAGE_STRING=''
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 ac_unique_file="Source/NSArray.m"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 GCC_VERSION
@@ -674,6 +701,8 @@ HAVE_PTS_STREAM_MODULES
 OBJCFLAGS
 HAVE_OBJC_SYNC_ENTER
 BASE_NATIVE_OBJC_EXCEPTIONS
+EGREP
+GREP
 GS_NONFRAGILE
 HAVE_BLOCKS
 OBJC2RUNTIME
@@ -726,8 +755,6 @@ PKG_CONFIG_PATH
 PKG_CONFIG
 WHOAMI
 CLANG_CC
-EGREP
-GREP
 CPP
 OBJEXT
 EXEEXT
@@ -772,6 +799,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -895,6 +923,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -924,8 +953,6 @@ do
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -966,9 +993,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -992,9 +1019,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1147,6 +1174,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1196,9 +1232,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1212,9 +1248,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1258,9 +1294,9 @@ Try \`$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1276,7 +1312,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1284,7 +1320,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1340,7 +1376,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1437,6 +1473,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1636,9 +1673,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1666,7 +1703,8 @@ esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1674,7 +1712,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1684,9 +1722,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1703,14 +1741,14 @@ fi
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1718,14 +1756,15 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1747,7 +1786,7 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1755,14 +1794,15 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
@@ -1772,135 +1812,6 @@ fi
 
 } # ac_fn_c_try_cpp
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -1908,26 +1819,28 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -1938,14 +1851,14 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1953,17 +1866,18 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1985,17 +1899,18 @@ fi
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof ($2))
 	 return 0;
@@ -2003,12 +1918,13 @@ if (sizeof ($2))
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof (($2)))
 	    return 0;
@@ -2016,22 +1932,66 @@ if (sizeof (($2)))
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+       printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
 # --------------------------------------------
 # Tries to find the compile-time value of EXPR in a program that includes
@@ -2046,7 +2006,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
 test_array [0] = 0;
@@ -2056,14 +2016,15 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_lo=0 ac_mid=0
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
@@ -2073,9 +2034,10 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=$ac_mid; break
-else
+else $as_nop
   as_fn_arith $ac_mid + 1 && ac_lo=$as_val
 			if test $ac_lo -le $ac_mid; then
 			  ac_lo= ac_hi=
@@ -2083,14 +2045,14 @@ else
 			fi
 			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) < 0)];
 test_array [0] = 0;
@@ -2100,14 +2062,15 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=-1 ac_mid=-1
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
 test_array [0] = 0;
@@ -2117,9 +2080,10 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_lo=$ac_mid; break
-else
+else $as_nop
   as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
 			if test $ac_mid -le $ac_hi; then
 			  ac_lo= ac_hi=
@@ -2127,14 +2091,14 @@ else
 			fi
 			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else
+else $as_nop
   ac_lo= ac_hi=
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
@@ -2142,7 +2106,7 @@ while test "x$ac_lo" != "x$ac_hi"; do
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
@@ -2152,12 +2116,13 @@ return test_array [0];
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=$ac_mid
-else
+else $as_nop
   as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done
 case $ac_lo in #((
 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
@@ -2167,12 +2132,12 @@ esac
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
+static long int longval (void) { return $2; }
+static unsigned long int ulongval (void) { return $2; }
 #include <stdio.h>
 #include <stdlib.h>
 int
-main ()
+main (void)
 {
 
   FILE *f = fopen ("conftest.val", "w");
@@ -2200,9 +2165,10 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
+else $as_nop
   ac_retval=1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -2221,11 +2187,12 @@ rm -f conftest.val
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -2233,16 +2200,9 @@ else
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+   which can conflict with char $2 (); below.  */
 
+#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2260,24 +2220,25 @@ choke me
 #endif
 
 int
-main ()
+main (void)
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
@@ -2289,16 +2250,17 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+printf %s "checking for $2.$3... " >&6; }
+if eval test \${$4+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main ()
+main (void)
 {
 static $2 ac_aggr;
 if (ac_aggr.$3)
@@ -2307,14 +2269,15 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$4=yes"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main ()
+main (void)
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
@@ -2323,41 +2286,45 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$4=yes"
-else
+else $as_nop
   eval "$4=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
+# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
+# ------------------------------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
+# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
+ac_fn_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+printf %s "checking whether $as_decl_name is declared... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  eval ac_save_FLAGS=\$$6
+  as_fn_append $6 " $5"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
@@ -2371,27 +2338,50 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  eval $6=\$ac_save_FLAGS
+
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_decl
+} # ac_fn_check_decl
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
 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 $as_me, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -2424,8 +2414,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2460,7 +2454,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2495,11 +2489,13 @@ done
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -2510,8 +2506,8 @@ trap 'exit_status=$?
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2535,7 +2531,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -2543,14 +2539,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -2558,15 +2554,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -2574,8 +2570,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2589,63 +2585,48 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2655,19 +2636,440 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[0] = argv[0][0];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+	 || dynamic_array[ni.number - 1] != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int[100]),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.guess config.sub"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="`if test -z "$GNUSTEP_MAKEFILES"; then
+  gnustep-config --variable=GNUSTEP_MAKEFILES 2>&5
+else
+  echo $GNUSTEP_MAKEFILES
+fi`"
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2678,12 +3080,12 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
@@ -2692,24 +3094,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2719,11 +3121,12 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2775,8 +3178,8 @@ if test "$CPPFLAGS" = ""; then
   export CPPFLAGS
 else
   if test "$CPPFLAGS" != "$MAKECPPFLAGS"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the preprocessor options ($CPPFLAGS) set to a different value from that used by gnustep-make ($MAKECPPFLAGS).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CPPFLAGS=$CPPFLAGS or run the gnustep-base configure again with your CPPFLAGS environment variable set to $MAKECPPFLAGS" >&5
-$as_echo "$as_me: WARNING: You are running configure with the preprocessor options ($CPPFLAGS) set to a different value from that used by gnustep-make ($MAKECPPFLAGS).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CPPFLAGS=$CPPFLAGS or run the gnustep-base configure again with your CPPFLAGS environment variable set to $MAKECPPFLAGS" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the preprocessor options ($CPPFLAGS) set to a different value from that used by gnustep-make ($MAKECPPFLAGS).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CPPFLAGS=$CPPFLAGS or run the gnustep-base configure again with your CPPFLAGS environment variable set to $MAKECPPFLAGS" >&5
+printf "%s\n" "$as_me: WARNING: You are running configure with the preprocessor options ($CPPFLAGS) set to a different value from that used by gnustep-make ($MAKECPPFLAGS).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CPPFLAGS=$CPPFLAGS or run the gnustep-base configure again with your CPPFLAGS environment variable set to $MAKECPPFLAGS" >&2;}
   fi
 fi
 
@@ -2786,8 +3189,8 @@ if test "$LDFLAGS" = ""; then
   export LDFLAGS
 else
   if test "$LDFLAGS" != "$MAKELDFLAGS"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the link options ($LDFLAGS) set to a different value from that used by gnustep-make ($MAKELDFLAGS).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use LDFLAGS=$LDFLAGS or run the gnustep-base configure again with your LDFLAGS environment variable set to $MAKELDFLAGS" >&5
-$as_echo "$as_me: WARNING: You are running configure with the link options ($LDFLAGS) set to a different value from that used by gnustep-make ($MAKELDFLAGS).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use LDFLAGS=$LDFLAGS or run the gnustep-base configure again with your LDFLAGS environment variable set to $MAKELDFLAGS" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the link options ($LDFLAGS) set to a different value from that used by gnustep-make ($MAKELDFLAGS).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use LDFLAGS=$LDFLAGS or run the gnustep-base configure again with your LDFLAGS environment variable set to $MAKELDFLAGS" >&5
+printf "%s\n" "$as_me: WARNING: You are running configure with the link options ($LDFLAGS) set to a different value from that used by gnustep-make ($MAKELDFLAGS).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use LDFLAGS=$LDFLAGS or run the gnustep-base configure again with your LDFLAGS environment variable set to $MAKELDFLAGS" >&2;}
   fi
 fi
 
@@ -2810,66 +3213,46 @@ CURRENT_GNUSTEP_MAKEFILES="$GNUSTEP_MAKEFILES"
 
 #--------------------------------------------------------------------
 # Use config.guess, config.sub and install-sh provided by gnustep-make
+# Evaluation order of the configure script means we can not depend on
+# GNUSTEP_MAKEFILES being set for simple variable substitution, so we
+# execute a bit of shell code to dynamically get the directory.
 #--------------------------------------------------------------------
-ac_aux_dir=
-for ac_dir in $CURRENT_GNUSTEP_MAKEFILES "$srcdir"/$CURRENT_GNUSTEP_MAKEFILES; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $CURRENT_GNUSTEP_MAKEFILES \"$srcdir\"/$CURRENT_GNUSTEP_MAKEFILES" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
 #--------------------------------------------------------------------
 # Use a .h file with #define's, instead of -D command-line switches
 #--------------------------------------------------------------------
-ac_config_headers="$ac_config_headers Headers/GNUstepBase/config.h"
+ac_config_headers="$ac_config_headers Headers/GNUstepBase/config.h:Headers/GNUstepBase/config.h.in"
 
 
 #--------------------------------------------------------------------
 # Determine the host, build, and target systems
 #--------------------------------------------------------------------
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+  # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -2888,21 +3271,22 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -2921,21 +3305,22 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+printf %s "checking target system type... " >&6; }
+if test ${ac_cv_target+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+  ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+printf "%s\n" "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
@@ -2967,9 +3352,10 @@ test -n "$target_alias" &&
 
 
 # Check whether --with-cross-compilation-info was given.
-if test "${with_cross_compilation_info+set}" = set; then :
+if test ${with_cross_compilation_info+y}
+then :
   withval=$with_cross_compilation_info; cross_result="$withval"
-else
+else $as_nop
   cross_result="no"
 
 fi
@@ -2993,8 +3379,8 @@ fi
 #---------------------------------------------------------------------
 # Location of the GNUstep.conf config file (--with-config-file)
 #---------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUstep configuration file to use at runtime" >&5
-$as_echo_n "checking for GNUstep configuration file to use at runtime... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNUstep configuration file to use at runtime" >&5
+printf %s "checking for GNUstep configuration file to use at runtime... " >&6; }
 
 # This requires gnustep-make > 1.13.0 to work.  For gnustep-make =
 # 1.13.0 we would have to parse
@@ -3013,9 +3399,10 @@ fi
 
 
 # Check whether --with-config-file was given.
-if test "${with_config_file+set}" = set; then :
+if test ${with_config_file+y}
+then :
   withval=$with_config_file; result="$withval"
-else
+else $as_nop
   result="no"
 
 fi
@@ -3032,8 +3419,8 @@ if test x"$GNUSTEP_TARGET_CONFIG_FILE" = x""; then
       GNUSTEP_TARGET_CONFIG_FILE="$GNUSTEP_MAKE_CONFIG" ;;
   esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_TARGET_CONFIG_FILE" >&5
-$as_echo "$GNUSTEP_TARGET_CONFIG_FILE" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_TARGET_CONFIG_FILE" >&5
+printf "%s\n" "$GNUSTEP_TARGET_CONFIG_FILE" >&6; }
 
 #-----------------------------------------------------------------
 # Whether the GNUstep.conf file path can be set in the environment
@@ -3047,27 +3434,28 @@ case "$target_os" in
     mingw*|windows)	enable_env_config=no;;
     *)		enable_env_config=yes;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the GNUstep.conf file path can be set in the environment" >&5
-$as_echo_n "checking whether the GNUstep.conf file path can be set in the environment... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the GNUstep.conf file path can be set in the environment" >&5
+printf %s "checking whether the GNUstep.conf file path can be set in the environment... " >&6; }
 # Check whether --enable-environment-config-file was given.
-if test "${enable_environment_config_file+set}" = set; then :
+if test ${enable_environment_config_file+y}
+then :
   enableval=$enable_environment_config_file; ac_cv_environment_config_file=$enableval
-else
+else $as_nop
   ac_cv_environment_config_file=$enable_env_config
 fi
 
 if test "$ac_cv_environment_config_file" = "yes"; then
 
-$as_echo "#define OPTION_NO_ENVIRONMENT 0" >>confdefs.h
+printf "%s\n" "#define OPTION_NO_ENVIRONMENT 0" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
 
-$as_echo "#define OPTION_NO_ENVIRONMENT 1" >>confdefs.h
+printf "%s\n" "#define OPTION_NO_ENVIRONMENT 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: disabled from the command-line" >&5
-$as_echo "no: disabled from the command-line" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no: disabled from the command-line" >&5
+printf "%s\n" "no: disabled from the command-line" >&6; }
 fi
 
 #--------------------------------------------------------------------
@@ -3100,33 +3488,35 @@ esac
 # installation (or of the config file you specify).
 # It can be annoying in certain cases though; this option lets you
 # turn it off.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should import an existing configuration file now" >&5
-$as_echo_n "checking if we should import an existing configuration file now... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we should import an existing configuration file now" >&5
+printf %s "checking if we should import an existing configuration file now... " >&6; }
 # Check whether --enable-importing-config-file was given.
-if test "${enable_importing_config_file+set}" = set; then :
+if test ${enable_importing_config_file+y}
+then :
   enableval=$enable_importing_config_file; ac_cv_importing_config_file=$enableval
-else
+else $as_nop
   ac_cv_importing_config_file="yes"
 fi
 
 if test "$ac_cv_importing_config_file" = "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: disabled from the command-line" >&5
-$as_echo "no: disabled from the command-line" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no: disabled from the command-line" >&5
+printf "%s\n" "no: disabled from the command-line" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 fi
 
 
 if test "$ac_cv_importing_config_file" = "yes" ;
 then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default GNUstep configuration file to use" >&5
-$as_echo_n "checking for default GNUstep configuration file to use... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default GNUstep configuration file to use" >&5
+printf %s "checking for default GNUstep configuration file to use... " >&6; }
 
 # Check whether --with-default-config was given.
-if test "${with_default_config+set}" = set; then :
+if test ${with_default_config+y}
+then :
   withval=$with_default_config; result="$withval"
-else
+else $as_nop
   result="no"
 
 fi
@@ -3148,8 +3538,8 @@ fi
     # installed.
     GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_MAKE_CONFIG"
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_DEFAULT_CONFIG" >&5
-$as_echo "$GNUSTEP_DEFAULT_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_DEFAULT_CONFIG" >&5
+printf "%s\n" "$GNUSTEP_DEFAULT_CONFIG" >&6; }
 
   #
   # Only try importing if the default config file has been specified.
@@ -3164,8 +3554,8 @@ $as_echo "$GNUSTEP_DEFAULT_CONFIG" >&6; }
     # Use the default config file to override standard values.
     #
     if test ! -f "$GNUSTEP_DEFAULT_CONFIG"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: fail: file \"$GNUSTEP_DEFAULT_CONFIG\" does not exist" >&5
-$as_echo "fail: file \"$GNUSTEP_DEFAULT_CONFIG\" does not exist" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: fail: file \"$GNUSTEP_DEFAULT_CONFIG\" does not exist" >&5
+printf "%s\n" "fail: file \"$GNUSTEP_DEFAULT_CONFIG\" does not exist" >&6; }
       # Ohoh ... things are not going well.  We are asked to import
       # a config file that doesn't exist.  So all paths might be unset
       # and who knows what we'll end up hardcoding into gnustep-base.
@@ -3178,16 +3568,16 @@ $as_echo "fail: file \"$GNUSTEP_DEFAULT_CONFIG\" does not exist" >&6; }
       as_fn_error $? "Please run configure again with the --disable-importing-config-file option or specifying an alternative file using the --with-default-config= option" "$LINENO" 5
       exit 1
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: trying to import \"$GNUSTEP_DEFAULT_CONFIG\"" >&5
-$as_echo "trying to import \"$GNUSTEP_DEFAULT_CONFIG\"" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: trying to import \"$GNUSTEP_DEFAULT_CONFIG\"" >&5
+printf "%s\n" "trying to import \"$GNUSTEP_DEFAULT_CONFIG\"" >&6; }
       if test -r "$GNUSTEP_DEFAULT_CONFIG"
       then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: If this fails, please run configure again with the --disable-importing-config-file option or specifying an alternative file using the --with-default-config= option" >&5
-$as_echo "$as_me: If this fails, please run configure again with the --disable-importing-config-file option or specifying an alternative file using the --with-default-config= option" >&6;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: If this fails, please run configure again with the --disable-importing-config-file option or specifying an alternative file using the --with-default-config= option" >&5
+printf "%s\n" "$as_me: If this fails, please run configure again with the --disable-importing-config-file option or specifying an alternative file using the --with-default-config= option" >&6;}
         . "$GNUSTEP_DEFAULT_CONFIG"
       else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: fail: file \"$GNUSTEP_DEFAULT_CONFIG\" is not readable" >&5
-$as_echo "fail: file \"$GNUSTEP_DEFAULT_CONFIG\" is not readable" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: fail: file \"$GNUSTEP_DEFAULT_CONFIG\" is not readable" >&5
+printf "%s\n" "fail: file \"$GNUSTEP_DEFAULT_CONFIG\" is not readable" >&6; }
 	as_fn_error $? "Unable to import configuration file at $GNUSTEP_DEFAULT_CONFIG.  Please run configure again with a revised/corrected --with-default-config= option or with --disable-importing-config-file." "$LINENO" 5
 	exit 1
       fi
@@ -3258,13 +3648,14 @@ if test x"$GNUSTEP_USER_DIR_DOC" = x""; then GNUSTEP_USER_DIR_DOC=$GNUSTEP_USER_
 if test x"$GNUSTEP_USER_DIR_DOC_MAN" = x""; then GNUSTEP_USER_DIR_DOC_MAN=$GNUSTEP_USER_DIR/Documentation/man; fi
 if test x"$GNUSTEP_USER_DIR_DOC_INFO" = x""; then GNUSTEP_USER_DIR_DOC_INFO=$GNUSTEP_USER_DIR/Documentation/info; fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUstep-base installation domain" >&5
-$as_echo_n "checking for GNUstep-base installation domain... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNUstep-base installation domain" >&5
+printf %s "checking for GNUstep-base installation domain... " >&6; }
 
 # Check whether --with-installation-domain was given.
-if test "${with_installation_domain+set}" = set; then :
+if test ${with_installation_domain+y}
+then :
   withval=$with_installation_domain; result="$withval"
-else
+else $as_nop
   result="no"
 
 fi
@@ -3281,8 +3672,8 @@ then
   then
     result=`gnustep-config --installation-domain-for=gnustep-base 2>&5`
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The 'gnustep-config' script was not found or out of date." >&5
-$as_echo "$as_me: WARNING: The 'gnustep-config' script was not found or out of date." >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The 'gnustep-config' script was not found or out of date." >&5
+printf "%s\n" "$as_me: WARNING: The 'gnustep-config' script was not found or out of date." >&2;}
     result=$GNUSTEP_INSTALLATION_DOMAIN
     if test "$result" = ""
     then
@@ -3294,20 +3685,20 @@ $as_echo "$as_me: WARNING: The 'gnustep-config' script was not found or out of d
 fi
 case "$result" in
   SYSTEM)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: SYSTEM" >&5
-$as_echo "SYSTEM" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SYSTEM" >&5
+printf "%s\n" "SYSTEM" >&6; }
     GNUSTEP_BASE_PATH="$GNUSTEP_SYSTEM_TOOLS";;
   LOCAL)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: LOCAL" >&5
-$as_echo "LOCAL" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: LOCAL" >&5
+printf "%s\n" "LOCAL" >&6; }
     GNUSTEP_BASE_PATH="$GNUSTEP_LOCAL_TOOLS";;
   NETWORK)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: NETWORK" >&5
-$as_echo "NETWORK" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: NETWORK" >&5
+printf "%s\n" "NETWORK" >&6; }
     GNUSTEP_BASE_PATH="$GNUSTEP_NETWORK_TOOLS";;
   USER)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: USER" >&5
-$as_echo "USER" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: USER" >&5
+printf "%s\n" "USER" >&6; }
     GNUSTEP_BASE_PATH="$GNUSTEP_USER_TOOLS";;
   *)
     as_fn_error $? "Unknown installation domain '$result' (it should be SYSTEM, LOCAL, NETWORK or USER).  Please run configure again with the option --with-installation-domain=LOCAL (or whatever domain you want to install into)." "$LINENO" 5
@@ -3405,10 +3796,10 @@ case "$path" in
 esac
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we are hardcoding any relative paths in gnustep-base" >&5
-$as_echo_n "checking if we are hardcoding any relative paths in gnustep-base... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_BASE_RELATIVE_PATHS" >&5
-$as_echo "$GNUSTEP_BASE_RELATIVE_PATHS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we are hardcoding any relative paths in gnustep-base" >&5
+printf %s "checking if we are hardcoding any relative paths in gnustep-base... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_BASE_RELATIVE_PATHS" >&5
+printf "%s\n" "$GNUSTEP_BASE_RELATIVE_PATHS" >&6; }
 
 
 #
@@ -3416,213 +3807,213 @@ $as_echo "$GNUSTEP_BASE_RELATIVE_PATHS" >&6; }
 # into gnustep-base.  This is to help users in finding
 # misconfigurations.
 #
-{ $as_echo "$as_me:${as_lineno-$LINENO}: We store the following filesystem layout into gnustep-base, to be used when no config file is found" >&5
-$as_echo "$as_me: We store the following filesystem layout into gnustep-base, to be used when no config file is found" >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Makefiles directory" >&5
-$as_echo_n "checking for Makefiles directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_MAKEFILES" >&5
-$as_echo "$GNUSTEP_MAKEFILES" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for user defaults directory" >&5
-$as_echo_n "checking for user defaults directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DEFAULTS_DIR" >&5
-$as_echo "$GNUSTEP_USER_DEFAULTS_DIR" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for user config file" >&5
-$as_echo_n "checking for user config file... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_CONFIG_FILE" >&5
-$as_echo "$GNUSTEP_USER_CONFIG_FILE" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: We store the following filesystem layout into gnustep-base, to be used when no config file is found" >&5
+printf "%s\n" "$as_me: We store the following filesystem layout into gnustep-base, to be used when no config file is found" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Makefiles directory" >&5
+printf %s "checking for Makefiles directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_MAKEFILES" >&5
+printf "%s\n" "$GNUSTEP_MAKEFILES" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for user defaults directory" >&5
+printf %s "checking for user defaults directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DEFAULTS_DIR" >&5
+printf "%s\n" "$GNUSTEP_USER_DEFAULTS_DIR" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for user config file" >&5
+printf %s "checking for user config file... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_CONFIG_FILE" >&5
+printf "%s\n" "$GNUSTEP_USER_CONFIG_FILE" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Applications directory" >&5
-$as_echo_n "checking for System Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_APPS" >&5
-$as_echo "$GNUSTEP_SYSTEM_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Admin Applications directory" >&5
-$as_echo_n "checking for System Admin Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_ADMIN_APPS" >&5
-$as_echo "$GNUSTEP_SYSTEM_ADMIN_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Web Applications directory" >&5
-$as_echo_n "checking for System Web Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_WEB_APPS" >&5
-$as_echo "$GNUSTEP_SYSTEM_WEB_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Tools directory" >&5
-$as_echo_n "checking for System Tools directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_TOOLS" >&5
-$as_echo "$GNUSTEP_SYSTEM_TOOLS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Admin Tools directory" >&5
-$as_echo_n "checking for System Admin Tools directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_ADMIN_TOOLS" >&5
-$as_echo "$GNUSTEP_SYSTEM_ADMIN_TOOLS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Library directory" >&5
-$as_echo_n "checking for System Library directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_LIBRARY" >&5
-$as_echo "$GNUSTEP_SYSTEM_LIBRARY" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Libraries directory" >&5
-$as_echo_n "checking for System Libraries directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_LIBRARIES" >&5
-$as_echo "$GNUSTEP_SYSTEM_LIBRARIES" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Headers directory" >&5
-$as_echo_n "checking for System Headers directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_HEADERS" >&5
-$as_echo "$GNUSTEP_SYSTEM_HEADERS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Documentation directory" >&5
-$as_echo_n "checking for System Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_DOC" >&5
-$as_echo "$GNUSTEP_SYSTEM_DOC" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Info Documentation directory" >&5
-$as_echo_n "checking for System Info Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_DOC_INFO" >&5
-$as_echo "$GNUSTEP_SYSTEM_DOC_INFO" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System Man Documentation directory" >&5
-$as_echo_n "checking for System Man Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_DOC_MAN" >&5
-$as_echo "$GNUSTEP_SYSTEM_DOC_MAN" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Applications directory" >&5
+printf %s "checking for System Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_APPS" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Admin Applications directory" >&5
+printf %s "checking for System Admin Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_ADMIN_APPS" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_ADMIN_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Web Applications directory" >&5
+printf %s "checking for System Web Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_WEB_APPS" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_WEB_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Tools directory" >&5
+printf %s "checking for System Tools directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_TOOLS" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_TOOLS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Admin Tools directory" >&5
+printf %s "checking for System Admin Tools directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_ADMIN_TOOLS" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_ADMIN_TOOLS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Library directory" >&5
+printf %s "checking for System Library directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_LIBRARY" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_LIBRARY" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Libraries directory" >&5
+printf %s "checking for System Libraries directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_LIBRARIES" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_LIBRARIES" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Headers directory" >&5
+printf %s "checking for System Headers directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_HEADERS" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_HEADERS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Documentation directory" >&5
+printf %s "checking for System Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_DOC" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_DOC" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Info Documentation directory" >&5
+printf %s "checking for System Info Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_DOC_INFO" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_DOC_INFO" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System Man Documentation directory" >&5
+printf %s "checking for System Man Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_DOC_MAN" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_DOC_MAN" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Applications directory" >&5
-$as_echo_n "checking for Network Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_APPS" >&5
-$as_echo "$GNUSTEP_NETWORK_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Admin Applications directory" >&5
-$as_echo_n "checking for Network Admin Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_ADMIN_APPS" >&5
-$as_echo "$GNUSTEP_NETWORK_ADMIN_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Web Applications directory" >&5
-$as_echo_n "checking for Network Web Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_WEB_APPS" >&5
-$as_echo "$GNUSTEP_NETWORK_WEB_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Tools directory" >&5
-$as_echo_n "checking for Network Tools directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_TOOLS" >&5
-$as_echo "$GNUSTEP_NETWORK_TOOLS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Admin Tools directory" >&5
-$as_echo_n "checking for Network Admin Tools directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_ADMIN_TOOLS" >&5
-$as_echo "$GNUSTEP_NETWORK_ADMIN_TOOLS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Library directory" >&5
-$as_echo_n "checking for Network Library directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_LIBRARY" >&5
-$as_echo "$GNUSTEP_NETWORK_LIBRARY" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Libraries directory" >&5
-$as_echo_n "checking for Network Libraries directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_LIBRARIES" >&5
-$as_echo "$GNUSTEP_NETWORK_LIBRARIES" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Headers directory" >&5
-$as_echo_n "checking for Network Headers directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_HEADERS" >&5
-$as_echo "$GNUSTEP_NETWORK_HEADERS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Documentation directory" >&5
-$as_echo_n "checking for Network Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_DOC" >&5
-$as_echo "$GNUSTEP_NETWORK_DOC" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Info Documentation directory" >&5
-$as_echo_n "checking for Network Info Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_DOC_INFO" >&5
-$as_echo "$GNUSTEP_NETWORK_DOC_INFO" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network Man Documentation directory" >&5
-$as_echo_n "checking for Network Man Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_DOC_MAN" >&5
-$as_echo "$GNUSTEP_NETWORK_DOC_MAN" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Applications directory" >&5
+printf %s "checking for Network Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_APPS" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Admin Applications directory" >&5
+printf %s "checking for Network Admin Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_ADMIN_APPS" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_ADMIN_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Web Applications directory" >&5
+printf %s "checking for Network Web Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_WEB_APPS" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_WEB_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Tools directory" >&5
+printf %s "checking for Network Tools directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_TOOLS" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_TOOLS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Admin Tools directory" >&5
+printf %s "checking for Network Admin Tools directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_ADMIN_TOOLS" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_ADMIN_TOOLS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Library directory" >&5
+printf %s "checking for Network Library directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_LIBRARY" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_LIBRARY" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Libraries directory" >&5
+printf %s "checking for Network Libraries directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_LIBRARIES" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_LIBRARIES" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Headers directory" >&5
+printf %s "checking for Network Headers directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_HEADERS" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_HEADERS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Documentation directory" >&5
+printf %s "checking for Network Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_DOC" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_DOC" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Info Documentation directory" >&5
+printf %s "checking for Network Info Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_DOC_INFO" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_DOC_INFO" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network Man Documentation directory" >&5
+printf %s "checking for Network Man Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_DOC_MAN" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_DOC_MAN" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Applications directory" >&5
-$as_echo_n "checking for Local Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_APPS" >&5
-$as_echo "$GNUSTEP_LOCAL_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Admin Applications directory" >&5
-$as_echo_n "checking for Local Admin Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_ADMIN_APPS" >&5
-$as_echo "$GNUSTEP_LOCAL_ADMIN_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Web Applications directory" >&5
-$as_echo_n "checking for Local Web Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_WEB_APPS" >&5
-$as_echo "$GNUSTEP_LOCAL_WEB_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Tools directory" >&5
-$as_echo_n "checking for Local Tools directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_TOOLS" >&5
-$as_echo "$GNUSTEP_LOCAL_TOOLS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Admin Tools directory" >&5
-$as_echo_n "checking for Local Admin Tools directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_ADMIN_TOOLS" >&5
-$as_echo "$GNUSTEP_LOCAL_ADMIN_TOOLS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Library directory" >&5
-$as_echo_n "checking for Local Library directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_LIBRARY" >&5
-$as_echo "$GNUSTEP_LOCAL_LIBRARY" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Libraries directory" >&5
-$as_echo_n "checking for Local Libraries directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_LIBRARIES" >&5
-$as_echo "$GNUSTEP_LOCAL_LIBRARIES" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Headers directory" >&5
-$as_echo_n "checking for Local Headers directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_HEADERS" >&5
-$as_echo "$GNUSTEP_LOCAL_HEADERS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Documentation directory" >&5
-$as_echo_n "checking for Local Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_DOC" >&5
-$as_echo "$GNUSTEP_LOCAL_DOC" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Info Documentation directory" >&5
-$as_echo_n "checking for Local Info Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_DOC_INFO" >&5
-$as_echo "$GNUSTEP_LOCAL_DOC_INFO" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local Man Documentation directory" >&5
-$as_echo_n "checking for Local Man Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_DOC_MAN" >&5
-$as_echo "$GNUSTEP_LOCAL_DOC_MAN" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Applications directory" >&5
+printf %s "checking for Local Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_APPS" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Admin Applications directory" >&5
+printf %s "checking for Local Admin Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_ADMIN_APPS" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_ADMIN_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Web Applications directory" >&5
+printf %s "checking for Local Web Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_WEB_APPS" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_WEB_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Tools directory" >&5
+printf %s "checking for Local Tools directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_TOOLS" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_TOOLS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Admin Tools directory" >&5
+printf %s "checking for Local Admin Tools directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_ADMIN_TOOLS" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_ADMIN_TOOLS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Library directory" >&5
+printf %s "checking for Local Library directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_LIBRARY" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_LIBRARY" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Libraries directory" >&5
+printf %s "checking for Local Libraries directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_LIBRARIES" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_LIBRARIES" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Headers directory" >&5
+printf %s "checking for Local Headers directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_HEADERS" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_HEADERS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Documentation directory" >&5
+printf %s "checking for Local Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_DOC" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_DOC" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Info Documentation directory" >&5
+printf %s "checking for Local Info Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_DOC_INFO" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_DOC_INFO" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local Man Documentation directory" >&5
+printf %s "checking for Local Man Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_DOC_MAN" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_DOC_MAN" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Applications directory" >&5
-$as_echo_n "checking for User Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_APPS" >&5
-$as_echo "$GNUSTEP_USER_DIR_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Admin Applications directory" >&5
-$as_echo_n "checking for User Admin Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_ADMIN_APPS" >&5
-$as_echo "$GNUSTEP_USER_DIR_ADMIN_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Web Applications directory" >&5
-$as_echo_n "checking for User Web Applications directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_WEB_APPS" >&5
-$as_echo "$GNUSTEP_USER_DIR_WEB_APPS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Tools directory" >&5
-$as_echo_n "checking for User Tools directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_TOOLS" >&5
-$as_echo "$GNUSTEP_USER_DIR_TOOLS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Admin Tools directory" >&5
-$as_echo_n "checking for User Admin Tools directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_ADMIN_TOOLS" >&5
-$as_echo "$GNUSTEP_USER_DIR_ADMIN_TOOLS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Library directory" >&5
-$as_echo_n "checking for User Library directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_LIBRARY" >&5
-$as_echo "$GNUSTEP_USER_DIR_LIBRARY" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Libraries directory" >&5
-$as_echo_n "checking for User Libraries directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_LIBRARIES" >&5
-$as_echo "$GNUSTEP_USER_DIR_LIBRARIES" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Headers directory" >&5
-$as_echo_n "checking for User Headers directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_HEADERS" >&5
-$as_echo "$GNUSTEP_USER_DIR_HEADERS" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Documentation directory" >&5
-$as_echo_n "checking for User Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_DOC" >&5
-$as_echo "$GNUSTEP_USER_DIR_DOC" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Info Documentation directory" >&5
-$as_echo_n "checking for User Info Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_DOC_INFO" >&5
-$as_echo "$GNUSTEP_USER_DIR_DOC_INFO" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for User Man Documentation directory" >&5
-$as_echo_n "checking for User Man Documentation directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_DOC_MAN" >&5
-$as_echo "$GNUSTEP_USER_DIR_DOC_MAN" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Applications directory" >&5
+printf %s "checking for User Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_APPS" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Admin Applications directory" >&5
+printf %s "checking for User Admin Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_ADMIN_APPS" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_ADMIN_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Web Applications directory" >&5
+printf %s "checking for User Web Applications directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_WEB_APPS" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_WEB_APPS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Tools directory" >&5
+printf %s "checking for User Tools directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_TOOLS" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_TOOLS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Admin Tools directory" >&5
+printf %s "checking for User Admin Tools directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_ADMIN_TOOLS" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_ADMIN_TOOLS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Library directory" >&5
+printf %s "checking for User Library directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_LIBRARY" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_LIBRARY" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Libraries directory" >&5
+printf %s "checking for User Libraries directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_LIBRARIES" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_LIBRARIES" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Headers directory" >&5
+printf %s "checking for User Headers directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_HEADERS" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_HEADERS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Documentation directory" >&5
+printf %s "checking for User Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_DOC" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_DOC" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Info Documentation directory" >&5
+printf %s "checking for User Info Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_DOC_INFO" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_DOC_INFO" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for User Man Documentation directory" >&5
+printf %s "checking for User Man Documentation directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_USER_DIR_DOC_MAN" >&5
+printf "%s\n" "$GNUSTEP_USER_DIR_DOC_MAN" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for System User directory" >&5
-$as_echo_n "checking for System User directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_USERS_DIR" >&5
-$as_echo "$GNUSTEP_SYSTEM_USERS_DIR" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Network User directory" >&5
-$as_echo_n "checking for Network User directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_USERS_DIR" >&5
-$as_echo "$GNUSTEP_NETWORK_USERS_DIR" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Local User directory" >&5
-$as_echo_n "checking for Local User directory... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_USERS_DIR" >&5
-$as_echo "$GNUSTEP_LOCAL_USERS_DIR" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for System User directory" >&5
+printf %s "checking for System User directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_SYSTEM_USERS_DIR" >&5
+printf "%s\n" "$GNUSTEP_SYSTEM_USERS_DIR" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Network User directory" >&5
+printf %s "checking for Network User directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_NETWORK_USERS_DIR" >&5
+printf "%s\n" "$GNUSTEP_NETWORK_USERS_DIR" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Local User directory" >&5
+printf %s "checking for Local User directory... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNUSTEP_LOCAL_USERS_DIR" >&5
+printf "%s\n" "$GNUSTEP_LOCAL_USERS_DIR" >&6; }
 
 #
 # Set the default configuration file values in config.h to be hard-coded
@@ -3630,27 +4021,19 @@ $as_echo "$GNUSTEP_LOCAL_USERS_DIR" >&6; }
 #
 GNUSTEP_MAKEFILES=`echo $GNUSTEP_MAKEFILES|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_MAKEFILES "$GNUSTEP_MAKEFILES"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_MAKEFILES \"$GNUSTEP_MAKEFILES\"" >>confdefs.h
 
 GNUSTEP_USER_DEFAULTS_DIR=`echo $GNUSTEP_USER_DEFAULTS_DIR|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DEFAULTS_DIR "$GNUSTEP_USER_DEFAULTS_DIR"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DEFAULTS_DIR \"$GNUSTEP_USER_DEFAULTS_DIR\"" >>confdefs.h
 
 GNUSTEP_USER_CONFIG_FILE=`echo $GNUSTEP_USER_CONFIG_FILE|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_CONFIG_FILE "$GNUSTEP_USER_CONFIG_FILE"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_CONFIG_FILE \"$GNUSTEP_USER_CONFIG_FILE\"" >>confdefs.h
 
 GNUSTEP_TARGET_CONFIG_FILE=`echo $GNUSTEP_TARGET_CONFIG_FILE|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_CONFIG_FILE "$GNUSTEP_TARGET_CONFIG_FILE"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_CONFIG_FILE \"$GNUSTEP_TARGET_CONFIG_FILE\"" >>confdefs.h
 
 
 #
@@ -3658,79 +4041,57 @@ _ACEOF
 #
 GNUSTEP_SYSTEM_APPS=`echo $GNUSTEP_SYSTEM_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_APPS "$GNUSTEP_SYSTEM_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_APPS \"$GNUSTEP_SYSTEM_APPS\"" >>confdefs.h
 
 
 GNUSTEP_SYSTEM_ADMIN_APPS=`echo $GNUSTEP_SYSTEM_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_ADMIN_APPS "$GNUSTEP_SYSTEM_ADMIN_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_ADMIN_APPS \"$GNUSTEP_SYSTEM_ADMIN_APPS\"" >>confdefs.h
 
 
 GNUSTEP_SYSTEM_WEB_APPS=`echo $GNUSTEP_SYSTEM_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_WEB_APPS "$GNUSTEP_SYSTEM_WEB_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_WEB_APPS \"$GNUSTEP_SYSTEM_WEB_APPS\"" >>confdefs.h
 
 
 GNUSTEP_SYSTEM_TOOLS=`echo $GNUSTEP_SYSTEM_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_TOOLS "$GNUSTEP_SYSTEM_TOOLS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_TOOLS \"$GNUSTEP_SYSTEM_TOOLS\"" >>confdefs.h
 
 
 GNUSTEP_SYSTEM_ADMIN_TOOLS=`echo $GNUSTEP_SYSTEM_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_ADMIN_TOOLS "$GNUSTEP_SYSTEM_ADMIN_TOOLS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_ADMIN_TOOLS \"$GNUSTEP_SYSTEM_ADMIN_TOOLS\"" >>confdefs.h
 
 
 GNUSTEP_SYSTEM_LIBRARY=`echo $GNUSTEP_SYSTEM_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_LIBRARY "$GNUSTEP_SYSTEM_LIBRARY"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_LIBRARY \"$GNUSTEP_SYSTEM_LIBRARY\"" >>confdefs.h
 
 
 GNUSTEP_SYSTEM_LIBRARIES=`echo $GNUSTEP_SYSTEM_LIBRARIES|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_LIBRARIES "$GNUSTEP_SYSTEM_LIBRARIES"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_LIBRARIES \"$GNUSTEP_SYSTEM_LIBRARIES\"" >>confdefs.h
 
 
 GNUSTEP_SYSTEM_HEADERS=`echo $GNUSTEP_SYSTEM_HEADERS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_HEADERS "$GNUSTEP_SYSTEM_HEADERS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_HEADERS \"$GNUSTEP_SYSTEM_HEADERS\"" >>confdefs.h
 
 
 GNUSTEP_SYSTEM_DOC=`echo $GNUSTEP_SYSTEM_DOC|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_DOC "$GNUSTEP_SYSTEM_DOC"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_DOC \"$GNUSTEP_SYSTEM_DOC\"" >>confdefs.h
 
 
 GNUSTEP_SYSTEM_DOC_MAN=`echo $GNUSTEP_SYSTEM_DOC_MAN|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_DOC_MAN "$GNUSTEP_SYSTEM_DOC_MAN"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_DOC_MAN \"$GNUSTEP_SYSTEM_DOC_MAN\"" >>confdefs.h
 
 
 GNUSTEP_SYSTEM_DOC_INFO=`echo $GNUSTEP_SYSTEM_DOC_INFO|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_DOC_INFO "$GNUSTEP_SYSTEM_DOC_INFO"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_DOC_INFO \"$GNUSTEP_SYSTEM_DOC_INFO\"" >>confdefs.h
 
 
 #
@@ -3738,79 +4099,57 @@ _ACEOF
 #
 GNUSTEP_NETWORK_APPS=`echo $GNUSTEP_NETWORK_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_APPS "$GNUSTEP_NETWORK_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_APPS \"$GNUSTEP_NETWORK_APPS\"" >>confdefs.h
 
 
 GNUSTEP_NETWORK_ADMIN_APPS=`echo $GNUSTEP_NETWORK_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_ADMIN_APPS "$GNUSTEP_NETWORK_ADMIN_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_ADMIN_APPS \"$GNUSTEP_NETWORK_ADMIN_APPS\"" >>confdefs.h
 
 
 GNUSTEP_NETWORK_WEB_APPS=`echo $GNUSTEP_NETWORK_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_WEB_APPS "$GNUSTEP_NETWORK_WEB_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_WEB_APPS \"$GNUSTEP_NETWORK_WEB_APPS\"" >>confdefs.h
 
 
 GNUSTEP_NETWORK_TOOLS=`echo $GNUSTEP_NETWORK_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_TOOLS "$GNUSTEP_NETWORK_TOOLS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_TOOLS \"$GNUSTEP_NETWORK_TOOLS\"" >>confdefs.h
 
 
 GNUSTEP_NETWORK_ADMIN_TOOLS=`echo $GNUSTEP_NETWORK_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_ADMIN_TOOLS "$GNUSTEP_NETWORK_ADMIN_TOOLS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_ADMIN_TOOLS \"$GNUSTEP_NETWORK_ADMIN_TOOLS\"" >>confdefs.h
 
 
 GNUSTEP_NETWORK_LIBRARY=`echo $GNUSTEP_NETWORK_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_LIBRARY "$GNUSTEP_NETWORK_LIBRARY"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_LIBRARY \"$GNUSTEP_NETWORK_LIBRARY\"" >>confdefs.h
 
 
 GNUSTEP_NETWORK_LIBRARIES=`echo $GNUSTEP_NETWORK_LIBRARIES|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_LIBRARIES "$GNUSTEP_NETWORK_LIBRARIES"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_LIBRARIES \"$GNUSTEP_NETWORK_LIBRARIES\"" >>confdefs.h
 
 
 GNUSTEP_NETWORK_HEADERS=`echo $GNUSTEP_NETWORK_HEADERS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_HEADERS "$GNUSTEP_NETWORK_HEADERS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_HEADERS \"$GNUSTEP_NETWORK_HEADERS\"" >>confdefs.h
 
 
 GNUSTEP_NETWORK_DOC=`echo $GNUSTEP_NETWORK_DOC|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_DOC "$GNUSTEP_NETWORK_DOC"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_DOC \"$GNUSTEP_NETWORK_DOC\"" >>confdefs.h
 
 
 GNUSTEP_NETWORK_DOC_MAN=`echo $GNUSTEP_NETWORK_DOC_MAN|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_DOC_MAN "$GNUSTEP_NETWORK_DOC_MAN"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_DOC_MAN \"$GNUSTEP_NETWORK_DOC_MAN\"" >>confdefs.h
 
 
 GNUSTEP_NETWORK_DOC_INFO=`echo $GNUSTEP_NETWORK_DOC_INFO|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_DOC_INFO "$GNUSTEP_NETWORK_DOC_INFO"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_DOC_INFO \"$GNUSTEP_NETWORK_DOC_INFO\"" >>confdefs.h
 
 
 #
@@ -3818,79 +4157,57 @@ _ACEOF
 #
 GNUSTEP_LOCAL_APPS=`echo $GNUSTEP_LOCAL_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_APPS "$GNUSTEP_LOCAL_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_APPS \"$GNUSTEP_LOCAL_APPS\"" >>confdefs.h
 
 
 GNUSTEP_LOCAL_ADMIN_APPS=`echo $GNUSTEP_LOCAL_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_ADMIN_APPS "$GNUSTEP_LOCAL_ADMIN_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_ADMIN_APPS \"$GNUSTEP_LOCAL_ADMIN_APPS\"" >>confdefs.h
 
 
 GNUSTEP_LOCAL_WEB_APPS=`echo $GNUSTEP_LOCAL_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_WEB_APPS "$GNUSTEP_LOCAL_WEB_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_WEB_APPS \"$GNUSTEP_LOCAL_WEB_APPS\"" >>confdefs.h
 
 
 GNUSTEP_LOCAL_TOOLS=`echo $GNUSTEP_LOCAL_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_TOOLS "$GNUSTEP_LOCAL_TOOLS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_TOOLS \"$GNUSTEP_LOCAL_TOOLS\"" >>confdefs.h
 
 
 GNUSTEP_LOCAL_ADMIN_TOOLS=`echo $GNUSTEP_LOCAL_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_ADMIN_TOOLS "$GNUSTEP_LOCAL_ADMIN_TOOLS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_ADMIN_TOOLS \"$GNUSTEP_LOCAL_ADMIN_TOOLS\"" >>confdefs.h
 
 
 GNUSTEP_LOCAL_LIBRARY=`echo $GNUSTEP_LOCAL_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_LIBRARY "$GNUSTEP_LOCAL_LIBRARY"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_LIBRARY \"$GNUSTEP_LOCAL_LIBRARY\"" >>confdefs.h
 
 
 GNUSTEP_LOCAL_LIBRARIES=`echo $GNUSTEP_LOCAL_LIBRARIES|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_LIBRARIES "$GNUSTEP_LOCAL_LIBRARIES"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_LIBRARIES \"$GNUSTEP_LOCAL_LIBRARIES\"" >>confdefs.h
 
 
 GNUSTEP_LOCAL_HEADERS=`echo $GNUSTEP_LOCAL_HEADERS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_HEADERS "$GNUSTEP_LOCAL_HEADERS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_HEADERS \"$GNUSTEP_LOCAL_HEADERS\"" >>confdefs.h
 
 
 GNUSTEP_LOCAL_DOC=`echo $GNUSTEP_LOCAL_DOC|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_DOC "$GNUSTEP_LOCAL_DOC"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_DOC \"$GNUSTEP_LOCAL_DOC\"" >>confdefs.h
 
 
 GNUSTEP_LOCAL_DOC_MAN=`echo $GNUSTEP_LOCAL_DOC_MAN|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_DOC_MAN "$GNUSTEP_LOCAL_DOC_MAN"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_DOC_MAN \"$GNUSTEP_LOCAL_DOC_MAN\"" >>confdefs.h
 
 
 GNUSTEP_LOCAL_DOC_INFO=`echo $GNUSTEP_LOCAL_DOC_INFO|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_DOC_INFO "$GNUSTEP_LOCAL_DOC_INFO"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_DOC_INFO \"$GNUSTEP_LOCAL_DOC_INFO\"" >>confdefs.h
 
 
 #
@@ -3898,98 +4215,70 @@ _ACEOF
 #
 GNUSTEP_USER_DIR_APPS=`echo $GNUSTEP_USER_DIR_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_APPS "$GNUSTEP_USER_DIR_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_APPS \"$GNUSTEP_USER_DIR_APPS\"" >>confdefs.h
 
 
 GNUSTEP_USER_DIR_ADMIN_APPS=`echo $GNUSTEP_USER_DIR_ADMIN_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_ADMIN_APPS "$GNUSTEP_USER_DIR_ADMIN_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_ADMIN_APPS \"$GNUSTEP_USER_DIR_ADMIN_APPS\"" >>confdefs.h
 
 
 GNUSTEP_USER_DIR_WEB_APPS=`echo $GNUSTEP_USER_DIR_WEB_APPS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_WEB_APPS "$GNUSTEP_USER_DIR_WEB_APPS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_WEB_APPS \"$GNUSTEP_USER_DIR_WEB_APPS\"" >>confdefs.h
 
 
 GNUSTEP_USER_DIR_TOOLS=`echo $GNUSTEP_USER_DIR_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_TOOLS "$GNUSTEP_USER_DIR_TOOLS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_TOOLS \"$GNUSTEP_USER_DIR_TOOLS\"" >>confdefs.h
 
 
 GNUSTEP_USER_DIR_ADMIN_TOOLS=`echo $GNUSTEP_USER_DIR_ADMIN_TOOLS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_ADMIN_TOOLS "$GNUSTEP_USER_DIR_ADMIN_TOOLS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_ADMIN_TOOLS \"$GNUSTEP_USER_DIR_ADMIN_TOOLS\"" >>confdefs.h
 
 
 GNUSTEP_USER_DIR_LIBRARY=`echo $GNUSTEP_USER_DIR_LIBRARY|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_LIBRARY "$GNUSTEP_USER_DIR_LIBRARY"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_LIBRARY \"$GNUSTEP_USER_DIR_LIBRARY\"" >>confdefs.h
 
 
 GNUSTEP_USER_DIR_LIBRARIES=`echo $GNUSTEP_USER_DIR_LIBRARIES|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_LIBRARIES "$GNUSTEP_USER_DIR_LIBRARIES"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_LIBRARIES \"$GNUSTEP_USER_DIR_LIBRARIES\"" >>confdefs.h
 
 
 GNUSTEP_USER_DIR_HEADERS=`echo $GNUSTEP_USER_DIR_HEADERS|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_HEADERS "$GNUSTEP_USER_DIR_HEADERS"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_HEADERS \"$GNUSTEP_USER_DIR_HEADERS\"" >>confdefs.h
 
 
 GNUSTEP_USER_DIR_DOC=`echo $GNUSTEP_USER_DIR_DOC|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_DOC "$GNUSTEP_USER_DIR_DOC"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_DOC \"$GNUSTEP_USER_DIR_DOC\"" >>confdefs.h
 
 
 GNUSTEP_USER_DIR_DOC_MAN=`echo $GNUSTEP_USER_DIR_DOC_MAN|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_DOC_MAN "$GNUSTEP_USER_DIR_DOC_MAN"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_DOC_MAN \"$GNUSTEP_USER_DIR_DOC_MAN\"" >>confdefs.h
 
 
 GNUSTEP_USER_DIR_DOC_INFO=`echo $GNUSTEP_USER_DIR_DOC_INFO|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_USER_DIR_DOC_INFO "$GNUSTEP_USER_DIR_DOC_INFO"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_USER_DIR_DOC_INFO \"$GNUSTEP_USER_DIR_DOC_INFO\"" >>confdefs.h
 
 
 GNUSTEP_TARGET_SYSTEM_USERS_DIR=`echo $GNUSTEP_TARGET_SYSTEM_USERS_DIR|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_SYSTEM_USERS_DIR "$GNUSTEP_TARGET_SYSTEM_USERS_DIR"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_SYSTEM_USERS_DIR \"$GNUSTEP_TARGET_SYSTEM_USERS_DIR\"" >>confdefs.h
 
 GNUSTEP_TARGET_NETWORK_USERS_DIR=`echo $GNUSTEP_TARGET_NETWORK_USERS_DIR|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_NETWORK_USERS_DIR "$GNUSTEP_TARGET_NETWORK_USERS_DIR"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_NETWORK_USERS_DIR \"$GNUSTEP_TARGET_NETWORK_USERS_DIR\"" >>confdefs.h
 
 GNUSTEP_TARGET_LOCAL_USERS_DIR=`echo $GNUSTEP_TARGET_LOCAL_USERS_DIR|sed -e 's/\\\\/\\\\\\\\/g'`
 
-cat >>confdefs.h <<_ACEOF
-#define GNUSTEP_TARGET_LOCAL_USERS_DIR "$GNUSTEP_TARGET_LOCAL_USERS_DIR"
-_ACEOF
+printf "%s\n" "#define GNUSTEP_TARGET_LOCAL_USERS_DIR \"$GNUSTEP_TARGET_LOCAL_USERS_DIR\"" >>confdefs.h
 
 
 #
@@ -4094,8 +4383,8 @@ if test "$CC" = ""; then
   export CC
 else
   if test "$CC" != "$MAKECC"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CC=$CC or run the gnustep-base configure again with your CC environment variable set to $MAKECC" >&5
-$as_echo "$as_me: WARNING: You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CC=$CC or run the gnustep-base configure again with your CC environment variable set to $MAKECC" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CC=$CC or run the gnustep-base configure again with your CC environment variable set to $MAKECC" >&5
+printf "%s\n" "$as_me: WARNING: You are running configure with the compiler ($CC) set to a different value from that used by gnustep-make ($MAKECC).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CC=$CC or run the gnustep-base configure again with your CC environment variable set to $MAKECC" >&2;}
   fi
 fi
 if test "$CPP" = ""; then
@@ -4103,8 +4392,8 @@ if test "$CPP" = ""; then
   export CPP
 else
   if test "$CPP" != "$MAKECPP"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the preprocessor ($CPP) set to a different value from that used by gnustep-make ($MAKECPP).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CPP=$CPP or run the gnustep-base configure again with your CPP environment variable set to $MAKECPP" >&5
-$as_echo "$as_me: WARNING: You are running configure with the preprocessor ($CPP) set to a different value from that used by gnustep-make ($MAKECPP).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CPP=$CPP or run the gnustep-base configure again with your CPP environment variable set to $MAKECPP" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the preprocessor ($CPP) set to a different value from that used by gnustep-make ($MAKECPP).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CPP=$CPP or run the gnustep-base configure again with your CPP environment variable set to $MAKECPP" >&5
+printf "%s\n" "$as_me: WARNING: You are running configure with the preprocessor ($CPP) set to a different value from that used by gnustep-make ($MAKECPP).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CPP=$CPP or run the gnustep-base configure again with your CPP environment variable set to $MAKECPP" >&2;}
   fi
 fi
 if test "$CXX" = ""; then
@@ -4112,10 +4401,19 @@ if test "$CXX" = ""; then
   export CXX
 else
   if test "$CXX" != "$MAKECXX"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the compiler ($CXX) set to a different value from that used by gnustep-make ($MAKECXX).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CXX=$CXX or run the gnustep-base configure again with your CXX environment variable set to $MAKECXX" >&5
-$as_echo "$as_me: WARNING: You are running configure with the compiler ($CXX) set to a different value from that used by gnustep-make ($MAKECXX).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CXX=$CXX or run the gnustep-base configure again with your CXX environment variable set to $MAKECXX" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You are running configure with the compiler ($CXX) set to a different value from that used by gnustep-make ($MAKECXX).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CXX=$CXX or run the gnustep-base configure again with your CXX environment variable set to $MAKECXX" >&5
+printf "%s\n" "$as_me: WARNING: You are running configure with the compiler ($CXX) set to a different value from that used by gnustep-make ($MAKECXX).  To avoid conflicts/problems, reconfigure/reinstall gnustep-make to use CXX=$CXX or run the gnustep-base configure again with your CXX environment variable set to $MAKECXX" >&2;}
   fi
 fi
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4124,11 +4422,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -4136,11 +4435,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4151,11 +4454,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4164,11 +4467,12 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -4176,11 +4480,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4191,11 +4499,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -4203,8 +4511,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -4217,11 +4525,12 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -4229,11 +4538,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4244,11 +4557,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4257,11 +4570,12 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -4270,15 +4584,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4294,18 +4612,18 @@ if test $ac_prog_rejected = yes; then
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4316,11 +4634,12 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -4328,11 +4647,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4343,11 +4666,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4360,11 +4683,12 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -4372,11 +4696,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4387,11 +4715,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4403,8 +4731,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -4412,25 +4740,129 @@ esac
 fi
 
 fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+
+
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -4440,7 +4872,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -4448,7 +4880,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -4460,9 +4892,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -4483,11 +4915,12 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -4504,7 +4937,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -4520,44 +4953,46 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
+else $as_nop
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -4571,15 +5006,15 @@ for ac_file in conftest.exe conftest conftest.*; do
     * ) break;;
   esac
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -4588,7 +5023,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -4600,8 +5035,8 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -4609,10 +5044,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -4620,39 +5055,40 @@ $as_echo "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -4666,11 +5102,12 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -4679,31 +5116,32 @@ $as_echo "$ac_try_echo"; } >&5
        break;;
   esac
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -4713,29 +5151,33 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -4744,57 +5186,60 @@ else
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
-else
+else $as_nop
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -4809,94 +5254,144 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
+
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
+
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
+$ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
 fi
 
 ac_ext=c
@@ -4910,40 +5405,36 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4955,10 +5446,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4968,7 +5460,8 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -4980,29 +5473,24 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -5014,10 +5502,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -5027,11 +5516,12 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -5043,343 +5533,192 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
     fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
   fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
 done
 
 
 
-  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
-  MINIX=yes
-else
-  MINIX=
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
 fi
 
 
-  if test "$MINIX" = yes; then
-
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
 
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
 
-$as_echo "#define _MINIX 1" >>confdefs.h
-
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #         define __EXTENSIONS__ 1
           $ac_includes_default
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_safe_to_define___extensions__=yes
-else
+else $as_nop
   ac_cv_safe_to_define___extensions__=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
 
-  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_should_define__xopen_source=no
+    if test $ac_cv_header_wchar_h = yes
+then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+          #include <wchar.h>
+          mbstate_t x;
+int
+main (void)
+{
 
-  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+            #define _XOPEN_SOURCE 500
+            #include <wchar.h>
+            mbstate_t x;
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+  if test $ac_cv_header_minix_config_h = yes
+then :
+  MINIX=yes
+    printf "%s\n" "#define _MINIX 1" >>confdefs.h
+
+    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+
+    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else $as_nop
+  MINIX=
+fi
+  if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+  if test $ac_cv_should_define__xopen_source = yes
+then :
+  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
-$as_echo_n "checking whether the compiler is clang... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5
+printf %s "checking whether the compiler is clang... " >&6; }
 if test ! x"${GCC}" = x"yes" ; then
   CLANG_CC=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 else
   if "${CC}" -v 2>&1 | grep -q 'clang version'; then
     CLANG_CC=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
     CLANG_CC=no
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   fi
 fi
 
@@ -5388,18 +5727,19 @@ fi
 # Large file support needed by NSData/NSFileHandle.
 # These macros must be called after AC_USE_SYSTEM_EXTENSIONS because
 # the `fseeko' declaration may be hidden by default on some systems.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_source+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+if test ${ac_cv_sys_largefile_source+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h> /* for off_t */
      #include <stdio.h>
 int
-main ()
+main (void)
 {
 int (*fp) (FILE *, off_t, int) = fseeko;
      return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
@@ -5407,10 +5747,11 @@ int (*fp) (FILE *, off_t, int) = fseeko;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_sys_largefile_source=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5418,7 +5759,7 @@ rm -f core conftest.err conftest.$ac_objext \
 #include <sys/types.h> /* for off_t */
      #include <stdio.h>
 int
-main ()
+main (void)
 {
 int (*fp) (FILE *, off_t, int) = fseeko;
      return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
@@ -5426,23 +5767,22 @@ int (*fp) (FILE *, off_t, int) = fseeko;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_sys_largefile_source=1; break
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   ac_cv_sys_largefile_source=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
-$as_echo "$ac_cv_sys_largefile_source" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
+printf "%s\n" "$ac_cv_sys_largefile_source" >&6; }
 case $ac_cv_sys_largefile_source in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-_ACEOF
+printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
@@ -5452,23 +5792,25 @@ rm -rf conftest*
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
 if test $ac_cv_sys_largefile_source != unknown; then
 
-$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h
 
 fi
 
 
 # Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
+if test ${enable_largefile+y}
+then :
   enableval=$enable_largefile;
 fi
 
 if test "$enable_largefile" != no; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+printf %s "checking for special C compiler options needed for large files... " >&6; }
+if test ${ac_cv_sys_largefile_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
        ac_save_CC=$CC
@@ -5482,44 +5824,47 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 if ac_fn_c_try_compile "$LINENO"
+then :
   break
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_largefile_CC=' -n32'; break
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 	 break
        done
        CC=$ac_save_CC
        rm -f conftest.$ac_ext
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test ${ac_cv_sys_file_offset_bits+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5528,22 +5873,23 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_file_offset_bits=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _FILE_OFFSET_BITS 64
@@ -5552,43 +5898,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_file_offset_bits=64; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_file_offset_bits=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
+printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test ${ac_cv_sys_large_files+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5597,22 +5943,23 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_large_files=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGE_FILES 1
@@ -5621,50 +5968,46 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_large_files=1; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_large_files=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+printf "%s\n" "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
+printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   fi
-
-
 fi
 
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = xyes; then :
+if test "x$ac_cv_type_off_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
+printf "%s\n" "#define off_t long int" >>confdefs.h
 
 fi
 
@@ -5679,35 +6022,36 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports atomic operations" >&5
-$as_echo_n "checking whether the compiler supports atomic operations... " >&6; };
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports atomic operations" >&5
+printf %s "checking whether the compiler supports atomic operations... " >&6; };
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 typedef int atomic;
 int
-main ()
+main (void)
 {
 atomic x; atomic y; __sync_bool_compare_and_swap(&x, y, y + 1);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_atomic=yes
-else
+else $as_nop
   have_atomic=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext;
   if test "$have_atomic" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
 
-$as_echo "#define USE_ATOMIC_BUILTINS 1" >>confdefs.h
+printf "%s\n" "#define USE_ATOMIC_BUILTINS 1" >>confdefs.h
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
     if test "$CC" = "gcc"; then
       saved_CFLAGS="$CFLAGS";
       ATOMIC_CFLAGS="";
@@ -5729,70 +6073,72 @@ $as_echo "no" >&6; };
           CFLAGS="$saved_CFLAGS $ATOMIC_CFLAGS"
           ;;
       esac
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CC supports atomic operations with -march" >&5
-$as_echo_n "checking whether CC supports atomic operations with -march... " >&6; };
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CC supports atomic operations with -march" >&5
+printf %s "checking whether CC supports atomic operations with -march... " >&6; };
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 typedef int atomic;
 int
-main ()
+main (void)
 {
 atomic x; atomic y; __sync_bool_compare_and_swap(&x, y, y+1);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   need_march=yes
-else
+else $as_nop
   need_march=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext;
 
       if test "$need_march" = "yes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
 	OBJCFLAGS="$OBJCFLAGS $ATOMIC_CFLAGS";
 
-$as_echo "#define USE_ATOMIC_BUILTINS 1" >>confdefs.h
+printf "%s\n" "#define USE_ATOMIC_BUILTINS 1" >>confdefs.h
 
       else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
         saved_LDFLAGS="$LDFLAGS";
         LDFLAGS="$saved_LDFLAGS -lgcc";
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CC supports atomic operations using libgcc" >&5
-$as_echo_n "checking whether CC supports atomic operations using libgcc... " >&6; };
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether CC supports atomic operations using libgcc" >&5
+printf %s "checking whether CC supports atomic operations using libgcc... " >&6; };
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 typedef int atomic;
 int
-main ()
+main (void)
 {
 atomic x; atomic y; __sync_bool_compare_and_swap(&x, y, y+1);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   atomic_in_libgcc=yes
-else
+else $as_nop
   atomic_in_libgcc=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext;
         if test "$atomic_in_libgcc" = "yes"; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
           LIBS="$LIBS -lgcc";
 
-$as_echo "#define USE_ATOMIC_BUILTINS 1" >>confdefs.h
+printf "%s\n" "#define USE_ATOMIC_BUILTINS 1" >>confdefs.h
 
         else
           LDFLAGS="$saved_LDFLAGS";
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
         fi
       fi
     fi
@@ -5807,11 +6153,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Extract the first word of "whoami", so it can be a program name with args.
 set dummy whoami; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_WHOAMI+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_WHOAMI+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $WHOAMI in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_WHOAMI="$WHOAMI" # Let the user override the test with a path.
@@ -5822,11 +6169,15 @@ as_dummy="$PATH:/usr/ucb"
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_WHOAMI="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_WHOAMI="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5839,11 +6190,11 @@ esac
 fi
 WHOAMI=$ac_cv_path_WHOAMI
 if test -n "$WHOAMI"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WHOAMI" >&5
-$as_echo "$WHOAMI" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WHOAMI" >&5
+printf "%s\n" "$WHOAMI" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5858,11 +6209,12 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -5872,11 +6224,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5888,11 +6244,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5901,11 +6257,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -5915,11 +6272,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5931,11 +6292,11 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -5943,8 +6304,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -5956,14 +6317,14 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
@@ -5972,11 +6333,12 @@ fi
 if test -z "$PKG_CONFIG"; then
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -5986,11 +6348,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6002,11 +6368,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6034,18 +6400,18 @@ esac
 #--------------------------------------------------------------------
 # Set Apple/Darwin/OSX/NeXT information for other tests
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Objective-C runtime" >&5
-$as_echo_n "checking the Objective-C runtime... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the Objective-C runtime" >&5
+printf %s "checking the Objective-C runtime... " >&6; }
 if test "$OBJC_RUNTIME_LIB" = "nx" -o "$OBJC_RUNTIME_LIB" = "apple"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: NeXT" >&5
-$as_echo "NeXT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: NeXT" >&5
+printf "%s\n" "NeXT" >&6; }
   OBJCFLAGS="$OBJCFLAGS -fnext-runtime -DNeXT_RUNTIME"
 elif test "$OBJC_RUNTIME_LIB" = "ng"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Next Gen" >&5
-$as_echo "Next Gen" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Next Gen" >&5
+printf "%s\n" "Next Gen" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: GNU" >&5
-$as_echo "GNU" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GNU" >&5
+printf "%s\n" "GNU" >&6; }
   if test "$CLANG_CC" = "yes"; then
     OBJCFLAGS="$OBJCFLAGS -fobjc-runtime=gcc"
   fi
@@ -6063,11 +6429,12 @@ fi
 # Check to see if the libobjc library is in our GNUSTEP_SYSTEM_LIBRARIES.
 # If so, there are probably other libraries that we want there also, so
 # leave the proper includes in CPPFLAGS and LDFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for custom shared objc library" >&5
-$as_echo_n "checking for custom shared objc library... " >&6; }
-if ${gs_cv_objc_libdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for custom shared objc library" >&5
+printf %s "checking for custom shared objc library... " >&6; }
+if test ${gs_cv_objc_libdir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   gs_cv_objc_libdir=NONE
 gs_cv_objc_incdir=NONE
 # Try GNUSTEP_SYSTEM_LIBRARIES first
@@ -6122,8 +6489,8 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gs_cv_objc_libdir" >&5
-$as_echo "$gs_cv_objc_libdir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gs_cv_objc_libdir" >&5
+printf "%s\n" "$gs_cv_objc_libdir" >&6; }
 
 if test "$gs_cv_objc_libdir" != "NONE"; then
   #
@@ -6144,30 +6511,20 @@ fi
 #--------------------------------------------------------------------
 # Check if Objective-C is installed
 #--------------------------------------------------------------------
-for ac_header in objc/runtime.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "objc/runtime.h" "ac_cv_header_objc_runtime_h" "$ac_includes_default"
-if test "x$ac_cv_header_objc_runtime_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_OBJC_RUNTIME_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "objc/runtime.h" "ac_cv_header_objc_runtime_h" "$ac_includes_default"
+if test "x$ac_cv_header_objc_runtime_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_OBJC_RUNTIME_H 1" >>confdefs.h
 
 fi
 
-done
-
-for ac_header in objc/objc.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "objc/objc.h" "ac_cv_header_objc_objc_h" "$ac_includes_default"
-if test "x$ac_cv_header_objc_objc_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_OBJC_OBJC_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "objc/objc.h" "ac_cv_header_objc_objc_h" "$ac_includes_default"
+if test "x$ac_cv_header_objc_objc_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_OBJC_OBJC_H 1" >>confdefs.h
 
 fi
 
-done
-
 if test $ac_cv_header_objc_objc_h = no; then
   echo "Check to make sure you have the Objective-C runtime library"
   echo "and its headers installed."
@@ -6177,44 +6534,50 @@ fi
 #--------------------------------------------------------------------
 # Check for strange network stuff used by gdomap
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: for gdomap network details" >&5
-$as_echo "$as_me: for gdomap network details" >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for variable length socket addresses" >&5
-$as_echo_n "checking for variable length socket addresses... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: for gdomap network details" >&5
+printf "%s\n" "$as_me: for gdomap network details" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for variable length socket addresses" >&5
+printf %s "checking for variable length socket addresses... " >&6; }
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   #include <sys/types.h>
   #include <sys/socket.h>
   #include <net/if.h>
-
 int
-main ()
+main (void)
 {
 struct ifreq s; s.ifr_addr.sa_len = 0;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   sa_len=1
-else
+else $as_nop
   sa_len=0
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 if test $sa_len = 1; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5
+printf "%s\n" "found" >&6; }
 
-$as_echo "#define HAVE_SA_LEN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SA_LEN 1" >>confdefs.h
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+printf "%s\n" "not found" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler visibility attribute support" >&5
-$as_echo_n "checking for compiler visibility attribute support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler visibility attribute support" >&5
+printf %s "checking for compiler visibility attribute support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Werror"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6225,21 +6588,20 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   int foo(){ return 1; }
   int main(){ return foo(); }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5
+printf "%s\n" "found" >&6; }
   gs_visibility=1
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not present" >&5
-$as_echo "not present" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not present" >&5
+printf "%s\n" "not present" >&6; }
   gs_visibility=0
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_VISIBILITY_ATTRIBUTE $gs_visibility
-_ACEOF
+printf "%s\n" "#define HAVE_VISIBILITY_ATTRIBUTE $gs_visibility" >>confdefs.h
 
 CFLAGS="$saved_CFLAGS"
 
@@ -6247,18 +6609,20 @@ CFLAGS="$saved_CFLAGS"
 #--------------------------------------------------------------------
 # Check if system has buggy SO_REUSEADDR
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether SO_REUSEADDR is broken" >&5
-$as_echo_n "checking whether SO_REUSEADDR is broken... " >&6; }
-if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether SO_REUSEADDR is broken" >&5
+printf %s "checking whether SO_REUSEADDR is broken... " >&6; }
+if test "$cross_compiling" = yes
+then :
   reuseaddr_ok="$cross_reuseaddr_ok"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.reuseaddr.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   reuseaddr_ok=1
-else
+else $as_nop
   reuseaddr_ok=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -6267,7 +6631,7 @@ fi
 
 if test $reuseaddr_ok = 0; then
 
-$as_echo "#define BROKEN_SO_REUSEADDR 1" >>confdefs.h
+printf "%s\n" "#define BROKEN_SO_REUSEADDR 1" >>confdefs.h
 
   echo
   echo "The SO_REUSEADDR socket option for controlling re-use of network"
@@ -6279,35 +6643,36 @@ $as_echo "#define BROKEN_SO_REUSEADDR 1" >>confdefs.h
   echo "an operating-system timeout has expired."
   echo "For servers other than gdomap, GNUstep does not normally need"
   echo "a particular network port, so the problem is unlikely to arise."
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 #--------------------------------------------------------------------
 # Check for thread flags for libobjc.
 #--------------------------------------------------------------------
 #
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objc threading flags" >&5
-$as_echo_n "checking for objc threading flags... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objc threading flags" >&5
+printf %s "checking for objc threading flags... " >&6; }
 #
 # Get them from gnustep-make which contains the real code to get them
 #
 objc_threaded=`grep objc_threaded: $CURRENT_GNUSTEP_MAKEFILES/$lobj_dir/config.make | sed -e 's/objc_threaded:=//'`
 #
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $objc_threaded" >&5
-$as_echo "$objc_threaded" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $objc_threaded" >&5
+printf "%s\n" "$objc_threaded" >&6; }
 
 #--------------------------------------------------------------------
 # Byte order information needed for foundation headers.
 #--------------------------------------------------------------------
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+printf %s "checking whether byte ordering is bigendian... " >&6; }
+if test ${ac_cv_c_bigendian+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6318,7 +6683,8 @@ else
 	     typedef int dummy;
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 	# Check for potential -arch flags.  It is not universal unless
 	# there are at least two -arch flags with different values.
@@ -6342,7 +6708,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
 	 fi
        done
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6351,7 +6717,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	     #include <sys/param.h>
 
 int
-main ()
+main (void)
 {
 #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
 		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
@@ -6363,7 +6729,8 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6371,7 +6738,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
 		#include <sys/param.h>
 
 int
-main ()
+main (void)
 {
 #if BYTE_ORDER != BIG_ENDIAN
 		 not big endian
@@ -6381,14 +6748,15 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_bigendian=yes
-else
+else $as_nop
   ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
@@ -6397,7 +6765,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 	      bogus endian macros
@@ -6407,14 +6775,15 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   # It does; now see whether it defined to _BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #ifndef _BIG_ENDIAN
 		 not big endian
@@ -6424,31 +6793,33 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_bigendian=yes
-else
+else $as_nop
   ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # Compile a test program.
-      if test "$cross_compiling" = yes; then :
+      if test "$cross_compiling" = yes
+then :
   # Try to guess by grepping values from an object file.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-short int ascii_mm[] =
+unsigned short int ascii_mm[] =
 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
+		unsigned short int ascii_ii[] =
 		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 		int use_ascii (int i) {
 		  return ascii_mm[i] + ascii_ii[i];
 		}
-		short int ebcdic_ii[] =
+		unsigned short int ebcdic_ii[] =
 		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
+		unsigned short int ebcdic_mm[] =
 		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 		int use_ebcdic (int i) {
 		  return ebcdic_mm[i] + ebcdic_ii[i];
@@ -6456,14 +6827,15 @@ short int ascii_mm[] =
 		extern int foo;
 
 int
-main ()
+main (void)
 {
 return use_ascii (foo) == use_ebcdic (foo);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
@@ -6476,13 +6848,13 @@ if ac_fn_c_try_compile "$LINENO"; then :
 	      fi
 	    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 
 	     /* Are we little or big endian?  From Harbison&Steele.  */
@@ -6498,9 +6870,10 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_c_bigendian=no
-else
+else $as_nop
   ac_cv_c_bigendian=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -6509,17 +6882,17 @@ fi
 
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf "%s\n" "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
       ;; #(
    universal)
 
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -6541,17 +6914,19 @@ fi
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5
-$as_echo_n "checking size of void*... " >&6; }
-if ${ac_cv_sizeof_voidp+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5
+printf %s "checking size of void*... " >&6; }
+if test ${ac_cv_sizeof_voidp+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_voidp" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (void*)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -6560,14 +6935,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5
-$as_echo "$ac_cv_sizeof_voidp" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5
+printf "%s\n" "$ac_cv_sizeof_voidp" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
-_ACEOF
+printf "%s\n" "#define SIZEOF_VOIDP $ac_cv_sizeof_voidp" >>confdefs.h
 
 
 
@@ -6580,17 +6953,19 @@ GS_UINT8="unsigned char"
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if ${ac_cv_sizeof_short+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+printf %s "checking size of short... " >&6; }
+if test ${ac_cv_sizeof_short+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (short)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -6599,14 +6974,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+printf "%s\n" "$ac_cv_sizeof_short" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
+printf "%s\n" "#define SIZEOF_SHORT $ac_cv_sizeof_short" >>confdefs.h
 
 
 
@@ -6615,17 +6988,19 @@ _ACEOF
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+printf %s "checking size of int... " >&6; }
+if test ${ac_cv_sizeof_int+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -6634,14 +7009,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+printf "%s\n" "$ac_cv_sizeof_int" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
+printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h
 
 
 
@@ -6650,17 +7023,19 @@ _ACEOF
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -6669,14 +7044,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
 
@@ -6685,17 +7058,19 @@ _ACEOF
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+printf %s "checking size of long long... " >&6; }
+if test ${ac_cv_sizeof_long_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -6704,14 +7079,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h
 
 
 
@@ -6720,17 +7093,19 @@ _ACEOF
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
-$as_echo_n "checking size of float... " >&6; }
-if ${ac_cv_sizeof_float+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
+printf %s "checking size of float... " >&6; }
+if test ${ac_cv_sizeof_float+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_float" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (float)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -6739,14 +7114,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
-$as_echo "$ac_cv_sizeof_float" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
+printf "%s\n" "$ac_cv_sizeof_float" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_FLOAT $ac_cv_sizeof_float
-_ACEOF
+printf "%s\n" "#define SIZEOF_FLOAT $ac_cv_sizeof_float" >>confdefs.h
 
 
 
@@ -6755,17 +7128,19 @@ _ACEOF
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
-$as_echo_n "checking size of double... " >&6; }
-if ${ac_cv_sizeof_double+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
+printf %s "checking size of double... " >&6; }
+if test ${ac_cv_sizeof_double+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_double" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (double)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -6774,14 +7149,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
-$as_echo "$ac_cv_sizeof_double" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
+printf "%s\n" "$ac_cv_sizeof_double" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_DOUBLE $ac_cv_sizeof_double
-_ACEOF
+printf "%s\n" "#define SIZEOF_DOUBLE $ac_cv_sizeof_double" >>confdefs.h
 
 
 
@@ -6961,32 +7334,33 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working INTPTR_MAX, INTPTR_MIN, UINTPTR_MAX" >&5
-$as_echo_n "checking for working INTPTR_MAX, INTPTR_MIN, UINTPTR_MAX... " >&6; };
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working INTPTR_MAX, INTPTR_MIN, UINTPTR_MAX" >&5
+printf %s "checking for working INTPTR_MAX, INTPTR_MIN, UINTPTR_MAX... " >&6; };
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <inttypes.h>
 int
-main ()
+main (void)
 {
 int imax = INTPTR_MAX; int imin = INTPTR_MIN; unsigned umax = UINTPTR_MAX;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   have_valid_ptr_limits=yes
-else
+else $as_nop
   have_valid_ptr_limits=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext;
   if test "$have_valid_ptr_limits" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
     BUGGY_PTR_LIMITS=0
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
     BUGGY_PTR_LIMITS=1
     case "$target_os" in
       solaris*)
@@ -7040,14 +7414,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Makes the following substitutions:
 #	Defines CON_AUTOLOAD (whether constructor functions are autoloaded)
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking loading of constructor functions" >&5
-$as_echo_n "checking loading of constructor functions... " >&6; }
-if ${objc_cv_con_autoload+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking loading of constructor functions" >&5
+printf %s "checking loading of constructor functions... " >&6; }
+if test ${objc_cv_con_autoload+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   objc_cv_con_autoload=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 static int loaded = 0;
@@ -7058,9 +7434,10 @@ static int loaded = 0;
   	  return ( (loaded == 1) ? 0 : 1);
 	}
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   objc_cv_con_autoload=yes
-else
+else $as_nop
   objc_cv_con_autoload=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7075,14 +7452,14 @@ esac
 fi
 
 if test $objc_cv_con_autoload = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define CON_AUTOLOAD 1" >>confdefs.h
+printf "%s\n" "#define CON_AUTOLOAD 1" >>confdefs.h
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 # Copyright (C) 2005 Free Software Foundation
@@ -7097,50 +7474,51 @@ fi
 #		in objc-load.c (i.e. #include "${DYNAMIC_LINKER}-load.h")
 #--------------------------------------------------------------------
 DYNAMIC_LINKER=null
-ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
-if test "x$ac_cv_header_windows_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
+if test "x$ac_cv_header_windows_h" = xyes
+then :
   DYNAMIC_LINKER=win32
 fi
 
-
 if test $DYNAMIC_LINKER = null; then
-  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes
+then :
   DYNAMIC_LINKER=simple
 fi
 
-
 fi
 if test $DYNAMIC_LINKER = null; then
-  ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
-if test "x$ac_cv_header_dl_h" = xyes; then :
+  ac_fn_c_check_header_compile "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
+if test "x$ac_cv_header_dl_h" = xyes
+then :
   DYNAMIC_LINKER=hpux
 fi
 
-
 fi
 if test $DYNAMIC_LINKER = null; then
-  ac_fn_c_check_header_mongrel "$LINENO" "dld/defs.h" "ac_cv_header_dld_defs_h" "$ac_includes_default"
-if test "x$ac_cv_header_dld_defs_h" = xyes; then :
+  ac_fn_c_check_header_compile "$LINENO" "dld/defs.h" "ac_cv_header_dld_defs_h" "$ac_includes_default"
+if test "x$ac_cv_header_dld_defs_h" = xyes
+then :
   DYNAMIC_LINKER=dld
 fi
 
-
 fi
 
 # NB: This is used as follows: in Source/Makefile.postamble we copy
 # $(DYNAMIC_LINKER)-load.h into dynamic-load.h
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dynamic linker type" >&5
-$as_echo_n "checking for dynamic linker type... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DYNAMIC_LINKER" >&5
-$as_echo "$DYNAMIC_LINKER" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dynamic linker type" >&5
+printf %s "checking for dynamic linker type... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DYNAMIC_LINKER" >&5
+printf "%s\n" "$DYNAMIC_LINKER" >&6; }
 
 if test $DYNAMIC_LINKER = simple; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in -ldl" >&5
-$as_echo_n "checking for dladdr in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dladdr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dladdr in -ldl" >&5
+printf %s "checking for dladdr in -ldl... " >&6; }
+if test ${ac_cv_lib_dl_dladdr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7149,33 +7527,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dladdr ();
 int
-main ()
+main (void)
 {
 return dladdr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dl_dladdr=yes
-else
+else $as_nop
   ac_cv_lib_dl_dladdr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dladdr" >&5
-$as_echo "$ac_cv_lib_dl_dladdr" >&6; }
-if test "x$ac_cv_lib_dl_dladdr" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dladdr" >&5
+printf "%s\n" "$ac_cv_lib_dl_dladdr" >&6; }
+if test "x$ac_cv_lib_dl_dladdr" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
 
   LIBS="-ldl $LIBS"
 
@@ -7185,36 +7560,29 @@ fi
 
 
 # NOTE: libdl should be in LIBS now if it's available.
-for ac_func in dladdr
-do :
-  ac_fn_c_check_func "$LINENO" "dladdr" "ac_cv_func_dladdr"
-if test "x$ac_cv_func_dladdr" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLADDR 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "dladdr" "ac_cv_func_dladdr"
+if test "x$ac_cv_func_dladdr" = xyes
+then :
+  printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h
 
 fi
-done
 
 
-for ac_func in gethostbyname
-do :
-  ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETHOSTBYNAME 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
 
 fi
-done
 
 if test "$ac_cv_func_gethostbyname" = "no"; then
   # QNX has gethostbyname and friends in libsocket
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lsocket" >&5
-$as_echo_n "checking for gethostbyname in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_gethostbyname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lsocket" >&5
+printf %s "checking for gethostbyname in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_gethostbyname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7223,33 +7591,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gethostbyname ();
 int
-main ()
+main (void)
 {
 return gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_gethostbyname=yes
-else
+else $as_nop
   ac_cv_lib_socket_gethostbyname=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_gethostbyname" >&5
-$as_echo "$ac_cv_lib_socket_gethostbyname" >&6; }
-if test "x$ac_cv_lib_socket_gethostbyname" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_gethostbyname" >&5
+printf "%s\n" "$ac_cv_lib_socket_gethostbyname" >&6; }
+if test "x$ac_cv_lib_socket_gethostbyname" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
   LIBS="-lsocket $LIBS"
 
@@ -7257,16 +7622,12 @@ fi
 
 fi
 
-for ac_func in getaddrinfo
-do :
-  ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
-if test "x$ac_cv_func_getaddrinfo" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETADDRINFO 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
+if test "x$ac_cv_func_getaddrinfo" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h
 
 fi
-done
 
 
 #--------------------------------------------------------------------
@@ -7275,8 +7636,8 @@ done
 HAVE_WIN32_THREADS_AND_LOCKS=0
 case "$target_os" in
   mingw*|windows)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Windows threads and locks" >&5
-$as_echo_n "checking for native Windows threads and locks... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native Windows threads and locks" >&5
+printf %s "checking for native Windows threads and locks... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -7284,15 +7645,16 @@ $as_echo_n "checking for native Windows threads and locks... " >&6; }
         #include "$srcdir/Source/GSPThread.h"
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
       HAVE_WIN32_THREADS_AND_LOCKS=1
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     ;;
 esac
 
@@ -7301,53 +7663,45 @@ esac
 # Check for pthread.h
 #--------------------------------------------------------------------
 if test $HAVE_WIN32_THREADS_AND_LOCKS = 0; then
-  for ac_header in pthread.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_H 1" >>confdefs.h
 
 fi
 
-done
-
-  for ac_header in pthread_np.h
-do :
   ac_fn_c_check_header_compile "$LINENO" "pthread_np.h" "ac_cv_header_pthread_np_h" "$ac_includes_default
     #ifdef HAVE_PTHREAD_H
     #include <pthread.h>
     #endif
 
 "
-if test "x$ac_cv_header_pthread_np_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_NP_H 1
-_ACEOF
+if test "x$ac_cv_header_pthread_np_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_NP_H 1" >>confdefs.h
 
 fi
 
-done
-
   if test $ac_cv_header_pthread_h = yes ; then
     # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pthread_mutex_t" >&5
-$as_echo_n "checking size of pthread_mutex_t... " >&6; }
-if ${ac_cv_sizeof_pthread_mutex_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of pthread_mutex_t" >&5
+printf %s "checking size of pthread_mutex_t... " >&6; }
+if test ${ac_cv_sizeof_pthread_mutex_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_mutex_t))" "ac_cv_sizeof_pthread_mutex_t"        "$ac_includes_default
       #include <pthread.h>
-"; then :
+"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_pthread_mutex_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (pthread_mutex_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -7356,14 +7710,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_mutex_t" >&5
-$as_echo "$ac_cv_sizeof_pthread_mutex_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_mutex_t" >&5
+printf "%s\n" "$ac_cv_sizeof_pthread_mutex_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_PTHREAD_MUTEX_T $ac_cv_sizeof_pthread_mutex_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_PTHREAD_MUTEX_T $ac_cv_sizeof_pthread_mutex_t" >>confdefs.h
 
 
     GS_SIZEOF_MUTEX_T=$ac_cv_sizeof_pthread_mutex_t
@@ -7380,13 +7732,14 @@ _ACEOF
     ac_fn_c_check_member "$LINENO" "pthread_mutex_t" "__data.__owner" "ac_cv_member_pthread_mutex_t___data___owner" "$ac_includes_default
       #include <pthread.h>
 "
-if test "x$ac_cv_member_pthread_mutex_t___data___owner" = xyes; then :
+if test "x$ac_cv_member_pthread_mutex_t___data___owner" = xyes
+then :
 
 fi
 
     if test $ac_cv_member_pthread_mutex_t___data___owner = yes ; then
 
-$as_echo "#define HAVE_PTHREAD_MUTEX_OWNER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD_MUTEX_OWNER 1" >>confdefs.h
 
     fi
 
@@ -7394,19 +7747,21 @@ $as_echo "#define HAVE_PTHREAD_MUTEX_OWNER 1" >>confdefs.h
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pthread_cond_t" >&5
-$as_echo_n "checking size of pthread_cond_t... " >&6; }
-if ${ac_cv_sizeof_pthread_cond_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of pthread_cond_t" >&5
+printf %s "checking size of pthread_cond_t... " >&6; }
+if test ${ac_cv_sizeof_pthread_cond_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_cond_t))" "ac_cv_sizeof_pthread_cond_t"        "$ac_includes_default
       #include <pthread.h>
-"; then :
+"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_pthread_cond_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (pthread_cond_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -7415,14 +7770,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_cond_t" >&5
-$as_echo "$ac_cv_sizeof_pthread_cond_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_cond_t" >&5
+printf "%s\n" "$ac_cv_sizeof_pthread_cond_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_PTHREAD_COND_T $ac_cv_sizeof_pthread_cond_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_PTHREAD_COND_T $ac_cv_sizeof_pthread_cond_t" >>confdefs.h
 
 
     if test $ac_cv_sizeof_pthread_cond_t = 0 ; then
@@ -7433,23 +7786,22 @@ _ACEOF
 
     # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of pthread_mutex_t" >&5
-$as_echo_n "checking alignment of pthread_mutex_t... " >&6; }
-if ${ac_cv_alignof_pthread_mutex_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of pthread_mutex_t" >&5
+printf %s "checking alignment of pthread_mutex_t... " >&6; }
+if test ${ac_cv_alignof_pthread_mutex_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_pthread_mutex_t"        "$ac_includes_default
       #include <pthread.h>
 
-#ifndef offsetof
-# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
-#endif
-typedef struct { char x; pthread_mutex_t y; } ac__type_alignof_;"; then :
+typedef struct { char x; pthread_mutex_t y; } ac__type_alignof_;"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_pthread_mutex_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of pthread_mutex_t
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -7458,14 +7810,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_pthread_mutex_t" >&5
-$as_echo "$ac_cv_alignof_pthread_mutex_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_pthread_mutex_t" >&5
+printf "%s\n" "$ac_cv_alignof_pthread_mutex_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_PTHREAD_MUTEX_T $ac_cv_alignof_pthread_mutex_t
-_ACEOF
+printf "%s\n" "#define ALIGNOF_PTHREAD_MUTEX_T $ac_cv_alignof_pthread_mutex_t" >>confdefs.h
 
 
     GS_ALIGNOF_MUTEX_T=$ac_cv_alignof_pthread_mutex_t
@@ -7478,23 +7828,22 @@ _ACEOF
 
     # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of pthread_cond_t" >&5
-$as_echo_n "checking alignment of pthread_cond_t... " >&6; }
-if ${ac_cv_alignof_pthread_cond_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of pthread_cond_t" >&5
+printf %s "checking alignment of pthread_cond_t... " >&6; }
+if test ${ac_cv_alignof_pthread_cond_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_pthread_cond_t"        "$ac_includes_default
       #include <pthread.h>
 
-#ifndef offsetof
-# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
-#endif
-typedef struct { char x; pthread_cond_t y; } ac__type_alignof_;"; then :
+typedef struct { char x; pthread_cond_t y; } ac__type_alignof_;"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_pthread_cond_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of pthread_cond_t
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -7503,14 +7852,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_pthread_cond_t" >&5
-$as_echo "$ac_cv_alignof_pthread_cond_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_pthread_cond_t" >&5
+printf "%s\n" "$ac_cv_alignof_pthread_cond_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_PTHREAD_COND_T $ac_cv_alignof_pthread_cond_t
-_ACEOF
+printf "%s\n" "#define ALIGNOF_PTHREAD_COND_T $ac_cv_alignof_pthread_cond_t" >>confdefs.h
 
 
     if test $ac_cv_alignof_pthread_cond_t = 0 ; then
@@ -7521,11 +7868,12 @@ _ACEOF
   else
     as_fn_error $? "Unable to find pthread.h (needed for thread support)." "$LINENO" 5
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
-$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_join+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
+printf %s "checking for pthread_join in -lpthread... " >&6; }
+if test ${ac_cv_lib_pthread_pthread_join+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7534,32 +7882,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pthread_join ();
 int
-main ()
+main (void)
 {
 return pthread_join ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pthread_pthread_join=yes
-else
+else $as_nop
   ac_cv_lib_pthread_pthread_join=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_join" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_join" >&5
+printf "%s\n" "$ac_cv_lib_pthread_pthread_join" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_join" = xyes
+then :
   pthread_ok=yes
-else
+else $as_nop
   pthread_ok=no
 fi
 
@@ -7569,11 +7916,12 @@ fi
   else
     case "$target_os" in
       mingw*)
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthreadGC2" >&5
-$as_echo_n "checking for pthread_join in -lpthreadGC2... " >&6; }
-if ${ac_cv_lib_pthreadGC2_pthread_join+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthreadGC2" >&5
+printf %s "checking for pthread_join in -lpthreadGC2... " >&6; }
+if test ${ac_cv_lib_pthreadGC2_pthread_join+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthreadGC2  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7582,32 +7930,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pthread_join ();
 int
-main ()
+main (void)
 {
 return pthread_join ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pthreadGC2_pthread_join=yes
-else
+else $as_nop
   ac_cv_lib_pthreadGC2_pthread_join=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreadGC2_pthread_join" >&5
-$as_echo "$ac_cv_lib_pthreadGC2_pthread_join" >&6; }
-if test "x$ac_cv_lib_pthreadGC2_pthread_join" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreadGC2_pthread_join" >&5
+printf "%s\n" "$ac_cv_lib_pthreadGC2_pthread_join" >&6; }
+if test "x$ac_cv_lib_pthreadGC2_pthread_join" = xyes
+then :
   pthread_ok=yes
-else
+else $as_nop
   pthread_ok=no
 fi
 
@@ -7616,11 +7963,12 @@ fi
         fi
         ;;
       windows)
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthreadVC2" >&5
-$as_echo_n "checking for pthread_join in -lpthreadVC2... " >&6; }
-if ${ac_cv_lib_pthreadVC2_pthread_join+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthreadVC2" >&5
+printf %s "checking for pthread_join in -lpthreadVC2... " >&6; }
+if test ${ac_cv_lib_pthreadVC2_pthread_join+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthreadVC2  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7629,32 +7977,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pthread_join ();
 int
-main ()
+main (void)
 {
 return pthread_join ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pthreadVC2_pthread_join=yes
-else
+else $as_nop
   ac_cv_lib_pthreadVC2_pthread_join=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreadVC2_pthread_join" >&5
-$as_echo "$ac_cv_lib_pthreadVC2_pthread_join" >&6; }
-if test "x$ac_cv_lib_pthreadVC2_pthread_join" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreadVC2_pthread_join" >&5
+printf "%s\n" "$ac_cv_lib_pthreadVC2_pthread_join" >&6; }
+if test "x$ac_cv_lib_pthreadVC2_pthread_join" = xyes
+then :
   pthread_ok=yes
-else
+else $as_nop
   pthread_ok=no
 fi
 
@@ -7664,11 +8011,12 @@ fi
         ;;
       nto*|qnx*|*android*)
         # Android and QNX have pthread in libc instead of libpthread
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lc" >&5
-$as_echo_n "checking for pthread_join in -lc... " >&6; }
-if ${ac_cv_lib_c_pthread_join+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lc" >&5
+printf %s "checking for pthread_join in -lc... " >&6; }
+if test ${ac_cv_lib_c_pthread_join+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7677,32 +8025,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pthread_join ();
 int
-main ()
+main (void)
 {
 return pthread_join ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_pthread_join=yes
-else
+else $as_nop
   ac_cv_lib_c_pthread_join=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_join" >&5
-$as_echo "$ac_cv_lib_c_pthread_join" >&6; }
-if test "x$ac_cv_lib_c_pthread_join" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_join" >&5
+printf "%s\n" "$ac_cv_lib_c_pthread_join" >&6; }
+if test "x$ac_cv_lib_c_pthread_join" = xyes
+then :
   pthread_ok=yes
-else
+else $as_nop
   pthread_ok=no
 fi
 
@@ -7717,25 +8064,27 @@ fi
   fi
 
   # Check threading extensions
-  for ac_func in pthread_getthreadid_np pthread_main_np
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+  ac_fn_c_check_func "$LINENO" "pthread_getthreadid_np" "ac_cv_func_pthread_getthreadid_np"
+if test "x$ac_cv_func_pthread_getthreadid_np" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_GETTHREADID_NP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pthread_main_np" "ac_cv_func_pthread_main_np"
+if test "x$ac_cv_func_pthread_main_np" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_MAIN_NP 1" >>confdefs.h
 
 fi
-done
 
 
   # Typically need librt on Solaris for sched_yield
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
-$as_echo_n "checking for sched_yield in -lrt... " >&6; }
-if ${ac_cv_lib_rt_sched_yield+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
+printf %s "checking for sched_yield in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_sched_yield+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7744,33 +8093,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sched_yield ();
 int
-main ()
+main (void)
 {
 return sched_yield ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt_sched_yield=yes
-else
+else $as_nop
   ac_cv_lib_rt_sched_yield=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
-$as_echo "$ac_cv_lib_rt_sched_yield" >&6; }
-if test "x$ac_cv_lib_rt_sched_yield" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRT 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_sched_yield" >&5
+printf "%s\n" "$ac_cv_lib_rt_sched_yield" >&6; }
+if test "x$ac_cv_lib_rt_sched_yield" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
 
   LIBS="-lrt $LIBS"
 
@@ -7778,128 +8124,130 @@ fi
 
 
   # Check if we can name pthreads
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_setname_np()" >&5
-$as_echo_n "checking for pthread_setname_np()... " >&6; }
-if ${gs_cv_pthread_setname_np+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_setname_np()" >&5
+printf %s "checking for pthread_setname_np()... " >&6; }
+if test ${gs_cv_pthread_setname_np+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 pthread_setname_np("name");
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   gs_cv_pthread_setname_np=darwin
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 pthread_setname_np(pthread_self(), "name");
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   gs_cv_pthread_setname_np=glibc
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 pthread_setname_np(pthread_self(), "%s", "name");
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   gs_cv_pthread_setname_np=netbsd
-else
+else $as_nop
   gs_cv_pthread_setname_np=none
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gs_cv_pthread_setname_np" >&5
-$as_echo "$gs_cv_pthread_setname_np" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gs_cv_pthread_setname_np" >&5
+printf "%s\n" "$gs_cv_pthread_setname_np" >&6; }
   case $gs_cv_pthread_setname_np in
     darwin)
 
-$as_echo "#define PTHREAD_SETNAME(a) pthread_setname_np(a)" >>confdefs.h
+printf "%s\n" "#define PTHREAD_SETNAME(a) pthread_setname_np(a)" >>confdefs.h
 
       ;;
     glibc)
 
-$as_echo "#define PTHREAD_SETNAME(a) pthread_setname_np(pthread_self(),a)" >>confdefs.h
+printf "%s\n" "#define PTHREAD_SETNAME(a) pthread_setname_np(pthread_self(),a)" >>confdefs.h
 
       ;;
     netbsd)
 
-$as_echo "#define PTHREAD_SETNAME(a) pthread_setname_np(pthread_self(),\"%s\",a)" >>confdefs.h
+printf "%s\n" "#define PTHREAD_SETNAME(a) pthread_setname_np(pthread_self(),\"%s\",a)" >>confdefs.h
 
       ;;
   esac
 
 # Check if we can get names of pthreads
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_getname_np()" >&5
-$as_echo_n "checking for pthread_getname_np()... " >&6; }
-if ${gs_cv_pthread_getname_np+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_getname_np()" >&5
+printf %s "checking for pthread_getname_np()... " >&6; }
+if test ${gs_cv_pthread_getname_np+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 char name16; pthread_getname_np(pthread_self(), name, 16);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   gs_cv_pthread_getname_np=generic
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gs_cv_pthread_getname_np" >&5
-$as_echo "$gs_cv_pthread_getname_np" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gs_cv_pthread_getname_np" >&5
+printf "%s\n" "$gs_cv_pthread_getname_np" >&6; }
 case $gs_cv_pthread_getname_np in
   generic)
 
-$as_echo "#define PTHREAD_GETNAME(b,c) pthread_getname_np(pthread_self(),b,c)" >>confdefs.h
+printf "%s\n" "#define PTHREAD_GETNAME(b,c) pthread_getname_np(pthread_self(),b,c)" >>confdefs.h
 
     ;;
 esac
 
   # Check if we have spinlock support
-  for ac_func in pthread_spin_lock
-do :
   ac_fn_c_check_func "$LINENO" "pthread_spin_lock" "ac_cv_func_pthread_spin_lock"
-if test "x$ac_cv_func_pthread_spin_lock" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_SPIN_LOCK 1
-_ACEOF
+if test "x$ac_cv_func_pthread_spin_lock" = xyes
+then :
+  printf "%s\n" "#define HAVE_PTHREAD_SPIN_LOCK 1" >>confdefs.h
 
 fi
-done
 
 fi
 
@@ -7911,20 +8259,22 @@ if test $HAVE_WIN32_THREADS_AND_LOCKS = 1; then
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of gs_mutex_t" >&5
-$as_echo_n "checking size of gs_mutex_t... " >&6; }
-if ${ac_cv_sizeof_gs_mutex_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of gs_mutex_t" >&5
+printf %s "checking size of gs_mutex_t... " >&6; }
+if test ${ac_cv_sizeof_gs_mutex_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (gs_mutex_t))" "ac_cv_sizeof_gs_mutex_t"        "$ac_includes_default
     #define GS_USE_WIN32_THREADS_AND_LOCKS 1
     #include \"$srcdir/Source/GSPThread.h\"
-"; then :
+"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_gs_mutex_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (gs_mutex_t)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -7933,14 +8283,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_gs_mutex_t" >&5
-$as_echo "$ac_cv_sizeof_gs_mutex_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_gs_mutex_t" >&5
+printf "%s\n" "$ac_cv_sizeof_gs_mutex_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_GS_MUTEX_T $ac_cv_sizeof_gs_mutex_t
-_ACEOF
+printf "%s\n" "#define SIZEOF_GS_MUTEX_T $ac_cv_sizeof_gs_mutex_t" >>confdefs.h
 
 
   GS_SIZEOF_MUTEX_T=$ac_cv_sizeof_gs_mutex_t
@@ -7951,24 +8299,23 @@ _ACEOF
 
   # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of gs_mutex_t" >&5
-$as_echo_n "checking alignment of gs_mutex_t... " >&6; }
-if ${ac_cv_alignof_gs_mutex_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of gs_mutex_t" >&5
+printf %s "checking alignment of gs_mutex_t... " >&6; }
+if test ${ac_cv_alignof_gs_mutex_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gs_mutex_t"        "$ac_includes_default
     #define GS_USE_WIN32_THREADS_AND_LOCKS 1
     #include \"$srcdir/Source/GSPThread.h\"
 
-#ifndef offsetof
-# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
-#endif
-typedef struct { char x; gs_mutex_t y; } ac__type_alignof_;"; then :
+typedef struct { char x; gs_mutex_t y; } ac__type_alignof_;"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_gs_mutex_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of gs_mutex_t
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -7977,14 +8324,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gs_mutex_t" >&5
-$as_echo "$ac_cv_alignof_gs_mutex_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gs_mutex_t" >&5
+printf "%s\n" "$ac_cv_alignof_gs_mutex_t" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_GS_MUTEX_T $ac_cv_alignof_gs_mutex_t
-_ACEOF
+printf "%s\n" "#define ALIGNOF_GS_MUTEX_T $ac_cv_alignof_gs_mutex_t" >>confdefs.h
 
 
   GS_ALIGNOF_MUTEX_T=$ac_cv_alignof_gs_mutex_t
@@ -7997,19 +8342,21 @@ _ACEOF
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of CONDITION_VARIABLE" >&5
-$as_echo_n "checking size of CONDITION_VARIABLE... " >&6; }
-if ${ac_cv_sizeof_CONDITION_VARIABLE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of CONDITION_VARIABLE" >&5
+printf %s "checking size of CONDITION_VARIABLE... " >&6; }
+if test ${ac_cv_sizeof_CONDITION_VARIABLE+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (CONDITION_VARIABLE))" "ac_cv_sizeof_CONDITION_VARIABLE"        "$ac_includes_default
     #include <windows.h>
-"; then :
+"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_CONDITION_VARIABLE" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (CONDITION_VARIABLE)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8018,14 +8365,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_CONDITION_VARIABLE" >&5
-$as_echo "$ac_cv_sizeof_CONDITION_VARIABLE" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_CONDITION_VARIABLE" >&5
+printf "%s\n" "$ac_cv_sizeof_CONDITION_VARIABLE" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CONDITION_VARIABLE $ac_cv_sizeof_CONDITION_VARIABLE
-_ACEOF
+printf "%s\n" "#define SIZEOF_CONDITION_VARIABLE $ac_cv_sizeof_CONDITION_VARIABLE" >>confdefs.h
 
 
   GS_SIZEOF_COND_T=$ac_cv_sizeof_CONDITION_VARIABLE
@@ -8036,23 +8381,22 @@ _ACEOF
 
   # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of CONDITION_VARIABLE" >&5
-$as_echo_n "checking alignment of CONDITION_VARIABLE... " >&6; }
-if ${ac_cv_alignof_CONDITION_VARIABLE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of CONDITION_VARIABLE" >&5
+printf %s "checking alignment of CONDITION_VARIABLE... " >&6; }
+if test ${ac_cv_alignof_CONDITION_VARIABLE+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_CONDITION_VARIABLE"        "$ac_includes_default
     #include <windows.h>
 
-#ifndef offsetof
-# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
-#endif
-typedef struct { char x; CONDITION_VARIABLE y; } ac__type_alignof_;"; then :
+typedef struct { char x; CONDITION_VARIABLE y; } ac__type_alignof_;"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_CONDITION_VARIABLE" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of CONDITION_VARIABLE
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8061,14 +8405,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_CONDITION_VARIABLE" >&5
-$as_echo "$ac_cv_alignof_CONDITION_VARIABLE" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_CONDITION_VARIABLE" >&5
+printf "%s\n" "$ac_cv_alignof_CONDITION_VARIABLE" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_CONDITION_VARIABLE $ac_cv_alignof_CONDITION_VARIABLE
-_ACEOF
+printf "%s\n" "#define ALIGNOF_CONDITION_VARIABLE $ac_cv_alignof_CONDITION_VARIABLE" >>confdefs.h
 
 
   GS_ALIGNOF_COND_T=$ac_cv_alignof_CONDITION_VARIABLE
@@ -8081,19 +8423,21 @@ _ACEOF
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of SRWLOCK" >&5
-$as_echo_n "checking size of SRWLOCK... " >&6; }
-if ${ac_cv_sizeof_SRWLOCK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of SRWLOCK" >&5
+printf %s "checking size of SRWLOCK... " >&6; }
+if test ${ac_cv_sizeof_SRWLOCK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (SRWLOCK))" "ac_cv_sizeof_SRWLOCK"        "$ac_includes_default
     #include <windows.h>
-"; then :
+"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_SRWLOCK" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (SRWLOCK)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8102,14 +8446,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_SRWLOCK" >&5
-$as_echo "$ac_cv_sizeof_SRWLOCK" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_SRWLOCK" >&5
+printf "%s\n" "$ac_cv_sizeof_SRWLOCK" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SRWLOCK $ac_cv_sizeof_SRWLOCK
-_ACEOF
+printf "%s\n" "#define SIZEOF_SRWLOCK $ac_cv_sizeof_SRWLOCK" >>confdefs.h
 
 
   GS_SIZEOF_COND_MUTEX_T=$ac_cv_sizeof_SRWLOCK
@@ -8120,23 +8462,22 @@ _ACEOF
 
   # The cast to long int works around a bug in the HP C Compiler,
 # see AC_CHECK_SIZEOF for more information.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of SRWLOCK" >&5
-$as_echo_n "checking alignment of SRWLOCK... " >&6; }
-if ${ac_cv_alignof_SRWLOCK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of SRWLOCK" >&5
+printf %s "checking alignment of SRWLOCK... " >&6; }
+if test ${ac_cv_alignof_SRWLOCK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_SRWLOCK"        "$ac_includes_default
     #include <windows.h>
 
-#ifndef offsetof
-# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
-#endif
-typedef struct { char x; SRWLOCK y; } ac__type_alignof_;"; then :
+typedef struct { char x; SRWLOCK y; } ac__type_alignof_;"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_SRWLOCK" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute alignment of SRWLOCK
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -8145,14 +8486,12 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_SRWLOCK" >&5
-$as_echo "$ac_cv_alignof_SRWLOCK" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_SRWLOCK" >&5
+printf "%s\n" "$ac_cv_alignof_SRWLOCK" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define ALIGNOF_SRWLOCK $ac_cv_alignof_SRWLOCK
-_ACEOF
+printf "%s\n" "#define ALIGNOF_SRWLOCK $ac_cv_alignof_SRWLOCK" >>confdefs.h
 
 
   GS_ALIGNOF_COND_MUTEX_T=$ac_cv_alignof_SRWLOCK
@@ -8165,21 +8504,28 @@ fi
 #--------------------------------------------------------------------
 # One of these function needed by NSThread.m and objc initialize test
 #--------------------------------------------------------------------
-for ac_func in nanosleep usleep Sleep
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
+if test "x$ac_cv_func_nanosleep" = xyes
+then :
+  printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep"
+if test "x$ac_cv_func_usleep" = xyes
+then :
+  printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "Sleep" "ac_cv_func_Sleep"
+if test "x$ac_cv_func_Sleep" = xyes
+then :
+  printf "%s\n" "#define HAVE_SLEEP 1" >>confdefs.h
 
 fi
-done
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objc_root_class attribute support" >&5
-$as_echo_n "checking for objc_root_class attribute support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objc_root_class attribute support" >&5
+printf %s "checking for objc_root_class attribute support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Werror $OBJCFLAGS -x objective-c"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8190,38 +8536,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
   @implementation RootObject
   @end
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5
+printf "%s\n" "found" >&6; }
   gs_objc_root_class_attr=1
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not present" >&5
-$as_echo "not present" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not present" >&5
+printf "%s\n" "not present" >&6; }
   gs_objc_root_class_attr=0
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 GS_HAVE_OBJC_ROOT_CLASS_ATTR=$gs_objc_root_class_attr
 
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_OBJC_ROOT_CLASS_ATTRIBUTE $gs_objc_root_class_attr
-_ACEOF
+printf "%s\n" "#define HAVE_OBJC_ROOT_CLASS_ATTRIBUTE $gs_objc_root_class_attr" >>confdefs.h
 
 CFLAGS=$saved_CFLAGS
 
 #--------------------------------------------------------------------
 # Check whether we can get the system thread ID
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettid()" >&5
-$as_echo_n "checking for gettid()... " >&6; }
-if ${ac_cv_gettid+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gettid()" >&5
+printf %s "checking for gettid()... " >&6; }
+if test ${ac_cv_gettid+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_gettid=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _GNU_SOURCE
@@ -8231,9 +8578,10 @@ else
 int main(int argc, char **argv) {
 pid_t t = syscall(SYS_gettid); return t == -1 ? 1 : 0; }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_gettid=yes
-else
+else $as_nop
   ac_cv_gettid=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8241,19 +8589,19 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gettid" >&5
-$as_echo "$ac_cv_gettid" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gettid" >&5
+printf "%s\n" "$ac_cv_gettid" >&6; }
 if test "$ac_cv_gettid" = "yes"; then
 
-$as_echo "#define HAVE_GETTID 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETTID 1" >>confdefs.h
 
 fi
 
 #--------------------------------------------------------------------
 # Check whether Objective-C /really/ works
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether objc really works" >&5
-$as_echo_n "checking whether objc really works... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether objc really works" >&5
+printf %s "checking whether objc really works... " >&6; }
 saved_LIBS="$LIBS"
 saved_CPPFLAGS="$CPPFLAGS"
 LIBS="$LIBS $LIBOBJC"
@@ -8262,19 +8610,22 @@ if test x"$objc_threaded" != x""; then
   LIBS="$LIBS $objc_threaded"
 fi
 LIBS="$LIBS $extra_LIBS"
-if ${gs_cv_objc_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+if test ${gs_cv_objc_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   gs_cv_objc_works="$cross_gs_cv_objc_works"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.objc.m"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   gs_cv_objc_works=yes
-else
+else $as_nop
   gs_cv_objc_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8285,11 +8636,11 @@ fi
 fi
 
 if test $gs_cv_objc_works = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   echo "I don't seem to be able to use your Objective-C compiler to produce"
   echo "working binaries!  Please check your Objective-C compiler installation."
   echo "If you are using gcc-3.x make sure that your compiler's libgcc_s and libobjc"
@@ -8314,21 +8665,24 @@ if test "$OBJC_RUNTIME_LIB" = "nx" -o "$OBJC_RUNTIME_LIB" = "apple"; then
 else
   strclass_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS -fconstant-string-class=FooConstantString"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler supports -fconstant-string-class" >&5
-$as_echo_n "checking if the compiler supports -fconstant-string-class... " >&6; }
-  if ${gs_cv_objc_compiler_supports_constant_string_class+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the compiler supports -fconstant-string-class" >&5
+printf %s "checking if the compiler supports -fconstant-string-class... " >&6; }
+  if test ${gs_cv_objc_compiler_supports_constant_string_class+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   gs_cv_objc_compiler_supports_constant_string_class="$cross_gs_cv_objc_compiler_supports_constant_string_class"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.constant-string-class.m"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   gs_cv_objc_compiler_supports_constant_string_class=yes
-else
+else $as_nop
   gs_cv_objc_compiler_supports_constant_string_class=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8341,23 +8695,24 @@ fi
   if test $gs_cv_objc_compiler_supports_constant_string_class = yes; then
     NX_CONST_STRING_OBJCFLAGS="-fconstant-string-class=NSConstantString"
     NX_CONST_STRING_CLASS=NSConstantString
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     # Check whether --enable-nxconstantstring was given.
-if test "${enable_nxconstantstring+set}" = set; then :
+if test ${enable_nxconstantstring+y}
+then :
   enableval=$enable_nxconstantstring;
-else
+else $as_nop
   enable_nxconstantstring=no
 fi
 
     if test $enable_nxconstantstring = yes; then
       NX_CONST_STRING_OBJCFLAGS=""
       NX_CONST_STRING_CLASS=NXConstantString
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have enabled the use of NXConstantString as the string class in gnustep-base.  The objective-c runtime library typically implements its own class of the same name, so you must either enforce a link order which ensures that the gnustep-base implementation is used, or (better) you must remove the class from the runtime library!" >&5
-$as_echo "$as_me: WARNING: You have enabled the use of NXConstantString as the string class in gnustep-base.  The objective-c runtime library typically implements its own class of the same name, so you must either enforce a link order which ensures that the gnustep-base implementation is used, or (better) you must remove the class from the runtime library!" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You have enabled the use of NXConstantString as the string class in gnustep-base.  The objective-c runtime library typically implements its own class of the same name, so you must either enforce a link order which ensures that the gnustep-base implementation is used, or (better) you must remove the class from the runtime library!" >&5
+printf "%s\n" "$as_me: WARNING: You have enabled the use of NXConstantString as the string class in gnustep-base.  The objective-c runtime library typically implements its own class of the same name, so you must either enforce a link order which ensures that the gnustep-base implementation is used, or (better) you must remove the class from the runtime library!" >&2;}
     else
       as_fn_error $? "Your compiler does not appear to implement the -fconstant-string-class option needed for support of strings.  Please check for a more recent version or consider using --enable-nxconstantstring" "$LINENO" 5
     fi
@@ -8376,21 +8731,24 @@ fi
 # Defines HAVE_LOAD_METHOD if +load methods are called before main.
 # Needed by NSProcessInfo.m
 #---------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if +load method is executed before main" >&5
-$as_echo_n "checking if +load method is executed before main... " >&6; }
-if ${gs_cv_objc_load_method_worked+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if +load method is executed before main" >&5
+printf %s "checking if +load method is executed before main... " >&6; }
+if test ${gs_cv_objc_load_method_worked+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   gs_cv_objc_load_method_worked="$cross_gs_cv_objc_load_method_worked"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.loadtest.m"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   gs_cv_objc_load_method_worked=yes
-else
+else $as_nop
   gs_cv_objc_load_method_worked=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8402,13 +8760,13 @@ fi
 
 if test $gs_cv_objc_load_method_worked = yes; then
 
-$as_echo "#define HAVE_LOAD_METHOD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LOAD_METHOD 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 # Don't revert any Objective-C flags as they are used in the next test
@@ -8420,20 +8778,16 @@ if test "$host_os" = windows -a "$OBJC_RUNTIME_LIB" = "ng"; then
   # On Windows MSVC, AC_CHECK_FUNCS() will throw linker errors ("relocation
   # against symbol in discarded section") as the file won't contain any actual
   # ObjC code, so we just assume the function is there.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: assuming objc_sync_enter() on Windows MSVC" >&5
-$as_echo "$as_me: assuming objc_sync_enter() on Windows MSVC" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: assuming objc_sync_enter() on Windows MSVC" >&5
+printf "%s\n" "$as_me: assuming objc_sync_enter() on Windows MSVC" >&6;}
   OBJCSYNC=1
 else
-  for ac_func in objc_sync_enter
-do :
   ac_fn_c_check_func "$LINENO" "objc_sync_enter" "ac_cv_func_objc_sync_enter"
-if test "x$ac_cv_func_objc_sync_enter" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_OBJC_SYNC_ENTER 1
-_ACEOF
+if test "x$ac_cv_func_objc_sync_enter" = xyes
+then :
+  printf "%s\n" "#define HAVE_OBJC_SYNC_ENTER 1" >>confdefs.h
 
 fi
-done
 
   if test $ac_cv_func_objc_sync_enter = yes ; then
     OBJCSYNC=1
@@ -8452,27 +8806,23 @@ fi
 # Check for ObjC2 support in runtime
 #--------------------------------------------------------------------
 if test "$cross_compiling" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: \"Cross compiling! Using predefined OBJC2RUNTIME variable\"" >&5
-$as_echo "$as_me: \"Cross compiling! Using predefined OBJC2RUNTIME variable\"" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \"Cross compiling! Using predefined OBJC2RUNTIME variable\"" >&5
+printf "%s\n" "$as_me: \"Cross compiling! Using predefined OBJC2RUNTIME variable\"" >&6;}
   OBJC2RUNTIME="$cross_objc2_runtime"
 elif test "$host_os" = windows -a "$OBJC_RUNTIME_LIB" = "ng"; then
   # On Windows MSVC, AC_CHECK_FUNCS() will throw linker errors ("relocation
   # against symbol in discarded section") as the file won't contain any actual
   # ObjC code, so we just assume the function is there.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: assuming objc_setProperty() on Windows MSVC" >&5
-$as_echo "$as_me: assuming objc_setProperty() on Windows MSVC" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: assuming objc_setProperty() on Windows MSVC" >&5
+printf "%s\n" "$as_me: assuming objc_setProperty() on Windows MSVC" >&6;}
   OBJC2RUNTIME=1
 else
-  for ac_func in objc_setProperty
-do :
   ac_fn_c_check_func "$LINENO" "objc_setProperty" "ac_cv_func_objc_setProperty"
-if test "x$ac_cv_func_objc_setProperty" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_OBJC_SETPROPERTY 1
-_ACEOF
+if test "x$ac_cv_func_objc_setProperty" = xyes
+then :
+  printf "%s\n" "#define HAVE_OBJC_SETPROPERTY 1" >>confdefs.h
 
 fi
-done
 
   if test $ac_cv_func_objc_setProperty = yes ; then
     OBJC2RUNTIME=1
@@ -8492,20 +8842,16 @@ if test "$host_os" = windows -a "$OBJC_RUNTIME_LIB" = "ng"; then
   # On Windows MSVC, AC_CHECK_FUNCS() will throw linker errors ("relocation
   # against symbol in discarded section") as the file won't contain any actual
   # ObjC code, so we just assume the function is there.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: assuming _Block_copy() on Windows MSVC" >&5
-$as_echo "$as_me: assuming _Block_copy() on Windows MSVC" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: assuming _Block_copy() on Windows MSVC" >&5
+printf "%s\n" "$as_me: assuming _Block_copy() on Windows MSVC" >&6;}
   HAVE_BLOCKS=1
 else
-  for ac_func in _Block_copy
-do :
   ac_fn_c_check_func "$LINENO" "_Block_copy" "ac_cv_func__Block_copy"
-if test "x$ac_cv_func__Block_copy" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__BLOCK_COPY 1
-_ACEOF
+if test "x$ac_cv_func__Block_copy" = xyes
+then :
+  printf "%s\n" "#define HAVE__BLOCK_COPY 1" >>confdefs.h
 
 fi
-done
 
   if test $ac_cv_func__Block_copy = yes ; then
     HAVE_BLOCKS=1
@@ -8526,24 +8872,26 @@ if test "$nonfragile" = "yes"; then
     # On Windows MSVC, AC_CHECK_FUNCS() will throw linker errors ("relocation
     # against symbol in discarded section") as the file won't contain any actual
     # ObjC code, so we just assume the function is there.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: assuming non-fragile-abi support on Windows MSVC" >&5
-$as_echo "$as_me: assuming non-fragile-abi support on Windows MSVC" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: assuming non-fragile-abi support on Windows MSVC" >&5
+printf "%s\n" "$as_me: assuming non-fragile-abi support on Windows MSVC" >&6;}
     GS_NONFRAGILE=1
   else
     saved_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $OBJCFLAGS -x objective-c"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-fragile-abi support" >&5
-$as_echo_n "checking for non-fragile-abi support... " >&6; }
-    if test "$cross_compiling" = yes; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-fragile-abi support" >&5
+printf %s "checking for non-fragile-abi support... " >&6; }
+    if test "$cross_compiling" = yes
+then :
   non_fragile="$cross_non_fragile"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.non-fragile-ivars.m"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   non_fragile=yes
-else
+else $as_nop
   non_fragile=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8554,8 +8902,8 @@ fi
     if test $non_fragile = yes; then
       GS_NONFRAGILE=1
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $non_fragile" >&5
-$as_echo "$non_fragile" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $non_fragile" >&5
+printf "%s\n" "$non_fragile" >&6; }
   fi
 fi
 
@@ -8566,18 +8914,162 @@ fi
 #--------------------------------------------------------------------
 # get_uninstalled_dtable used by behavior.m and objc-load.m
 #--------------------------------------------------------------------
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <objc/objc-api.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "objc_get_uninstalled_dtable" >/dev/null 2>&1; then :
+  $EGREP "objc_get_uninstalled_dtable" >/dev/null 2>&1
+then :
 
-$as_echo "#define HAVE_OBJC_GET_UNINSTALLED_DTABLE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OBJC_GET_UNINSTALLED_DTABLE 1" >>confdefs.h
 
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
 # Don't revert any Objective-C flags as they are used in the next test
@@ -8620,72 +9112,76 @@ fi
 # disabled.  So maybe we should not run them at all in that case.  On
 # the other hand, that case is going to become more and more unusual.
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objc_setUncaughtExceptionHandler() in runtime" >&5
-$as_echo_n "checking for objc_setUncaughtExceptionHandler() in runtime... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objc_setUncaughtExceptionHandler() in runtime" >&5
+printf %s "checking for objc_setUncaughtExceptionHandler() in runtime... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.setUncaughtExceptionHandler.m"
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_set_uncaught_exception_handler=yes
-else
+else $as_nop
   have_set_uncaught_exception_handler=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 if test $have_set_uncaught_exception_handler = yes; then
 
-$as_echo "#define HAVE_SET_UNCAUGHT_EXCEPTION_HANDLER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SET_UNCAUGHT_EXCEPTION_HANDLER 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_set_uncaught_exception_handler" >&5
-$as_echo "$have_set_uncaught_exception_handler" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_set_uncaught_exception_handler" >&5
+printf "%s\n" "$have_set_uncaught_exception_handler" >&6; }
 
 # Don't revert any Objective-C flags as they are used in the next test
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objc_set_unexpected() in runtime" >&5
-$as_echo_n "checking for objc_set_unexpected() in runtime... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objc_set_unexpected() in runtime" >&5
+printf %s "checking for objc_set_unexpected() in runtime... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.set_unexpected.m"
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_set_unexpected=yes
-else
+else $as_nop
   have_set_unexpected=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 if test $have_set_unexpected = yes; then
 
-$as_echo "#define HAVE_SET_UNEXPECTED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SET_UNEXPECTED 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_set_unexpected" >&5
-$as_echo "$have_set_unexpected" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_set_unexpected" >&5
+printf "%s\n" "$have_set_unexpected" >&6; }
 
 # Don't revert any Objective-C flags as they are used in the next test
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _objc_unexpected_exception in runtime" >&5
-$as_echo_n "checking for _objc_unexpected_exception in runtime... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _objc_unexpected_exception in runtime" >&5
+printf %s "checking for _objc_unexpected_exception in runtime... " >&6; }
 if test "$host_os" = windows -a "$OBJC_RUNTIME_LIB" = "ng"; then
   # On Windows MSVC, AC_CHECK_FUNCS() will throw linker errors ("relocation
   # against symbol in discarded section") as the file won't contain any actual
   # ObjC code, so we just assume the function is there.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: assuming _objc_unexpected_exception() on Windows MSVC" >&5
-$as_echo "$as_me: assuming _objc_unexpected_exception() on Windows MSVC" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: assuming _objc_unexpected_exception() on Windows MSVC" >&5
+printf "%s\n" "$as_me: assuming _objc_unexpected_exception() on Windows MSVC" >&6;}
   have_unexpected=yes
 else
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
   have_unexpected="$cross_have_unexpected"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.unexpected.m"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   have_unexpected=yes
-else
+else $as_nop
   have_unexpected=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8695,11 +9191,11 @@ fi
 fi
 if test $have_unexpected = yes; then
 
-$as_echo "#define HAVE_UNEXPECTED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UNEXPECTED 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_unexpected" >&5
-$as_echo "$have_unexpected" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_unexpected" >&5
+printf "%s\n" "$have_unexpected" >&6; }
 
 # TODO: It would also be nice to actually test that native Objective-C
 # exceptions work.
@@ -8708,27 +9204,27 @@ if test "$exceptions" = "yes"; then
   if test x"$have_set_uncaught_exception_handler" = x"no"; then
     if test x"$have_set_unexpected" = x"no"; then
       if test x"$have_unexpected" = x"no"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling native Objective-C exceptions because the ObjC runtime" >&5
-$as_echo "$as_me: Disabling native Objective-C exceptions because the ObjC runtime" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: has no way to set an uncaught exception handler.  Please install" >&5
-$as_echo "$as_me: has no way to set an uncaught exception handler.  Please install" >&6;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: a recent Objective-C runtime if you want to use them." >&5
-$as_echo "$as_me: a recent Objective-C runtime if you want to use them." >&6;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Disabling native Objective-C exceptions because the ObjC runtime" >&5
+printf "%s\n" "$as_me: Disabling native Objective-C exceptions because the ObjC runtime" >&6;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: has no way to set an uncaught exception handler.  Please install" >&5
+printf "%s\n" "$as_me: has no way to set an uncaught exception handler.  Please install" >&6;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: a recent Objective-C runtime if you want to use them." >&5
+printf "%s\n" "$as_me: a recent Objective-C runtime if you want to use them." >&6;}
         exceptions="no";
       fi
     fi
   fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable native Objective-C exceptions" >&5
-$as_echo_n "checking whether to enable native Objective-C exceptions... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable native Objective-C exceptions" >&5
+printf %s "checking whether to enable native Objective-C exceptions... " >&6; }
 if test "$exceptions" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   BASE_NATIVE_OBJC_EXCEPTIONS=1
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   BASE_NATIVE_OBJC_EXCEPTIONS=0
 fi
 
@@ -8743,20 +9239,16 @@ if test "$host_os" = windows -a "$OBJC_RUNTIME_LIB" = "ng"; then
   # On Windows MSVC, AC_CHECK_FUNCS() will throw linker errors ("relocation
   # against symbol in discarded section") as the file won't contain any actual
   # ObjC code, so we just assume the function is there.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: assuming objc_sync_enter() on Windows MSVC" >&5
-$as_echo "$as_me: assuming objc_sync_enter() on Windows MSVC" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: assuming objc_sync_enter() on Windows MSVC" >&5
+printf "%s\n" "$as_me: assuming objc_sync_enter() on Windows MSVC" >&6;}
   HAVE_OBJC_SYNC_ENTER=yes
 else
-  for ac_func in objc_sync_enter
-do :
   ac_fn_c_check_func "$LINENO" "objc_sync_enter" "ac_cv_func_objc_sync_enter"
-if test "x$ac_cv_func_objc_sync_enter" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_OBJC_SYNC_ENTER 1
-_ACEOF
+if test "x$ac_cv_func_objc_sync_enter" = xyes
+then :
+  printf "%s\n" "#define HAVE_OBJC_SYNC_ENTER 1" >>confdefs.h
 
 fi
-done
 
   if test $ac_cv_func_objc_sync_enter = yes ; then
     HAVE_OBJC_SYNC_ENTER=yes
@@ -8766,18 +9258,20 @@ fi
 
 # Don't revert any Objective-C flags as they are used in the next test
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread-safe +initialize in runtime" >&5
-$as_echo_n "checking for thread-safe +initialize in runtime... " >&6; }
-if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for thread-safe +initialize in runtime" >&5
+printf %s "checking for thread-safe +initialize in runtime... " >&6; }
+if test "$cross_compiling" = yes
+then :
   safe_initialize="$cross_safe_initialize"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.initialize.m"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   safe_initialize=yes
-else
+else $as_nop
   safe_initialize=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8786,14 +9280,14 @@ fi
 
 if test $safe_initialize = yes; then
 
-$as_echo "#define HAVE_INITIALIZE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_INITIALIZE 1" >>confdefs.h
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your ObjectiveC runtime does not support thread-safe class initialisation.  Please use a different runtime if you intend to use threads." >&5
-$as_echo "$as_me: WARNING: Your ObjectiveC runtime does not support thread-safe class initialisation.  Please use a different runtime if you intend to use threads." >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Your ObjectiveC runtime does not support thread-safe class initialisation.  Please use a different runtime if you intend to use threads." >&5
+printf "%s\n" "$as_me: WARNING: Your ObjectiveC runtime does not support thread-safe class initialisation.  Please use a different runtime if you intend to use threads." >&2;}
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $safe_initialize" >&5
-$as_echo "$safe_initialize" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $safe_initialize" >&5
+printf "%s\n" "$safe_initialize" >&6; }
 
 LIBS="$saved_LIBS"
 CPPFLAGS="$saved_CPPFLAGS"
@@ -8804,42 +9298,43 @@ CPPFLAGS="$saved_CPPFLAGS"
 # Generic settings needed by NSZone.m
 #--------------------------------------------------------------------
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
+printf "%s\n" "#define size_t unsigned int" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+printf %s "checking for inline... " >&6; }
+if test ${ac_cv_c_inline+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
+static $ac_kw foo_t static_foo (void) {return 0; }
+$ac_kw foo_t foo (void) {return 0; }
 #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_inline=$ac_kw
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+printf "%s\n" "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -8860,198 +9355,187 @@ esac
 #--------------------------------------------------------------------
 # Following header checks needed for bzero in Storage.m and other places
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
+  ac_cv_path_EGREP=$EGREP
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
+   fi
 fi
-rm -f conftest*
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+
+ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
+if test "x$ac_cv_header_string_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h
 
 fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+ac_fn_c_check_header_compile "$LINENO" "memory.h" "ac_cv_header_memory_h" "$ac_includes_default"
+if test "x$ac_cv_header_memory_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMORY_H 1" >>confdefs.h
 
 fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "alloca.h" "ac_cv_header_alloca_h" "$ac_includes_default"
+if test "x$ac_cv_header_alloca_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-for ac_header in string.h memory.h alloca.h
-do :
-  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
 
 #--------------------------------------------------------------------
 # Following header check needed NSConnection.h
 #--------------------------------------------------------------------
-for ac_header in float.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
-if test "x$ac_cv_header_float_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FLOAT_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
+if test "x$ac_cv_header_float_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_FLOAT_H 1" >>confdefs.h
 
 fi
 
-done
-
 
 #--------------------------------------------------------------------
 # Header files and functions for files and filesystems
 #--------------------------------------------------------------------
-for ac_header in sys/stat.h sys/vfs.h sys/statfs.h sys/statvfs.h pwd.h grp.h
-do :
-  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_stat_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/vfs.h" "ac_cv_header_sys_vfs_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_vfs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_VFS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_statfs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_STATFS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_statvfs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default"
+if test "x$ac_cv_header_pwd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_PWD_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "grp.h" "ac_cv_header_grp_h" "$ac_includes_default"
+if test "x$ac_cv_header_grp_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_GRP_H 1" >>confdefs.h
 
 fi
 
-done
-
-for ac_header in sys/cdefs.h sys/syslimits.h sys/param.h
-do :
-  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/cdefs.h" "ac_cv_header_sys_cdefs_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_cdefs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_CDEFS_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "sys/syslimits.h" "ac_cv_header_sys_syslimits_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_syslimits_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SYSLIMITS_H 1" >>confdefs.h
 
-done
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_param_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
+
+fi
 
 # Twisted header checks for some BSDs with stupid interdependencies
-for ac_header in sys/syslimits.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "sys/syslimits.h" "ac_cv_header_sys_syslimits_h" "#if HAVE_SYS_CDEFS_H
+ac_fn_c_check_header_compile "$LINENO" "sys/syslimits.h" "ac_cv_header_sys_syslimits_h" "#if HAVE_SYS_CDEFS_H
    #include <sys/cdefs.h>
    #endif
    #include <sys/syslimits.h>
 
 "
-if test "x$ac_cv_header_sys_syslimits_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_SYSLIMITS_H 1
-_ACEOF
+if test "x$ac_cv_header_sys_syslimits_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SYSLIMITS_H 1" >>confdefs.h
 
 fi
 
-done
-
-for ac_header in sys/param.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "#if HAVE_SYS_CDEFS_H
+ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "#if HAVE_SYS_CDEFS_H
    #include <sys/cdefs.h>
    #endif
    #if HAVE_SYS_SYSLIMITS_H
@@ -9059,18 +9543,13 @@ do :
    #endif
 
 "
-if test "x$ac_cv_header_sys_param_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_PARAM_H 1
-_ACEOF
+if test "x$ac_cv_header_sys_param_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
 
 fi
 
-done
-
-for ac_header in sys/mount.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "#if HAVE_SYS_CDEFS_H
+ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "#if HAVE_SYS_CDEFS_H
    #include <sys/cdefs.h>
    #endif
    #if HAVE_SYS_SYSLIMITS_H
@@ -9081,34 +9560,44 @@ do :
    #endif
 
 "
-if test "x$ac_cv_header_sys_mount_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_MOUNT_H 1
-_ACEOF
+if test "x$ac_cv_header_sys_mount_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h
 
 fi
 
-done
-
-for ac_header in sys/types.h windows.h locale.h langinfo.h
-do :
-  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_types_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
+if test "x$ac_cv_header_windows_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_WINDOWS_H 1" >>confdefs.h
 
-done
+fi
+ac_fn_c_check_header_compile "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
+if test "x$ac_cv_header_locale_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOCALE_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default"
+if test "x$ac_cv_header_langinfo_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h
+
+fi
 
 saved_LIBS="$LIBS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5
-$as_echo_n "checking for main in -lm... " >&6; }
-if ${ac_cv_lib_m_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5
+printf %s "checking for main in -lm... " >&6; }
+if test ${ac_cv_lib_m_main+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9116,112 +9605,213 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 
 int
-main ()
+main (void)
 {
 return main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_m_main=yes
-else
+else $as_nop
   ac_cv_lib_m_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_main" >&5
-$as_echo "$ac_cv_lib_m_main" >&6; }
-if test "x$ac_cv_lib_m_main" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_main" >&5
+printf "%s\n" "$ac_cv_lib_m_main" >&6; }
+if test "x$ac_cv_lib_m_main" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h
 
   LIBS="-lm $LIBS"
 
 fi
 
-for ac_func in utimensat statvfs link symlink readlink geteuid getlogin getpwnam getpwnam_r getpwuid getpwuid_r getgrgid getgrgid_r getgrnam getgrnam_r rint getopt malloc_usable_size
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "utimensat" "ac_cv_func_utimensat"
+if test "x$ac_cv_func_utimensat" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIMENSAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
+if test "x$ac_cv_func_statvfs" = xyes
+then :
+  printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "link" "ac_cv_func_link"
+if test "x$ac_cv_func_link" = xyes
+then :
+  printf "%s\n" "#define HAVE_LINK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "symlink" "ac_cv_func_symlink"
+if test "x$ac_cv_func_symlink" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYMLINK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "readlink" "ac_cv_func_readlink"
+if test "x$ac_cv_func_readlink" = xyes
+then :
+  printf "%s\n" "#define HAVE_READLINK 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "geteuid" "ac_cv_func_geteuid"
+if test "x$ac_cv_func_geteuid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETEUID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getlogin" "ac_cv_func_getlogin"
+if test "x$ac_cv_func_getlogin" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETLOGIN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpwnam" "ac_cv_func_getpwnam"
+if test "x$ac_cv_func_getpwnam" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPWNAM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpwnam_r" "ac_cv_func_getpwnam_r"
+if test "x$ac_cv_func_getpwnam_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPWNAM_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpwuid" "ac_cv_func_getpwuid"
+if test "x$ac_cv_func_getpwuid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPWUID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpwuid_r" "ac_cv_func_getpwuid_r"
+if test "x$ac_cv_func_getpwuid_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPWUID_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgrgid" "ac_cv_func_getgrgid"
+if test "x$ac_cv_func_getgrgid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGRGID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgrgid_r" "ac_cv_func_getgrgid_r"
+if test "x$ac_cv_func_getgrgid_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGRGID_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgrnam" "ac_cv_func_getgrnam"
+if test "x$ac_cv_func_getgrnam" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGRNAM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getgrnam_r" "ac_cv_func_getgrnam_r"
+if test "x$ac_cv_func_getgrnam_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETGRNAM_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "rint" "ac_cv_func_rint"
+if test "x$ac_cv_func_rint" = xyes
+then :
+  printf "%s\n" "#define HAVE_RINT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt"
+if test "x$ac_cv_func_getopt" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETOPT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "malloc_usable_size" "ac_cv_func_malloc_usable_size"
+if test "x$ac_cv_func_malloc_usable_size" = xyes
+then :
+  printf "%s\n" "#define HAVE_MALLOC_USABLE_SIZE 1" >>confdefs.h
 
 fi
-done
 
 LIBS="$saved_LIBS"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pw_gecos field in struct passwd" >&5
-$as_echo_n "checking for pw_gecos field in struct passwd... " >&6; }
-if ${ac_cv_have_pw_gecos_in_struct_passwd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pw_gecos field in struct passwd" >&5
+printf %s "checking for pw_gecos field in struct passwd... " >&6; }
+if test ${ac_cv_have_pw_gecos_in_struct_passwd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <pwd.h>
 int
-main ()
+main (void)
 {
  struct passwd p; p.pw_gecos = 0;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
    ac_cv_have_pw_gecos_in_struct_passwd="yes"
-else
+else $as_nop
    ac_cv_have_pw_gecos_in_struct_passwd="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pw_gecos_in_struct_passwd" >&5
-$as_echo "$ac_cv_have_pw_gecos_in_struct_passwd" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pw_gecos_in_struct_passwd" >&5
+printf "%s\n" "$ac_cv_have_pw_gecos_in_struct_passwd" >&6; }
 if test "x$ac_cv_have_pw_gecos_in_struct_passwd" = "xyes" ; then
 
-$as_echo "#define HAVE_PW_GECOS_IN_PASSWD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PW_GECOS_IN_PASSWD 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for currency_symbol field in struct lconv" >&5
-$as_echo_n "checking for currency_symbol field in struct lconv... " >&6; }
-if ${ac_cv_have_currency_symbol_in_struct_lconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for currency_symbol field in struct lconv" >&5
+printf %s "checking for currency_symbol field in struct lconv... " >&6; }
+if test ${ac_cv_have_currency_symbol_in_struct_lconv+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <locale.h>
 int
-main ()
+main (void)
 {
  struct lconv l; l.currency_symbol = NULL;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
    ac_cv_have_currency_symbol_in_struct_lconv="yes"
-else
+else $as_nop
    ac_cv_have_currency_symbol_in_struct_lconv="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_currency_symbol_in_struct_lconv" >&5
-$as_echo "$ac_cv_have_currency_symbol_in_struct_lconv" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_currency_symbol_in_struct_lconv" >&5
+printf "%s\n" "$ac_cv_have_currency_symbol_in_struct_lconv" >&6; }
 if test "x$ac_cv_have_currency_symbol_in_struct_lconv" = "xyes" ; then
 
-$as_echo "#define HAVE_CURRENCY_SYMBOL_IN_LCONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURRENCY_SYMBOL_IN_LCONV 1" >>confdefs.h
 
 fi
 
@@ -9229,54 +9819,78 @@ fi
 # These two headers (functions) needed by Time.m
 #--------------------------------------------------------------------
 
-for ac_header in time.h sys/time.h tzfile.h sys/rusage.h ucbinclude/sys/resource.h
-do :
-  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_time_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TIME_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_time_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "tzfile.h" "ac_cv_header_tzfile_h" "$ac_includes_default"
+if test "x$ac_cv_header_tzfile_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_TZFILE_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/rusage.h" "ac_cv_header_sys_rusage_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_rusage_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_RUSAGE_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "ucbinclude/sys/resource.h" "ac_cv_header_ucbinclude_sys_resource_h" "$ac_includes_default"
+if test "x$ac_cv_header_ucbinclude_sys_resource_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UCBINCLUDE_SYS_RESOURCE_H 1" >>confdefs.h
 
 fi
 
-done
-
-for ac_func in time ctime tzset
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "time" "ac_cv_func_time"
+if test "x$ac_cv_func_time" = xyes
+then :
+  printf "%s\n" "#define HAVE_TIME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ctime" "ac_cv_func_ctime"
+if test "x$ac_cv_func_ctime" = xyes
+then :
+  printf "%s\n" "#define HAVE_CTIME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "tzset" "ac_cv_func_tzset"
+if test "x$ac_cv_func_tzset" = xyes
+then :
+  printf "%s\n" "#define HAVE_TZSET 1" >>confdefs.h
 
 fi
-done
 
 
 #--------------------------------------------------------------------
 # These headers/functions needed by GSTcpPort.m
 #--------------------------------------------------------------------
-for ac_header in sys/socket.h netinet/in.h
-do :
-  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_socket_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
+if test "x$ac_cv_header_netinet_in_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NETINET_IN_H 1" >>confdefs.h
 
 fi
 
-done
-
 ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default"
-if test "x$ac_cv_type_socklen_t" = xyes; then :
+if test "x$ac_cv_type_socklen_t" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SOCKLEN_T 1
-_ACEOF
+printf "%s\n" "#define HAVE_SOCKLEN_T 1" >>confdefs.h
 
 
 fi
@@ -9308,9 +9922,10 @@ ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockad
 #endif
 
 "
-if test "x$ac_cv_type_struct_sockaddr_storage" = xyes; then :
+if test "x$ac_cv_type_struct_sockaddr_storage" = xyes
+then :
 
-$as_echo "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h
 
 fi
 
@@ -9320,37 +9935,34 @@ fi
 # These headers/functions needed for stacktrace in NSException.m
 #--------------------------------------------------------------------
 # Check whether --enable-bfd was given.
-if test "${enable_bfd+set}" = set; then :
+if test ${enable_bfd+y}
+then :
   enableval=$enable_bfd;
-else
+else $as_nop
   enable_bfd=no
 fi
 
 if test $enable_bfd = yes ; then
 
-$as_echo "#define USE_BFD 1" >>confdefs.h
+printf "%s\n" "#define USE_BFD 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You enabled bfd, which causes gnustep-base to link with libbfd. This makes the license GPL rather than the normal LGPL." >&5
-$as_echo "$as_me: WARNING: You enabled bfd, which causes gnustep-base to link with libbfd. This makes the license GPL rather than the normal LGPL." >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You enabled bfd, which causes gnustep-base to link with libbfd. This makes the license GPL rather than the normal LGPL." >&5
+printf "%s\n" "$as_me: WARNING: You enabled bfd, which causes gnustep-base to link with libbfd. This makes the license GPL rather than the normal LGPL." >&2;}
 fi
 
-for ac_header in bfd.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
-if test "x$ac_cv_header_bfd_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BFD_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
+if test "x$ac_cv_header_bfd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_BFD_H 1" >>confdefs.h
 
 fi
 
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libintl_fprintf in -lintl" >&5
-$as_echo_n "checking for libintl_fprintf in -lintl... " >&6; }
-if ${ac_cv_lib_intl_libintl_fprintf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libintl_fprintf in -lintl" >&5
+printf %s "checking for libintl_fprintf in -lintl... " >&6; }
+if test ${ac_cv_lib_intl_libintl_fprintf+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9359,43 +9971,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char libintl_fprintf ();
 int
-main ()
+main (void)
 {
 return libintl_fprintf ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_intl_libintl_fprintf=yes
-else
+else $as_nop
   ac_cv_lib_intl_libintl_fprintf=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_libintl_fprintf" >&5
-$as_echo "$ac_cv_lib_intl_libintl_fprintf" >&6; }
-if test "x$ac_cv_lib_intl_libintl_fprintf" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBINTL 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_libintl_fprintf" >&5
+printf "%s\n" "$ac_cv_lib_intl_libintl_fprintf" >&6; }
+if test "x$ac_cv_lib_intl_libintl_fprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBINTL 1" >>confdefs.h
 
   LIBS="-lintl $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZSTD_compress in -lzstd" >&5
-$as_echo_n "checking for ZSTD_compress in -lzstd... " >&6; }
-if ${ac_cv_lib_zstd_ZSTD_compress+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZSTD_compress in -lzstd" >&5
+printf %s "checking for ZSTD_compress in -lzstd... " >&6; }
+if test ${ac_cv_lib_zstd_ZSTD_compress+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzstd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9404,43 +10014,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char ZSTD_compress ();
 int
-main ()
+main (void)
 {
 return ZSTD_compress ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_zstd_ZSTD_compress=yes
-else
+else $as_nop
   ac_cv_lib_zstd_ZSTD_compress=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zstd_ZSTD_compress" >&5
-$as_echo "$ac_cv_lib_zstd_ZSTD_compress" >&6; }
-if test "x$ac_cv_lib_zstd_ZSTD_compress" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZSTD 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zstd_ZSTD_compress" >&5
+printf "%s\n" "$ac_cv_lib_zstd_ZSTD_compress" >&6; }
+if test "x$ac_cv_lib_zstd_ZSTD_compress" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBZSTD 1" >>confdefs.h
 
   LIBS="-lzstd $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dyn_string_append in -liberty" >&5
-$as_echo_n "checking for dyn_string_append in -liberty... " >&6; }
-if ${ac_cv_lib_iberty_dyn_string_append+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dyn_string_append in -liberty" >&5
+printf %s "checking for dyn_string_append in -liberty... " >&6; }
+if test ${ac_cv_lib_iberty_dyn_string_append+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liberty  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9449,43 +10057,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dyn_string_append ();
 int
-main ()
+main (void)
 {
 return dyn_string_append ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_iberty_dyn_string_append=yes
-else
+else $as_nop
   ac_cv_lib_iberty_dyn_string_append=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_dyn_string_append" >&5
-$as_echo "$ac_cv_lib_iberty_dyn_string_append" >&6; }
-if test "x$ac_cv_lib_iberty_dyn_string_append" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBIBERTY 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_dyn_string_append" >&5
+printf "%s\n" "$ac_cv_lib_iberty_dyn_string_append" >&6; }
+if test "x$ac_cv_lib_iberty_dyn_string_append" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBIBERTY 1" >>confdefs.h
 
   LIBS="-liberty $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzseek in -lz" >&5
-$as_echo_n "checking for gzseek in -lz... " >&6; }
-if ${ac_cv_lib_z_gzseek+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gzseek in -lz" >&5
+printf %s "checking for gzseek in -lz... " >&6; }
+if test ${ac_cv_lib_z_gzseek+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9494,43 +10100,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gzseek ();
 int
-main ()
+main (void)
 {
 return gzseek ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_z_gzseek=yes
-else
+else $as_nop
   ac_cv_lib_z_gzseek=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzseek" >&5
-$as_echo "$ac_cv_lib_z_gzseek" >&6; }
-if test "x$ac_cv_lib_z_gzseek" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzseek" >&5
+printf "%s\n" "$ac_cv_lib_z_gzseek" >&6; }
+if test "x$ac_cv_lib_z_gzseek" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h
 
   LIBS="-lz $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sframe" >&5
-$as_echo_n "checking for library containing sframe... " >&6; }
-if ${ac_cv_search_sframe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing sframe" >&5
+printf %s "checking for library containing sframe... " >&6; }
+if test ${ac_cv_search_sframe+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9538,55 +10142,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sframe ();
 int
-main ()
+main (void)
 {
 return sframe ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' sframe_decode; do
+for ac_lib in '' sframe_decode
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_sframe=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_sframe+:} false; then :
+  if test ${ac_cv_search_sframe+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_sframe+:} false; then :
+if test ${ac_cv_search_sframe+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_sframe=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sframe" >&5
-$as_echo "$ac_cv_search_sframe" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sframe" >&5
+printf "%s\n" "$ac_cv_search_sframe" >&6; }
 ac_res=$ac_cv_search_sframe
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
-$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
-if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
+printf %s "checking for bfd_openr in -lbfd... " >&6; }
+if test ${ac_cv_lib_bfd_bfd_openr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbfd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9595,33 +10202,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char bfd_openr ();
 int
-main ()
+main (void)
 {
 return bfd_openr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bfd_bfd_openr=yes
-else
+else $as_nop
   ac_cv_lib_bfd_bfd_openr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
-$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
-if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBBFD 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
+printf "%s\n" "$ac_cv_lib_bfd_bfd_openr" >&6; }
+if test "x$ac_cv_lib_bfd_bfd_openr" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBBFD 1" >>confdefs.h
 
   LIBS="-lbfd $LIBS"
 
@@ -9630,133 +10234,110 @@ fi
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-  #include <bfd.h>
-
+#include <bfd.h>
 int
-main ()
+main (void)
 {
 bfd_section_vma(0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   bfd_section_vma=1
-else
+else $as_nop
   bfd_section_vma=0
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 if test $bfd_section_vma = 1; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: bfd_section_vma found" >&5
-$as_echo "bfd_section_vma found" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: bfd_section_vma found" >&5
+printf "%s\n" "bfd_section_vma found" >&6; }
 
-$as_echo "#define HAVE_BFD_SECTION_VMA 1" >>confdefs.h
+printf "%s\n" "#define HAVE_BFD_SECTION_VMA 1" >>confdefs.h
 
 fi
 
 
 case "$target_os" in
   mingw*)
-    for ac_header in dbghelp.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dbghelp.h" "ac_cv_header_dbghelp_h" "$ac_includes_default"
-if test "x$ac_cv_header_dbghelp_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DBGHELP_H 1
-_ACEOF
+    ac_fn_c_check_header_compile "$LINENO" "dbghelp.h" "ac_cv_header_dbghelp_h" "$ac_includes_default"
+if test "x$ac_cv_header_dbghelp_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DBGHELP_H 1" >>confdefs.h
 
 fi
 
-done
-
     ;;
   *)
-    for ac_header in execinfo.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
-if test "x$ac_cv_header_execinfo_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_EXECINFO_H 1
-_ACEOF
+    ac_fn_c_check_header_compile "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
+if test "x$ac_cv_header_execinfo_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXECINFO_H 1" >>confdefs.h
 
 fi
 
-done
-
-    for ac_func in backtrace
-do :
-  ac_fn_c_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace"
-if test "x$ac_cv_func_backtrace" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BACKTRACE 1
-_ACEOF
+    ac_fn_c_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace"
+if test "x$ac_cv_func_backtrace" = xyes
+then :
+  printf "%s\n" "#define HAVE_BACKTRACE 1" >>confdefs.h
 
 fi
-done
 
     ;;
 esac
 
-for ac_func in __builtin_extract_return_address
-do :
-  ac_fn_c_check_func "$LINENO" "__builtin_extract_return_address" "ac_cv_func___builtin_extract_return_address"
-if test "x$ac_cv_func___builtin_extract_return_address" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE___BUILTIN_EXTRACT_RETURN_ADDRESS 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "__builtin_extract_return_address" "ac_cv_func___builtin_extract_return_address"
+if test "x$ac_cv_func___builtin_extract_return_address" = xyes
+then :
+  printf "%s\n" "#define HAVE___BUILTIN_EXTRACT_RETURN_ADDRESS 1" >>confdefs.h
 
 fi
-done
 
 
 # Enable unwind if found by default
 
 # Check whether --with-unwind was given.
-if test "${with_unwind+set}" = set; then :
+if test ${with_unwind+y}
+then :
   withval=$with_unwind;
 fi
 
 
-if test "x$with_unwind" != "xno"; then :
-  for ac_header in unwind.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "unwind.h" "ac_cv_header_unwind_h" "$ac_includes_default"
-if test "x$ac_cv_header_unwind_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_UNWIND_H 1
-_ACEOF
+if test "x$with_unwind" != "xno"
+then :
+  ac_fn_c_check_header_compile "$LINENO" "unwind.h" "ac_cv_header_unwind_h" "$ac_includes_default"
+if test "x$ac_cv_header_unwind_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNWIND_H 1" >>confdefs.h
+
+fi
+ ac_fn_c_check_func "$LINENO" "_Unwind_GetIP" "ac_cv_func__Unwind_GetIP"
+if test "x$ac_cv_func__Unwind_GetIP" = xyes
+then :
+  printf "%s\n" "#define HAVE__UNWIND_GETIP 1" >>confdefs.h
 
 fi
 
-done
- for ac_func in _Unwind_GetIP
-do :
-  ac_fn_c_check_func "$LINENO" "_Unwind_GetIP" "ac_cv_func__Unwind_GetIP"
-if test "x$ac_cv_func__Unwind_GetIP" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__UNWIND_GETIP 1
-_ACEOF
-
-fi
-done
-
-else
+else $as_nop
   have_unwind=no
 fi
 
-if test "x$ac_cv_func__Unwind_GetIP" = "xyes"; then :
+if test "x$ac_cv_func__Unwind_GetIP" = "xyes"
+then :
   have_unwind=yes
-else
+else $as_nop
   have_unwind=no
 fi
 
-if test "x$have_unwind" = "xyes"; then :
+if test "x$have_unwind" = "xyes"
+then :
 
-$as_echo "#define WITH_UNWIND 1" >>confdefs.h
+printf "%s\n" "#define WITH_UNWIND 1" >>confdefs.h
 
-else
-  if test "x$with_unwind" = "xyes"; then :
+else $as_nop
+  if test "x$with_unwind" = "xyes"
+then :
   as_fn_error $? "unwind requested but not found" "$LINENO" 5
 
 fi
@@ -9766,43 +10347,41 @@ fi
 #--------------------------------------------------------------------
 # These headers/functions needed by NSLog.m
 #--------------------------------------------------------------------
-for ac_header in syslog.h sys/slog.h sys/slogcodes.h
-do :
-  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default"
+if test "x$ac_cv_header_syslog_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYSLOG_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/slog.h" "ac_cv_header_sys_slog_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_slog_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SLOG_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/slogcodes.h" "ac_cv_header_sys_slogcodes_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_slogcodes_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SLOGCODES_H 1" >>confdefs.h
 
 fi
 
-done
-
-for ac_func in syslog
-do :
-  ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
-if test "x$ac_cv_func_syslog" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYSLOG 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
+if test "x$ac_cv_func_syslog" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYSLOG 1" >>confdefs.h
 
 fi
-done
 
 if test "$ac_cv_header_sys_slog_h" = "yes"; then
   oldLibs="$LIBS";
   LIBS="$LIBS -l:libc.a";
-  for ac_func in slogf
-do :
   ac_fn_c_check_func "$LINENO" "slogf" "ac_cv_func_slogf"
-if test "x$ac_cv_func_slogf" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SLOGF 1
-_ACEOF
+if test "x$ac_cv_func_slogf" = xyes
+then :
+  printf "%s\n" "#define HAVE_SLOGF 1" >>confdefs.h
 
 fi
-done
 
   if test "$ac_cv_func_slogf" = "no"; then
     LIBS="$oldLibs"
@@ -9811,59 +10390,53 @@ fi
 #--------------------------------------------------------------------
 # These headers/functions needed by NSRunLoop.m
 #--------------------------------------------------------------------
-for ac_header in poll.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default"
-if test "x$ac_cv_header_poll_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_POLL_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default"
+if test "x$ac_cv_header_poll_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_POLL_H 1" >>confdefs.h
 
 fi
 
-done
-
-for ac_func in poll
-do :
-  ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
-if test "x$ac_cv_func_poll" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_POLL 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
+if test "x$ac_cv_func_poll" = xyes
+then :
+  printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h
 
 fi
-done
 
 have_poll=no
 if test $ac_cv_header_poll_h = yes; then
   have_poll=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poll emulation" >&5
-$as_echo_n "checking for poll emulation... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for poll emulation" >&5
+printf %s "checking for poll emulation... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "config/config.poll.c"
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "emulating_poll" >/dev/null 2>&1; then :
+  $EGREP "emulating_poll" >/dev/null 2>&1
+then :
   have_poll=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
   if test $have_poll = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if poll supports devices" >&5
-$as_echo_n "checking if poll supports devices... " >&6; }
-    if test "$cross_compiling" = yes; then :
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if poll supports devices" >&5
+printf %s "checking if poll supports devices... " >&6; }
+    if test "$cross_compiling" = yes
+then :
   have_poll="$cross_have_poll"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include "$srcdir/config/config.poll-dev.c"i
+#include "$srcdir/config/config.poll-dev.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-else
+else $as_nop
   have_poll=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -9871,47 +10444,62 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
     if test $have_poll = yes; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_POLL_F 1" >>confdefs.h
+printf "%s\n" "#define HAVE_POLL_F 1" >>confdefs.h
 
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   fi
 fi
 
 #--------------------------------------------------------------------
 # This function needed by StdioStream.m
 #--------------------------------------------------------------------
-for ac_func in vsprintf vasprintf snprintf vsnprintf
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "vsprintf" "ac_cv_func_vsprintf"
+if test "x$ac_cv_func_vsprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_VSPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
+if test "x$ac_cv_func_vasprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
+if test "x$ac_cv_func_snprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
+if test "x$ac_cv_func_vsnprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h
 
 fi
-done
 
 if test $ac_cv_func_vsprintf = yes ; then
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
   VSPRINTF_RETURNS_LENGTH="$cross_VSPRINTF_RETURNS_LENGTH"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.vsprintf.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   VSPRINTF_RETURNS_LENGTH=1
-else
+else $as_nop
   VSPRINTF_RETURNS_LENGTH=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -9919,22 +10507,22 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define VSPRINTF_RETURNS_LENGTH $VSPRINTF_RETURNS_LENGTH
-_ACEOF
+printf "%s\n" "#define VSPRINTF_RETURNS_LENGTH $VSPRINTF_RETURNS_LENGTH" >>confdefs.h
 
 fi
 if test $ac_cv_func_vasprintf = yes ; then
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
   VASPRINTF_RETURNS_LENGTH="$cross_VASPRINTF_RETURNS_LENGTH"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.vasprintf.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   VASPRINTF_RETURNS_LENGTH=1
-else
+else $as_nop
   VASPRINTF_RETURNS_LENGTH=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -9942,41 +10530,36 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define VASPRINTF_RETURNS_LENGTH $VASPRINTF_RETURNS_LENGTH
-_ACEOF
+printf "%s\n" "#define VASPRINTF_RETURNS_LENGTH $VASPRINTF_RETURNS_LENGTH" >>confdefs.h
 
 fi
 
 #--------------------------------------------------------------------
 # This function needed by NSFileManager.m
 #--------------------------------------------------------------------
-for ac_func in getcwd
-do :
-  ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
-if test "x$ac_cv_func_getcwd" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETCWD 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
+if test "x$ac_cv_func_getcwd" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h
 
 fi
-done
 
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+printf %s "checking for $ac_hdr that defines DIR... " >&6; }
+if eval test \${$as_ac_Header+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_hdr>
 
 int
-main ()
+main (void)
 {
 if ((DIR *) 0)
 return 0;
@@ -9984,19 +10567,21 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$as_ac_Header=yes"
-else
+else $as_nop
   eval "$as_ac_Header=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$as_ac_Header
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
 
 ac_header_dirent=$ac_hdr; break
@@ -10005,11 +10590,12 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10017,56 +10603,59 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char opendir ();
 int
-main ()
+main (void)
 {
 return opendir ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' dir; do
+for ac_lib in '' dir
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+  if test ${ac_cv_search_opendir+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
+if test ${ac_cv_search_opendir+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10074,46 +10663,48 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char opendir ();
 int
-main ()
+main (void)
 {
 return opendir ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' x; do
+for ac_lib in '' x
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+  if test ${ac_cv_search_opendir+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
+if test ${ac_cv_search_opendir+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -10124,51 +10715,46 @@ fi
 # Look for file creation and modification date on NetBSD, FreeBSD, Darwin
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "#include <sys/stat.h>
 "
-if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_mtim" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIM 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_MTIM 1" >>confdefs.h
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "#include <sys/stat.h>
 "
-if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1" >>confdefs.h
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec" "ac_cv_member_struct_stat_st_birthtimespec" "#include <sys/stat.h>
 "
-if test "x$ac_cv_member_struct_stat_st_birthtimespec" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_birthtimespec" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC 1" >>confdefs.h
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim" "ac_cv_member_struct_stat_st_birthtim" "#include <sys/stat.h>
 "
-if test "x$ac_cv_member_struct_stat_st_birthtim" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_birthtim" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BIRTHTIM 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIM 1" >>confdefs.h
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat64" "st_birthtimespec" "ac_cv_member_struct_stat64_st_birthtimespec" "#include <sys/stat.h>
 "
-if test "x$ac_cv_member_struct_stat64_st_birthtimespec" = xyes; then :
+if test "x$ac_cv_member_struct_stat64_st_birthtimespec" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT64_ST_BIRTHTIMESPEC 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT64_ST_BIRTHTIMESPEC 1" >>confdefs.h
 
 
 fi
@@ -10177,174 +10763,155 @@ fi
 #--------------------------------------------------------------------
 # This function needed by gdomap.c
 #--------------------------------------------------------------------
-for ac_header in getopt.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
-if test "x$ac_cv_header_getopt_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETOPT_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
+if test "x$ac_cv_header_getopt_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h
 
 fi
 
-done
-
 
 #--------------------------------------------------------------------
 # This function needed by NSPage.m
 #--------------------------------------------------------------------
-for ac_func in posix_memalign valloc
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign"
+if test "x$ac_cv_func_posix_memalign" = xyes
+then :
+  printf "%s\n" "#define HAVE_POSIX_MEMALIGN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "valloc" "ac_cv_func_valloc"
+if test "x$ac_cv_func_valloc" = xyes
+then :
+  printf "%s\n" "#define HAVE_VALLOC 1" >>confdefs.h
 
 fi
-done
 
 
 #--------------------------------------------------------------------
 # This function needed by Time.m
 #--------------------------------------------------------------------
-for ac_func in times
-do :
-  ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times"
-if test "x$ac_cv_func_times" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TIMES 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times"
+if test "x$ac_cv_func_times" = xyes
+then :
+  printf "%s\n" "#define HAVE_TIMES 1" >>confdefs.h
 
 fi
-done
 
 
 #--------------------------------------------------------------------
 # These functions needed by NSData.m and GSFFIInvocation.m
 #--------------------------------------------------------------------
-for ac_func in mkstemp
-do :
-  ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
-if test "x$ac_cv_func_mkstemp" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MKSTEMP 1
-_ACEOF
-
-fi
-done
-
-for ac_func in shmctl
-do :
-  ac_fn_c_check_func "$LINENO" "shmctl" "ac_cv_func_shmctl"
-if test "x$ac_cv_func_shmctl" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SHMCTL 1
-_ACEOF
-
-fi
-done
-
-for ac_func in mmap
-do :
-  ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
-
-fi
-done
-
-for ac_func in mprotect
-do :
-  ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect"
-if test "x$ac_cv_func_mprotect" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MPROTECT 1
-_ACEOF
-
-fi
-done
-
-for ac_header in sys/mman.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 :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_MMAN_H 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
+if test "x$ac_cv_func_mkstemp" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKSTEMP 1" >>confdefs.h
 
 fi
 
-done
+ac_fn_c_check_func "$LINENO" "shmctl" "ac_cv_func_shmctl"
+if test "x$ac_cv_func_shmctl" = xyes
+then :
+  printf "%s\n" "#define HAVE_SHMCTL 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
+if test "x$ac_cv_func_mmap" = xyes
+then :
+  printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect"
+if test "x$ac_cv_func_mprotect" = xyes
+then :
+  printf "%s\n" "#define HAVE_MPROTECT 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mman_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h
+
+fi
 
 
 #--------------------------------------------------------------------
 # These functions needed by NSTask.m
 #--------------------------------------------------------------------
-for ac_func in killpg setpgrp setpgid setsid grantpt
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "killpg" "ac_cv_func_killpg"
+if test "x$ac_cv_func_killpg" = xyes
+then :
+  printf "%s\n" "#define HAVE_KILLPG 1" >>confdefs.h
 
 fi
-done
-
-for ac_func in closefrom
-do :
-  ac_fn_c_check_func "$LINENO" "closefrom" "ac_cv_func_closefrom"
-if test "x$ac_cv_func_closefrom" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CLOSEFROM 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "setpgrp" "ac_cv_func_setpgrp"
+if test "x$ac_cv_func_setpgrp" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETPGRP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setpgid" "ac_cv_func_setpgid"
+if test "x$ac_cv_func_setpgid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETPGID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid"
+if test "x$ac_cv_func_setsid" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETSID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "grantpt" "ac_cv_func_grantpt"
+if test "x$ac_cv_func_grantpt" = xyes
+then :
+  printf "%s\n" "#define HAVE_GRANTPT 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_func "$LINENO" "closefrom" "ac_cv_func_closefrom"
+if test "x$ac_cv_func_closefrom" = xyes
+then :
+  printf "%s\n" "#define HAVE_CLOSEFROM 1" >>confdefs.h
 
 fi
-done
 
 if test "x$ac_cv_func_setpgrp" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setpgrp takes no argument" >&5
-$as_echo_n "checking whether setpgrp takes no argument... " >&6; }
-if ${ac_cv_func_setpgrp_void+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  as_fn_error $? "cannot check setpgrp when cross compiling" "$LINENO" 5
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether setpgrp requires zero arguments" >&5
+printf %s "checking whether setpgrp requires zero arguments... " >&6; }
+if test ${ac_cv_func_setpgrp_void+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  # Call it with two arguments.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
-/* If this system has a BSD-style setpgrp which takes arguments,
-  setpgrp(1, 1) will fail with ESRCH and return -1, in that case
-  exit successfully. */
-  return setpgrp (1,1) != -1;
+setpgrp(0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_func_setpgrp_void=no
-else
+else $as_nop
   ac_cv_func_setpgrp_void=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_void" >&5
-$as_echo "$ac_cv_func_setpgrp_void" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_void" >&5
+printf "%s\n" "$ac_cv_func_setpgrp_void" >&6; }
 if test $ac_cv_func_setpgrp_void = yes; then
 
-$as_echo "#define SETPGRP_VOID 1" >>confdefs.h
+printf "%s\n" "#define SETPGRP_VOID 1" >>confdefs.h
 
 fi
 
@@ -10357,24 +10924,136 @@ case "${target}" in
     ;;
 esac
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PTS_STREAM_MODULES $HAVE_PTS_STREAM_MODULES
-_ACEOF
+printf "%s\n" "#define HAVE_PTS_STREAM_MODULES $HAVE_PTS_STREAM_MODULES" >>confdefs.h
 
 
 
-for ac_header in 	fcntl.h 	inttypes.h 	libc.h 	limits.h 	malloc.h 	memory.h 	signal.h 	stdint.h 	string.h 	sys/fcntl.h 	sys/file.h 	sys/filio.h 	sys/inttypes.h 	sys/ioctl.h 	sys/signal.h 	sys/stropts.h 	sys/wait.h 	unistd.h 	utime.h         stdlib.h         stdbool.h
-do :
-  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 `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
+if test "x$ac_cv_header_fcntl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_inttypes_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_INTTYPES_H 1" >>confdefs.h
 
-done
+fi
+ac_fn_c_check_header_compile "$LINENO" "libc.h" "ac_cv_header_libc_h" "$ac_includes_default"
+if test "x$ac_cv_header_libc_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBC_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
+if test "x$ac_cv_header_limits_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIMITS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
+if test "x$ac_cv_header_malloc_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "memory.h" "ac_cv_header_memory_h" "$ac_includes_default"
+if test "x$ac_cv_header_memory_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMORY_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "signal.h" "ac_cv_header_signal_h" "$ac_includes_default"
+if test "x$ac_cv_header_signal_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGNAL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
+if test "x$ac_cv_header_string_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/fcntl.h" "ac_cv_header_sys_fcntl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_fcntl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_FCNTL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_file_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_filio_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_FILIO_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/inttypes.h" "ac_cv_header_sys_inttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_inttypes_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_INTTYPES_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ioctl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/signal.h" "ac_cv_header_sys_signal_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_signal_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SIGNAL_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/stropts.h" "ac_cv_header_sys_stropts_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_stropts_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_STROPTS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_wait_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "$ac_includes_default"
+if test "x$ac_cv_header_utime_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdbool_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STDBOOL_H 1" >>confdefs.h
+
+fi
 
 
 if test $ac_cv_header_inttypes_h = yes; then
@@ -10428,23 +11107,19 @@ fi
 # These used by GSFileHandle.m and distributed objects
 # On some systems we need -lnsl ... so check for that case.
 #--------------------------------------------------------------------
-for ac_header in ws2tcpip.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
-if test "x$ac_cv_header_ws2tcpip_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WS2TCPIP_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
+if test "x$ac_cv_header_ws2tcpip_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_WS2TCPIP_H 1" >>confdefs.h
 
 fi
 
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5
-$as_echo_n "checking for library containing inet_ntop... " >&6; }
-if ${ac_cv_search_inet_ntop+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5
+printf %s "checking for library containing inet_ntop... " >&6; }
+if test ${ac_cv_search_inet_ntop+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10452,82 +11127,99 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char inet_ntop ();
 int
-main ()
+main (void)
 {
 return inet_ntop ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' nsl Ws2_32; do
+for ac_lib in '' nsl Ws2_32
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_inet_ntop=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_inet_ntop+:} false; then :
+  if test ${ac_cv_search_inet_ntop+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_inet_ntop+:} false; then :
+if test ${ac_cv_search_inet_ntop+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_inet_ntop=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5
-$as_echo "$ac_cv_search_inet_ntop" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5
+printf "%s\n" "$ac_cv_search_inet_ntop" >&6; }
 ac_res=$ac_cv_search_inet_ntop
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-for ac_func in gethostbyaddr_r inet_aton inet_pton inet_ntop sigaction
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "gethostbyaddr_r" "ac_cv_func_gethostbyaddr_r"
+if test "x$ac_cv_func_gethostbyaddr_r" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETHOSTBYADDR_R 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
+if test "x$ac_cv_func_inet_aton" = xyes
+then :
+  printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
+if test "x$ac_cv_func_inet_pton" = xyes
+then :
+  printf "%s\n" "#define HAVE_INET_PTON 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
+if test "x$ac_cv_func_inet_ntop" = xyes
+then :
+  printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
+if test "x$ac_cv_func_sigaction" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
 
 fi
-done
 
 
 USE_ZLIB=0
-for ac_header in zlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ZLIB_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ZLIB_H 1" >>confdefs.h
 
 fi
 
-done
-
 if test $ac_cv_header_zlib_h = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzseek in -lz" >&5
-$as_echo_n "checking for gzseek in -lz... " >&6; }
-if ${ac_cv_lib_z_gzseek+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gzseek in -lz" >&5
+printf %s "checking for gzseek in -lz... " >&6; }
+if test ${ac_cv_lib_z_gzseek+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10536,32 +11228,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gzseek ();
 int
-main ()
+main (void)
 {
 return gzseek ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_z_gzseek=yes
-else
+else $as_nop
   ac_cv_lib_z_gzseek=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzseek" >&5
-$as_echo "$ac_cv_lib_z_gzseek" >&6; }
-if test "x$ac_cv_lib_z_gzseek" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzseek" >&5
+printf "%s\n" "$ac_cv_lib_z_gzseek" >&6; }
+if test "x$ac_cv_lib_z_gzseek" = xyes
+then :
   zlib_ok=yes
-else
+else $as_nop
   zlib_ok=no
 fi
 
@@ -10587,79 +11278,144 @@ fi
 #--------------------------------------------------------------------
 # For setting thread stack size
 #--------------------------------------------------------------------
-for ac_header in sys/resource.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_resource_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_RESOURCE_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_resource_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h
 
 fi
 
-done
-
-for ac_func in setrlimit
-do :
-  ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
-if test "x$ac_cv_func_setrlimit" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SETRLIMIT 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
+if test "x$ac_cv_func_setrlimit" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETRLIMIT 1" >>confdefs.h
 
 fi
-done
 
 
 #--------------------------------------------------------------------
 # One of these functions needed by NSDebug.m and NSProcessInfo.m
 #--------------------------------------------------------------------
-for ac_func in strerror
-do :
-  ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRERROR 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
+if test "x$ac_cv_func_strerror" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRERROR 1" >>confdefs.h
 
 fi
-done
 
-ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
+printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+if test ${ac_cv_c_undeclared_builtin_options+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_save_CFLAGS=$CFLAGS
+   ac_cv_c_undeclared_builtin_options='cannot detect'
+   for ac_arg in '' -fno-builtin; do
+     CFLAGS="$ac_save_CFLAGS $ac_arg"
+     # This test program should *not* compile successfully.
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+(void) strchr;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else $as_nop
+  # This test program should compile successfully.
+        # No library function is consistently available on
+        # freestanding implementations, so test against a dummy
+        # declaration.  Include always-available headers on the
+        # off chance that they somehow elicit warnings.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <float.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stddef.h>
+extern void ac_decl (int, char *);
+
+int
+main (void)
+{
+(void) ac_decl (0, (char *) 0);
+  (void) ac_decl;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  if test x"$ac_arg" = x
+then :
+  ac_cv_c_undeclared_builtin_options='none needed'
+else $as_nop
+  ac_cv_c_undeclared_builtin_options=$ac_arg
+fi
+          break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    done
+    CFLAGS=$ac_save_CFLAGS
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+  case $ac_cv_c_undeclared_builtin_options in #(
+  'cannot detect') :
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot make $CC report undeclared builtins
+See \`config.log' for more details" "$LINENO" 5; } ;; #(
+  'none needed') :
+    ac_c_undeclared_builtin_options='' ;; #(
+  *) :
+    ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
+esac
+
+ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_strerror_r" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
+printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR_R $ac_have_decl
-_ACEOF
 
-for ac_func in strerror_r
-do :
-  ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
-if test "x$ac_cv_func_strerror_r" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRERROR_R 1
-_ACEOF
+if test $ac_cv_have_decl_strerror_r = yes; then
+  # For backward compatibility's sake, define HAVE_STRERROR_R.
+  # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well
+  # as AC_CHECK_DECLS_ONCE.)
+
+printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h
 
 fi
-done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
-$as_echo_n "checking whether strerror_r returns char *... " >&6; }
-if ${ac_cv_func_strerror_r_char_p+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+printf %s "checking whether strerror_r returns char *... " >&6; }
+if test ${ac_cv_func_strerror_r_char_p+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     ac_cv_func_strerror_r_char_p=no
     if test $ac_cv_have_decl_strerror_r = yes; then
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+#include <string.h>
 int
-main ()
+main (void)
 {
 
 	  char buf[100];
@@ -10671,49 +11427,20 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_func_strerror_r_char_p=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    else
-      # strerror_r is not declared.  Choose between
-      # systems that have relatively inaccessible declarations for the
-      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
-      # former has a strerror_r that returns char*, while the latter
-      # has a strerror_r that returns `int'.
-      # This test should segfault on the DEC system.
-      if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-	extern char *strerror_r ();
-int
-main ()
-{
-char buf[100];
-	  char x = *strerror_r (0, buf, sizeof buf);
-	  return ! isalpha (x);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_strerror_r_char_p=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-$as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
+printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
 
-$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h
+printf "%s\n" "#define STRERROR_R_CHAR_P 1" >>confdefs.h
 
 fi
 
@@ -10721,61 +11448,53 @@ fi
 #--------------------------------------------------------------------
 # Needed by NSDebug.m
 #--------------------------------------------------------------------
-for ac_func in sigsetjmp
-do :
-  ac_fn_c_check_func "$LINENO" "sigsetjmp" "ac_cv_func_sigsetjmp"
-if test "x$ac_cv_func_sigsetjmp" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SIGSETJMP 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "sigsetjmp" "ac_cv_func_sigsetjmp"
+if test "x$ac_cv_func_sigsetjmp" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIGSETJMP 1" >>confdefs.h
 
 fi
-done
 
 
 #--------------------------------------------------------------------
 # This type needed by GSFormat
 #--------------------------------------------------------------------
 ac_fn_c_check_type "$LINENO" "uintmax_t" "ac_cv_type_uintmax_t" "$ac_includes_default"
-if test "x$ac_cv_type_uintmax_t" = xyes; then :
+if test "x$ac_cv_type_uintmax_t" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINTMAX_T 1
-_ACEOF
+printf "%s\n" "#define HAVE_UINTMAX_T 1" >>confdefs.h
 
 
 fi
 
-for ac_header in wchar.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
-if test "x$ac_cv_header_wchar_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WCHAR_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default"
+if test "x$ac_cv_header_wchar_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_WCHAR_H 1" >>confdefs.h
 
 fi
 
-done
-
 
 #--------------------------------------------------------------------
 # Check if short and int values need to be word aligned
 #--------------------------------------------------------------------
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -O0"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking short/int needs to be word aligned" >&5
-$as_echo_n "checking short/int needs to be word aligned... " >&6; }
-if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking short/int needs to be word aligned" >&5
+printf %s "checking short/int needs to be word aligned... " >&6; }
+if test "$cross_compiling" = yes
+then :
   NEED_WORD_ALIGNMENT="$cross_NEED_WORD_ALIGNMENT"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.align.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   NEED_WORD_ALIGNMENT=0
-else
+else $as_nop
   NEED_WORD_ALIGNMENT=1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -10784,50 +11503,47 @@ fi
 
 CFLAGS="$saved_CFLAGS"
 
-cat >>confdefs.h <<_ACEOF
-#define NEED_WORD_ALIGNMENT $NEED_WORD_ALIGNMENT
-_ACEOF
+printf "%s\n" "#define NEED_WORD_ALIGNMENT $NEED_WORD_ALIGNMENT" >>confdefs.h
 
 if test $NEED_WORD_ALIGNMENT = 1; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 #--------------------------------------------------------------------
 # This needed by NSString for handling of %@ printf directive.
 #--------------------------------------------------------------------
-for ac_func in register_printf_specifier
-do :
-  ac_fn_c_check_func "$LINENO" "register_printf_specifier" "ac_cv_func_register_printf_specifier"
-if test "x$ac_cv_func_register_printf_specifier" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_REGISTER_PRINTF_SPECIFIER 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "register_printf_specifier" "ac_cv_func_register_printf_specifier"
+if test "x$ac_cv_func_register_printf_specifier" = xyes
+then :
+  printf "%s\n" "#define HAVE_REGISTER_PRINTF_SPECIFIER 1" >>confdefs.h
 
 fi
-done
 
 ac_fn_c_check_func "$LINENO" "register_printf_function" "ac_cv_func_register_printf_function"
-if test "x$ac_cv_func_register_printf_function" = xyes; then :
+if test "x$ac_cv_func_register_printf_function" = xyes
+then :
   register_printf=1
-else
+else $as_nop
   register_printf=0
 fi
 
 if test $register_printf = 1; then
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
   working_register_printf="$cross_working_register_printf"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.printf.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   working_register_printf=1
-else
+else $as_nop
   working_register_printf=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -10836,18 +11552,20 @@ fi
 
   if test $working_register_printf = 1; then
 
-$as_echo "#define HAVE_REGISTER_PRINTF_FUNCTION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_REGISTER_PRINTF_FUNCTION 1" >>confdefs.h
 
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
   wide_register_printf="$cross_wide_register_printf"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.wprintf.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   wide_register_printf=1
-else
+else $as_nop
   wide_register_printf=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -10856,7 +11574,7 @@ fi
 
     if test $wide_register_printf = 1; then
 
-$as_echo "#define HAVE_WIDE_PRINTF_FUNCTION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_WIDE_PRINTF_FUNCTION 1" >>confdefs.h
 
     fi
   fi
@@ -10866,30 +11584,28 @@ fi
 #--------------------------------------------------------------------
 # This function needed by NSString.
 #--------------------------------------------------------------------
-for ac_func in realpath
-do :
-  ac_fn_c_check_func "$LINENO" "realpath" "ac_cv_func_realpath"
-if test "x$ac_cv_func_realpath" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_REALPATH 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "realpath" "ac_cv_func_realpath"
+if test "x$ac_cv_func_realpath" = xyes
+then :
+  printf "%s\n" "#define HAVE_REALPATH 1" >>confdefs.h
 
 fi
-done
 
 
 #--------------------------------------------------------------------
 # Check if the C Library defines extern char *program_invocation_name
 # Used in critical cases by NSProcessInfo.m
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking program_invocation_name in C Library" >&5
-$as_echo_n "checking program_invocation_name in C Library... " >&6; }
-if ${gs_cv_program_invocation_name_worked+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking program_invocation_name in C Library" >&5
+printf %s "checking program_invocation_name in C Library... " >&6; }
+if test ${gs_cv_program_invocation_name_worked+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   gs_cv_program_invocation_name_worked="$cross_gs_cv_program_invocation_name_worked"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -10902,9 +11618,10 @@ main (int argc, char *argv[])
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   gs_cv_program_invocation_name_worked=yes
-else
+else $as_nop
   gs_cv_program_invocation_name_worked=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -10915,87 +11632,70 @@ fi
 
 if test $gs_cv_program_invocation_name_worked = yes; then
 
-$as_echo "#define HAVE_PROGRAM_INVOCATION_NAME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PROGRAM_INVOCATION_NAME 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 #--------------------------------------------------------------------
 # Check for uname header used by NSProcessInfo.m
 #--------------------------------------------------------------------
-for ac_header in sys/utsname.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_utsname_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_UTSNAME_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_utsname_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h
 
 fi
 
-done
-
 
 #--------------------------------------------------------------------
 # Check for sysctlbyname used by NSProcessInfo.m
 #--------------------------------------------------------------------
-for ac_header in sys/sysctl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysctl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_SYSCTL_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sysctl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_SYSCTL_H 1" >>confdefs.h
 
 fi
 
-done
-
-for ac_func in sysctlbyname
-do :
-  ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
-if test "x$ac_cv_func_sysctlbyname" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYSCTLBYNAME 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
+if test "x$ac_cv_func_sysctlbyname" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYSCTLBYNAME 1" >>confdefs.h
 
 fi
-done
 
 
 #--------------------------------------------------------------------
 # Defines HAVE_PROCFS if the kernel supports the /proc filesystem.
 # Needed by NSProcessInfo.m
 #--------------------------------------------------------------------
-for ac_header in procfs.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "procfs.h" "ac_cv_header_procfs_h" "$ac_includes_default"
-if test "x$ac_cv_header_procfs_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PROCFS_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "procfs.h" "ac_cv_header_procfs_h" "$ac_includes_default"
+if test "x$ac_cv_header_procfs_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_PROCFS_H 1" >>confdefs.h
 
 fi
 
-done
-
  # Check whether --enable-procfs was given.
-if test "${enable_procfs+set}" = set; then :
+if test ${enable_procfs+y}
+then :
   enableval=$enable_procfs; enable_procfs="$enableval"
-else
+else $as_nop
   if test "$cross_compiling" = yes; then enable_procfs=cross; else enable_procfs=yes; fi;
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel support for /proc filesystem" >&5
-$as_echo_n "checking kernel support for /proc filesystem... " >&6; }
-if ${ac_cv_sys_procfs+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking kernel support for /proc filesystem" >&5
+printf %s "checking kernel support for /proc filesystem... " >&6; }
+if test ${ac_cv_sys_procfs+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "$enable_procfs" = yes; then
   # Suggested change for the following line was
   #  if test -d /proc/0; then
@@ -11019,44 +11719,48 @@ else
     ac_cv_sys_procfs=no
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_procfs" >&5
-$as_echo "$ac_cv_sys_procfs" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_procfs" >&5
+printf "%s\n" "$ac_cv_sys_procfs" >&6; }
 
   if test "$enable_procfs" = cross; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cross-compiling: Pass --enable-procfs argument to enable use of /proc filesystem." >&5
-$as_echo "$as_me: WARNING: Cross-compiling: Pass --enable-procfs argument to enable use of /proc filesystem." >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cross-compiling: Pass --enable-procfs argument to enable use of /proc filesystem." >&5
+printf "%s\n" "$as_me: WARNING: Cross-compiling: Pass --enable-procfs argument to enable use of /proc filesystem." >&2;}
   fi
   if test $ac_cv_sys_procfs = yes; then
 
-$as_echo "#define HAVE_PROCFS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PROCFS 1" >>confdefs.h
 
   fi
 
 
  # Check whether --enable-procfs-psinfo was given.
-if test "${enable_procfs_psinfo+set}" = set; then :
+if test ${enable_procfs_psinfo+y}
+then :
   enableval=$enable_procfs_psinfo; enable_procfs_psinfo="$enableval"
-else
+else $as_nop
   if test "$cross_compiling" = yes; then enable_procfs_psinfo=cross; else enable_procfs_psinfo=yes; fi;
 fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking support for /proc psinfo struct" >&5
-$as_echo_n "checking support for /proc psinfo struct... " >&6; }
-if ${ac_cv_sys_procfs_psinfo+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking support for /proc psinfo struct" >&5
+printf %s "checking support for /proc psinfo struct... " >&6; }
+if test ${ac_cv_sys_procfs_psinfo+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "$enable_procfs_psinfo" = yes; then
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
   ac_cv_sys_procfs_psinfo=yes
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.psinfo.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_sys_procfs_psinfo=yes
-else
+else $as_nop
   ac_cv_sys_procfs_psinfo=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -11069,27 +11773,28 @@ fi
     ac_cv_sys_procfs_psinfo=no
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_procfs_psinfo" >&5
-$as_echo "$ac_cv_sys_procfs_psinfo" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_procfs_psinfo" >&5
+printf "%s\n" "$ac_cv_sys_procfs_psinfo" >&6; }
 
   if test "$enable_procfs" = cross; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cross-compiling: Pass --enable-procfs-psinfo argument to enable use of /proc psinfo information." >&5
-$as_echo "$as_me: WARNING: Cross-compiling: Pass --enable-procfs-psinfo argument to enable use of /proc psinfo information." >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cross-compiling: Pass --enable-procfs-psinfo argument to enable use of /proc psinfo information." >&5
+printf "%s\n" "$as_me: WARNING: Cross-compiling: Pass --enable-procfs-psinfo argument to enable use of /proc psinfo information." >&2;}
   fi
   if test $ac_cv_sys_procfs_psinfo = yes; then
 
-$as_echo "#define HAVE_PROCFS_PSINFO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PROCFS_PSINFO 1" >>confdefs.h
 
   fi
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking link to exe of process in /proc" >&5
-$as_echo_n "checking link to exe of process in /proc... " >&6; }
-if ${ac_cv_sys_procfs_exe_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking link to exe of process in /proc" >&5
+printf %s "checking link to exe of process in /proc... " >&6; }
+if test ${ac_cv_sys_procfs_exe_link+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "$ac_cv_sys_procfs" = yes; then
       # Linux 2.2.x and up
       if test -L /proc/self/exe; then
@@ -11104,14 +11809,12 @@ else
       ac_cv_sys_procfs_exe_link=no
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_procfs_exe_link" >&5
-$as_echo "$ac_cv_sys_procfs_exe_link" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_procfs_exe_link" >&5
+printf "%s\n" "$ac_cv_sys_procfs_exe_link" >&6; }
 
   if test "$ac_cv_sys_procfs_exe_link" != no; then
 
-cat >>confdefs.h <<_ACEOF
-#define PROCFS_EXE_LINK "$ac_cv_sys_procfs_exe_link"
-_ACEOF
+printf "%s\n" "#define PROCFS_EXE_LINK \"$ac_cv_sys_procfs_exe_link\"" >>confdefs.h
 
   fi
 
@@ -11119,18 +11822,20 @@ _ACEOF
 #--------------------------------------------------------------------
 # Check if /proc/$$/cmdline terminates the last argument with a nul
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking /proc/$$/cmdline terminated by nul" >&5
-$as_echo_n "checking /proc/$$/cmdline terminated by nul... " >&6; }
-if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking /proc/$$/cmdline terminated by nul" >&5
+printf %s "checking /proc/$$/cmdline terminated by nul... " >&6; }
+if test "$cross_compiling" = yes
+then :
   CMDLINE_TERMINATED="$cross_CMDLINE_TERMINATED"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.proccmd.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   CMDLINE_TERMINATED=1
-else
+else $as_nop
   CMDLINE_TERMINATED=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -11138,16 +11843,14 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define CMDLINE_TERMINATED $CMDLINE_TERMINATED
-_ACEOF
+printf "%s\n" "#define CMDLINE_TERMINATED $CMDLINE_TERMINATED" >>confdefs.h
 
 if test $CMDLINE_TERMINATED = 1; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 #--------------------------------------------------------------------
@@ -11155,11 +11858,12 @@ fi
 #--------------------------------------------------------------------
 have_kvm_env=0
 save_LIBS="$LIBS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_getenvv in -lkvm" >&5
-$as_echo_n "checking for kvm_getenvv in -lkvm... " >&6; }
-if ${ac_cv_lib_kvm_kvm_getenvv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kvm_getenvv in -lkvm" >&5
+printf %s "checking for kvm_getenvv in -lkvm... " >&6; }
+if test ${ac_cv_lib_kvm_kvm_getenvv+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkvm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11168,51 +11872,50 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char kvm_getenvv ();
 int
-main ()
+main (void)
 {
 return kvm_getenvv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_kvm_kvm_getenvv=yes
-else
+else $as_nop
   ac_cv_lib_kvm_kvm_getenvv=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_getenvv" >&5
-$as_echo "$ac_cv_lib_kvm_kvm_getenvv" >&6; }
-if test "x$ac_cv_lib_kvm_kvm_getenvv" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBKVM 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_getenvv" >&5
+printf "%s\n" "$ac_cv_lib_kvm_kvm_getenvv" >&6; }
+if test "x$ac_cv_lib_kvm_kvm_getenvv" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBKVM 1" >>confdefs.h
 
   LIBS="-lkvm $LIBS"
 
 fi
 
 if test "$ac_cv_lib_kvm_kvm_getenvv" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can access kernel memory" >&5
-$as_echo_n "checking if we can access kernel memory... " >&6; }
-  if test "$cross_compiling" = yes; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can access kernel memory" >&5
+printf %s "checking if we can access kernel memory... " >&6; }
+  if test "$cross_compiling" = yes
+then :
   have_kvm_env="$cross_have_kvm_env"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include "$srcdir/config/config.kvmopen.c"
+[#include "$srcdir/config/config.kvmopen.c"])
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   have_kvm_env=1
-else
+else $as_nop
   have_kvm_env=0
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -11220,14 +11923,14 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
   if test $have_kvm_env = 1; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_KVM_ENV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_KVM_ENV 1" >>confdefs.h
 
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     # Reset LIBS since we don't need kvm
     LIBS="$save_LIBS"
   fi
@@ -11243,12 +11946,13 @@ case "$target_os" in
   cygwin*)	PASS_ARG=yes;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking use of pass-through arguments" >&5
-$as_echo_n "checking use of pass-through arguments... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking use of pass-through arguments" >&5
+printf %s "checking use of pass-through arguments... " >&6; }
 # Check whether --enable-pass-arguments was given.
-if test "${enable_pass_arguments+set}" = set; then :
+if test ${enable_pass_arguments+y}
+then :
   enableval=$enable_pass_arguments;
-else
+else $as_nop
   enable_pass_arguments=$PASS_ARG
 fi
 
@@ -11259,15 +11963,16 @@ else
   GS_PASS_ARGUMENTS=0
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pass_arguments" >&5
-$as_echo "$enable_pass_arguments" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_pass_arguments" >&5
+printf "%s\n" "$enable_pass_arguments" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking use of fake-main definition" >&5
-$as_echo_n "checking use of fake-main definition... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking use of fake-main definition" >&5
+printf %s "checking use of fake-main definition... " >&6; }
 # Check whether --enable-fake-main was given.
-if test "${enable_fake_main+set}" = set; then :
+if test ${enable_fake_main+y}
+then :
   enableval=$enable_fake_main;
-else
+else $as_nop
   enable_fake_main=no
 fi
 
@@ -11290,8 +11995,8 @@ elif test "$enable_pass_arguments" = "no"; then
   if test "$gs_cv_objc_load_method_worked" = yes -a \( "$ac_cv_sys_procfs" = yes -o "$have_kvm_env" = 1 -o "$ac_cv_sys_procfs_psinfo" = yes \); then
     GS_FAKE_MAIN=0
     if test "$have_kvm_env" = "1"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using libkvm which is known to be buggy on some systems consider configuring with --enable-fake-main instead." >&5
-$as_echo "$as_me: WARNING: Using libkvm which is known to be buggy on some systems consider configuring with --enable-fake-main instead." >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using libkvm which is known to be buggy on some systems consider configuring with --enable-fake-main instead." >&5
+printf "%s\n" "$as_me: WARNING: Using libkvm which is known to be buggy on some systems consider configuring with --enable-fake-main instead." >&2;}
     fi
   else
     case "$target_os" in
@@ -11306,17 +12011,18 @@ case "$target_os" in
     mingw*|windows)	enable_fake_main=no; GS_FAKE_MAIN=0;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_fake_main" >&5
-$as_echo "$enable_fake_main" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_fake_main" >&5
+printf "%s\n" "$enable_fake_main" >&6; }
 
 #--------------------------------------------------------------------
 # Simple way to add a bunch of paths to the flags
 #--------------------------------------------------------------------
 
 # Check whether --with-include-flags was given.
-if test "${with_include_flags+set}" = set; then :
+if test ${with_include_flags+y}
+then :
   withval=$with_include_flags; include_flags="$withval"
-else
+else $as_nop
   include_flags="no"
 fi
 
@@ -11327,9 +12033,10 @@ fi
 
 
 # Check whether --with-library-flags was given.
-if test "${with_library_flags+set}" = set; then :
+if test ${with_library_flags+y}
+then :
   withval=$with_library_flags; library_flags="$withval"
-else
+else $as_nop
   library_flags="no"
 fi
 
@@ -11366,30 +12073,33 @@ if test "$exceptions" = "yes"; then
 fi
 
 # Check whether --enable-libffi was given.
-if test "${enable_libffi+set}" = set; then :
+if test ${enable_libffi+y}
+then :
   enableval=$enable_libffi;
-else
+else $as_nop
   enable_libffi=$do_enable_libffi
 fi
 
 
 # Check whether --enable-ffcall was given.
-if test "${enable_ffcall+set}" = set; then :
+if test ${enable_ffcall+y}
+then :
   enableval=$enable_ffcall;
-else
+else $as_nop
   enable_ffcall=$do_enable_libffcall
 fi
 
 
 if test $enable_ffcall = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ffcall has been enabled ... this is deprecated ... please install and use a recent libffi if possible" >&5
-$as_echo "$as_me: WARNING: ffcall has been enabled ... this is deprecated ... please install and use a recent libffi if possible" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ffcall has been enabled ... this is deprecated ... please install and use a recent libffi if possible" >&5
+printf "%s\n" "$as_me: WARNING: ffcall has been enabled ... this is deprecated ... please install and use a recent libffi if possible" >&2;}
 fi
 
 # Check whether --enable-invocations was given.
-if test "${enable_invocations+set}" = set; then :
+if test ${enable_invocations+y}
+then :
   enableval=$enable_invocations;
-else
+else $as_nop
   enable_invocations=yes
 fi
 
@@ -11401,9 +12111,10 @@ fi
 
 
 # Check whether --with-ffi-include was given.
-if test "${with_ffi_include+set}" = set; then :
+if test ${with_ffi_include+y}
+then :
   withval=$with_ffi_include; ffi_incdir="$withval"
-else
+else $as_nop
   ffi_incdir="no"
 fi
 
@@ -11414,9 +12125,10 @@ fi
 
 
 # Check whether --with-ffi-library was given.
-if test "${with_ffi_library+set}" = set; then :
+if test ${with_ffi_library+y}
+then :
   withval=$with_ffi_library; ffi_libdir="$withval"
-else
+else $as_nop
   ffi_libdir="no"
 fi
 
@@ -11442,32 +12154,30 @@ if test "$do_broken_libffi" = "no"; then
       INCLUDE_FLAGS="$INCLUDE_FLAGS $ffi_CFLAGS"
     fi
   fi
-  ac_fn_c_check_header_mongrel "$LINENO" "ffi.h" "ac_cv_header_ffi_h" "$ac_includes_default"
-if test "x$ac_cv_header_ffi_h" = xyes; then :
+  ac_fn_c_check_header_compile "$LINENO" "ffi.h" "ac_cv_header_ffi_h" "$ac_includes_default"
+if test "x$ac_cv_header_ffi_h" = xyes
+then :
   have_libffi=yes
-else
+else $as_nop
   have_libffi=no
 fi
 
-
 else
   have_libffi=no
 fi
 if test "$do_broken_libffcall" = "no"; then
-  for ac_header in callback.h
+         for ac_header in callback.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "callback.h" "ac_cv_header_callback_h" "$ac_includes_default"
-if test "x$ac_cv_header_callback_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CALLBACK_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "callback.h" "ac_cv_header_callback_h" "$ac_includes_default"
+if test "x$ac_cv_header_callback_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_CALLBACK_H 1" >>confdefs.h
  have_ffcall=yes
-else
+else $as_nop
   have_ffcall=no
 fi
 
 done
-
 else
   have_ffcall=no
 fi
@@ -11483,8 +12193,8 @@ if test $have_libffi = no; then
   # If we don't have libffi but do have ffcall, use ffcall
   if test $have_ffcall = yes; then
     if test $enable_ffcall = no; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ffi support seems to be missing on this system ... please install a recent libffi" >&5
-$as_echo "$as_me: WARNING: ffi support seems to be missing on this system ... please install a recent libffi" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ffi support seems to be missing on this system ... please install a recent libffi" >&5
+printf "%s\n" "$as_me: WARNING: ffi support seems to be missing on this system ... please install a recent libffi" >&2;}
     fi
   fi
 fi
@@ -11492,48 +12202,50 @@ fi
 have_forward_hook=yes
 saved_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $OBJCFLAGS -x objective-c"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for forwarding callback in runtime" >&5
-$as_echo_n "checking for forwarding callback in runtime... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for forwarding callback in runtime" >&5
+printf %s "checking for forwarding callback in runtime... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.forward2.m"
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   have_forward_hook=yes
-else
+else $as_nop
   have_forward_hook=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 if test $have_forward_hook = yes; then
 
-$as_echo "#define HAVE_FORWARD2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FORWARD2 1" >>confdefs.h
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.forward.m"
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   have_forward_hook=yes
-else
+else $as_nop
   have_forward_hook=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_forward_hook" >&5
-$as_echo "$have_forward_hook" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_forward_hook" >&5
+printf "%s\n" "$have_forward_hook" >&6; }
 if test $have_forward_hook = no; then
   enable_libffi=no
   enable_ffcall=no
 fi
 CPPFLAGS="$saved_CPPFLAGS"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking FFI library usage" >&5
-$as_echo_n "checking FFI library usage... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking FFI library usage" >&5
+printf %s "checking FFI library usage... " >&6; }
 WITH_FFI=none
 if test $enable_libffi = yes; then
 
-$as_echo "#define USE_LIBFFI 1" >>confdefs.h
+printf "%s\n" "#define USE_LIBFFI 1" >>confdefs.h
 
   WITH_FFI=libffi
   if test "$pkg_config_libffi" = "yes"; then
@@ -11542,16 +12254,18 @@ $as_echo "#define USE_LIBFFI 1" >>confdefs.h
     ffi_LIBS=-lffi
   fi
   LIBS="$ffi_LIBS $LIBS"
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
   ffi_ok="$cross_ffi_ok"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.ffi.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ffi_ok="yes"
-else
+else $as_nop
   ffi_ok="no"
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -11559,29 +12273,25 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
   if test $ffi_ok = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: libffi" >&5
-$as_echo "libffi" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libffi" >&5
+printf "%s\n" "libffi" >&6; }
     if test $do_broken_libffi = yes; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ffi may be broken on this system ... try enabling ffcall" >&5
-$as_echo "$as_me: WARNING: ffi may be broken on this system ... try enabling ffcall" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ffi may be broken on this system ... try enabling ffcall" >&5
+printf "%s\n" "$as_me: WARNING: ffi may be broken on this system ... try enabling ffcall" >&2;}
     fi
-    for ac_func in ffi_prep_closure_loc
-do :
-  ac_fn_c_check_func "$LINENO" "ffi_prep_closure_loc" "ac_cv_func_ffi_prep_closure_loc"
-if test "x$ac_cv_func_ffi_prep_closure_loc" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FFI_PREP_CLOSURE_LOC 1
-_ACEOF
+    ac_fn_c_check_func "$LINENO" "ffi_prep_closure_loc" "ac_cv_func_ffi_prep_closure_loc"
+if test "x$ac_cv_func_ffi_prep_closure_loc" = xyes
+then :
+  printf "%s\n" "#define HAVE_FFI_PREP_CLOSURE_LOC 1" >>confdefs.h
 
 fi
-done
 
   else
     as_fn_error $? "The ffi library (libffi) does not appear to be working.  Perhaps it's missing or you need a more recent version.  Version 3.0.9 or later should work, and you can find a link to it n the list of packages for download at http://www.gnustep.org/resources/sources.html" "$LINENO" 5
   fi
 elif test $enable_ffcall = yes; then
 
-$as_echo "#define USE_FFCALL 1" >>confdefs.h
+printf "%s\n" "#define USE_FFCALL 1" >>confdefs.h
 
   WITH_FFI=ffcall
   LIBS="-lcallback -lavcall $LIBS"
@@ -11589,56 +12299,59 @@ $as_echo "#define USE_FFCALL 1" >>confdefs.h
 /* end confdefs.h.  */
 #include <callback.h>
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ffi_ok="yes"
-else
+else $as_nop
   ffi_ok="no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   if test $ffi_ok = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ffcall" >&5
-$as_echo "ffcall" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ffcall" >&5
+printf "%s\n" "ffcall" >&6; }
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ffcall is broken on some systems and is deprecated ... try enabling ffi" >&5
-$as_echo "$as_me: WARNING: ffcall is broken on some systems and is deprecated ... try enabling ffi" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ffcall is broken on some systems and is deprecated ... try enabling ffi" >&5
+printf "%s\n" "$as_me: WARNING: ffcall is broken on some systems and is deprecated ... try enabling ffi" >&2;}
 else
   ffi_ok=no
 fi
 
 if test $enable_ffcall = yes -a $ffi_ok = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ffcall trampolines work" >&5
-$as_echo_n "checking if ffcall trampolines work... " >&6; }
-  if test "$cross_compiling" = yes; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ffcall trampolines work" >&5
+printf %s "checking if ffcall trampolines work... " >&6; }
+  if test "$cross_compiling" = yes
+then :
   have_working_trampoline=yes
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "$srcdir/config/config.trampoline.c"
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   have_working_trampoline=yes
-else
+else $as_nop
   have_working_trampoline=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_working_trampoline" >&5
-$as_echo "$have_working_trampoline" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_working_trampoline" >&5
+printf "%s\n" "$have_working_trampoline" >&6; }
 fi
 
 if test $ffi_ok = no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
+printf "%s\n" "none" >&6; }
   echo
   if test $have_forward_hook = no; then
     echo "You do not have an up-to-date libobjc library installed"
@@ -11667,8 +12380,8 @@ $as_echo "none" >&6; }
     echo "http://gnustep.made-it.com/BuildGuide/index.html"
     as_fn_error $? "Incomplete support for ffi functionality." "$LINENO" 5
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Incomplete support for ffi funtionality." >&5
-$as_echo "$as_me: WARNING: Incomplete support for ffi funtionality." >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Incomplete support for ffi funtionality." >&5
+printf "%s\n" "$as_me: WARNING: Incomplete support for ffi funtionality." >&2;}
 fi
 
 
@@ -11693,27 +12406,29 @@ fi
 # First, check if there's a working iconv in libc (ie. if the test program
 # runs without any extra flags).
 # Check whether --enable-iconv was given.
-if test "${enable_iconv+set}" = set; then :
+if test ${enable_iconv+y}
+then :
   enableval=$enable_iconv;
-else
+else $as_nop
   enable_iconv=yes
 fi
 
 
 if test $enable_iconv = yes; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking iconv support" >&5
-$as_echo_n "checking iconv support... " >&6; }
-if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking iconv support" >&5
+printf %s "checking iconv support... " >&6; }
+if test "$cross_compiling" = yes
+then :
   found_iconv="$cross_found_iconv_libc";
   if test "$found_iconv" = "yes"; then
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in libc (via cross.config)" >&5
-$as_echo "yes, in libc (via cross.config)" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, in libc (via cross.config)" >&5
+printf "%s\n" "yes, in libc (via cross.config)" >&6; }
   fi
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
@@ -11721,16 +12436,17 @@ int main(int argc,char **argv)
 { return iconv_open("UTF-8//TRANSLIT","ASCII") == -1 ? 1 : 0; }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   # libc has a working iconv.
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in libc" >&5
-$as_echo "yes, in libc" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, in libc" >&5
+printf "%s\n" "yes, in libc" >&6; }
   found_iconv=yes
 
-else
+else $as_nop
   found_iconv=no
 
 fi
@@ -11744,9 +12460,10 @@ if test $found_iconv = no ; then
   # Try adding -liconv and any user supplied directory.
 
 # Check whether --with-libiconv-library was given.
-if test "${with_libiconv_library+set}" = set; then :
+if test ${with_libiconv_library+y}
+then :
   withval=$with_libiconv_library; libiconv_libdir="$withval"
-else
+else $as_nop
   libiconv_libdir="no"
 fi
 
@@ -11766,9 +12483,10 @@ esac
 
 
 # Check whether --with-libiconv-include was given.
-if test "${with_libiconv_include+set}" = set; then :
+if test ${with_libiconv_include+y}
+then :
   withval=$with_libiconv_include; libiconv_incdir="$withval"
-else
+else $as_nop
   libiconv_incdir="no"
 fi
 
@@ -11779,19 +12497,20 @@ fi
 
   old_LIBS="$LIBS"
   LIBS="-liconv $LIBS"
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
   found_iconv="$cross_found_iconv_liconv";
     if test "$found_iconv" = "yes"; then
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, -liconv (via cross.config)" >&5
-$as_echo "yes, -liconv (via cross.config)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, -liconv (via cross.config)" >&5
+printf "%s\n" "yes, -liconv (via cross.config)" >&6; }
     else
       LIBS="$old_LIBS"
     fi
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
@@ -11799,16 +12518,17 @@ else
   { return iconv_open("UTF-8//TRANSLIT","ASCII") == -1 ? 1 : 0; }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   # -liconv works.
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, -liconv" >&5
-$as_echo "yes, -liconv" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, -liconv" >&5
+printf "%s\n" "yes, -liconv" >&6; }
     found_iconv=yes
 
-else
+else $as_nop
   found_iconv=no
     LIBS="$old_LIBS"
 
@@ -11824,22 +12544,23 @@ if test $found_iconv = no ; then
   # BSDs install this lib as libgiconv.
   old_LIBS="$LIBS"
   LIBS="-lgiconv $LIBS"
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes
+then :
   found_iconv="$cross_found_iconv_lgiconv";
     if test "$found_iconv" = "yes"; then
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GICONV 1" >>confdefs.h
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, -lgiconv (via cross.config)" >&5
-$as_echo "yes, -lgiconv (via cross.config)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, -lgiconv (via cross.config)" >&5
+printf "%s\n" "yes, -lgiconv (via cross.config)" >&6; }
     else
       LIBS="$old_LIBS"
     fi
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <giconv.h>
@@ -11847,18 +12568,19 @@ else
   { return iconv_open("UTF-8//TRANSLIT","ASCII") == -1 ? 1 : 0; }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GICONV 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, -lgiconv" >&5
-$as_echo "yes, -lgiconv" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, -lgiconv" >&5
+printf "%s\n" "yes, -lgiconv" >&6; }
     found_iconv=yes
 
-else
+else $as_nop
   found_iconv=no
     LIBS="$old_LIBS"
 
@@ -11870,21 +12592,23 @@ fi
 fi
 
 # Check whether --enable-stricticonv was given.
-if test "${enable_stricticonv+set}" = set; then :
+if test ${enable_stricticonv+y}
+then :
   enableval=$enable_stricticonv;
-else
+else $as_nop
   enable_stricticonv=no
 fi
 
 if test $enable_stricticonv = yes; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking non-lossy iconv support" >&5
-$as_echo_n "checking non-lossy iconv support... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking non-lossy iconv support" >&5
+printf %s "checking non-lossy iconv support... " >&6; }
+if test "$cross_compiling" = yes
+then :
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
 See \`config.log' for more details" "$LINENO" 5; }
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
@@ -11892,16 +12616,17 @@ int main(int argc,char **argv)
 { return iconv_open("UTF-8","ASCII") == -1 ? 1 : 0; }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   # libc has a working iconv.
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in libc" >&5
-$as_echo "yes, in libc" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, in libc" >&5
+printf "%s\n" "yes, in libc" >&6; }
   found_iconv=yes
 
-else
+else $as_nop
   found_iconv=no
 
 fi
@@ -11915,9 +12640,10 @@ if test $found_iconv = no ; then
   # supplied directory.
 
 # Check whether --with-libiconv-library was given.
-if test "${with_libiconv_library+set}" = set; then :
+if test ${with_libiconv_library+y}
+then :
   withval=$with_libiconv_library; libiconv_libdir="$withval"
-else
+else $as_nop
   libiconv_libdir="no"
 fi
 
@@ -11937,12 +12663,13 @@ esac
 
   old_LIBS="$LIBS"
   LIBS="-liconv $LIBS"
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  if test "$cross_compiling" = yes
+then :
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
 See \`config.log' for more details" "$LINENO" 5; }
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
@@ -11950,16 +12677,17 @@ else
   { return iconv_open("UTF-8","ASCII") == -1 ? 1 : 0; }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   # -liconv works.
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, -liconv" >&5
-$as_echo "yes, -liconv" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, -liconv" >&5
+printf "%s\n" "yes, -liconv" >&6; }
     found_iconv=yes
 
-else
+else $as_nop
   found_iconv=no
     LIBS="$old_LIBS"
 
@@ -11975,12 +12703,13 @@ if test $found_iconv = no ; then
   # BSDs install this lib as libgiconv.
   old_LIBS="$LIBS"
   LIBS="-lgiconv $LIBS"
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  if test "$cross_compiling" = yes
+then :
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
 See \`config.log' for more details" "$LINENO" 5; }
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <giconv.h>
@@ -11988,18 +12717,19 @@ else
   { return iconv_open("UTF-8","ASCII") == -1 ? 1 : 0; }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_GICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GICONV 1" >>confdefs.h
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, -lgiconv" >&5
-$as_echo "yes, -lgiconv" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, -lgiconv" >&5
+printf "%s\n" "yes, -lgiconv" >&6; }
     found_iconv=yes
 
-else
+else $as_nop
   found_iconv=no
     LIBS="$old_LIBS"
 
@@ -12012,8 +12742,8 @@ fi
 fi
 
 if test $found_iconv = no ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   echo
   echo "You do not appear to have usable iconv header/library."
   echo "Building without them will disable much characterset support."
@@ -12028,9 +12758,10 @@ fi
 # See DEPENDENCIES POLICY at the start of this file.
 #--------------------------------------------------------------------
 # Check whether --enable-xml was given.
-if test "${enable_xml+set}" = set; then :
+if test ${enable_xml+y}
+then :
   enableval=$enable_xml;
-else
+else $as_nop
   enable_xml=yes
 fi
 
@@ -12040,17 +12771,17 @@ HAVE_LIBXML=0
 if test $enable_xml = yes; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML" >&5
-$as_echo_n "checking for XML... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XML" >&5
+printf %s "checking for XML... " >&6; }
 
 if test -n "$XML_CFLAGS"; then
     pkg_cv_XML_CFLAGS="$XML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.3.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.3.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.3.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.3.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -12064,10 +12795,10 @@ if test -n "$XML_LIBS"; then
     pkg_cv_XML_LIBS="$XML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.3.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.3.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.3.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.3.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -12081,8 +12812,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -12101,16 +12832,18 @@ fi
 
 
 # Check whether --with-xml-prefix was given.
-if test "${with_xml_prefix+set}" = set; then :
+if test ${with_xml_prefix+y}
+then :
   withval=$with_xml_prefix; xml_config_prefix="$withval"
-else
+else $as_nop
   xml_config_prefix=""
 fi
 
 # Check whether --enable-xmltest was given.
-if test "${enable_xmltest+set}" = set; then :
+if test ${enable_xmltest+y}
+then :
   enableval=$enable_xmltest;
-else
+else $as_nop
   enable_xmltest=yes
 fi
 
@@ -12127,11 +12860,12 @@ fi
 
   # Extract the first word of "xml2-config", so it can be a program name with args.
 set dummy xml2-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XML2_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XML2_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $XML2_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_XML2_CONFIG="$XML2_CONFIG" # Let the user override the test with a path.
@@ -12141,11 +12875,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XML2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_XML2_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12158,22 +12896,23 @@ esac
 fi
 XML2_CONFIG=$ac_cv_path_XML2_CONFIG
 if test -n "$XML2_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML2_CONFIG" >&5
-$as_echo "$XML2_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XML2_CONFIG" >&5
+printf "%s\n" "$XML2_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
   if test "$XML2_CONFIG" = "no" ; then
     # Extract the first word of "xml-config", so it can be a program name with args.
 set dummy xml-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XML_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XML_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $XML_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_XML_CONFIG="$XML_CONFIG" # Let the user override the test with a path.
@@ -12183,11 +12922,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XML_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_XML_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12200,11 +12943,11 @@ esac
 fi
 XML_CONFIG=$ac_cv_path_XML_CONFIG
 if test -n "$XML_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML_CONFIG" >&5
-$as_echo "$XML_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XML_CONFIG" >&5
+printf "%s\n" "$XML_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -12212,8 +12955,8 @@ fi
     XML_CONFIG=$XML2_CONFIG
   fi
   min_xml_version=2.3.0
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml - version >= $min_xml_version" >&5
-$as_echo_n "checking for libxml - version >= $min_xml_version... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml - version >= $min_xml_version" >&5
+printf %s "checking for libxml - version >= $min_xml_version... " >&6; }
   no_xml=""
   if test "$XML_CONFIG" = "no" ; then
     XML_CFLAGS=""
@@ -12224,9 +12967,10 @@ $as_echo_n "checking for libxml - version >= $min_xml_version... " >&6; }
     CFLAGS="$CFLAGS $XML_CFLAGS"
     LIBS="$XML_LIBS $LIBS"
     rm -f conf.xmltest
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12283,9 +13027,10 @@ main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-else
+else $as_nop
   no_xml=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12311,9 +13056,10 @@ fi
       CFLAGS="$CFLAGS $XML_CFLAGS"
       LIBS="$XML_LIBS $LIBS"
       rm -f conf.xmltest
-      if test "$cross_compiling" = yes; then :
+      if test "$cross_compiling" = yes
+then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12389,9 +13135,10 @@ main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-else
+else $as_nop
   no_xml=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12405,12 +13152,12 @@ fi
   fi
 
   if test "x$no_xml" = x ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     enable_libxml=yes
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     if test "$XML_CONFIG" = "no" ; then
       echo "*** The xml-config script installed by libxml could not be found"
       echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
@@ -12436,22 +13183,24 @@ $as_echo "no" >&6; }
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 
 
 # Check whether --with-xml-prefix was given.
-if test "${with_xml_prefix+set}" = set; then :
+if test ${with_xml_prefix+y}
+then :
   withval=$with_xml_prefix; xml_config_prefix="$withval"
-else
+else $as_nop
   xml_config_prefix=""
 fi
 
 # Check whether --enable-xmltest was given.
-if test "${enable_xmltest+set}" = set; then :
+if test ${enable_xmltest+y}
+then :
   enableval=$enable_xmltest;
-else
+else $as_nop
   enable_xmltest=yes
 fi
 
@@ -12468,11 +13217,12 @@ fi
 
   # Extract the first word of "xml2-config", so it can be a program name with args.
 set dummy xml2-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XML2_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XML2_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $XML2_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_XML2_CONFIG="$XML2_CONFIG" # Let the user override the test with a path.
@@ -12482,11 +13232,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XML2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_XML2_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12499,22 +13253,23 @@ esac
 fi
 XML2_CONFIG=$ac_cv_path_XML2_CONFIG
 if test -n "$XML2_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML2_CONFIG" >&5
-$as_echo "$XML2_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XML2_CONFIG" >&5
+printf "%s\n" "$XML2_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
   if test "$XML2_CONFIG" = "no" ; then
     # Extract the first word of "xml-config", so it can be a program name with args.
 set dummy xml-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XML_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XML_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $XML_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_XML_CONFIG="$XML_CONFIG" # Let the user override the test with a path.
@@ -12524,11 +13279,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XML_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_XML_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12541,11 +13300,11 @@ esac
 fi
 XML_CONFIG=$ac_cv_path_XML_CONFIG
 if test -n "$XML_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML_CONFIG" >&5
-$as_echo "$XML_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XML_CONFIG" >&5
+printf "%s\n" "$XML_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -12553,8 +13312,8 @@ fi
     XML_CONFIG=$XML2_CONFIG
   fi
   min_xml_version=2.3.0
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml - version >= $min_xml_version" >&5
-$as_echo_n "checking for libxml - version >= $min_xml_version... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml - version >= $min_xml_version" >&5
+printf %s "checking for libxml - version >= $min_xml_version... " >&6; }
   no_xml=""
   if test "$XML_CONFIG" = "no" ; then
     XML_CFLAGS=""
@@ -12565,9 +13324,10 @@ $as_echo_n "checking for libxml - version >= $min_xml_version... " >&6; }
     CFLAGS="$CFLAGS $XML_CFLAGS"
     LIBS="$XML_LIBS $LIBS"
     rm -f conf.xmltest
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12624,9 +13384,10 @@ main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-else
+else $as_nop
   no_xml=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12652,9 +13413,10 @@ fi
       CFLAGS="$CFLAGS $XML_CFLAGS"
       LIBS="$XML_LIBS $LIBS"
       rm -f conf.xmltest
-      if test "$cross_compiling" = yes; then :
+      if test "$cross_compiling" = yes
+then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -12730,9 +13492,10 @@ main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-else
+else $as_nop
   no_xml=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -12746,12 +13509,12 @@ fi
   fi
 
   if test "x$no_xml" = x ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     enable_libxml=yes
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     if test "$XML_CONFIG" = "no" ; then
       echo "*** The xml-config script installed by libxml could not be found"
       echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in"
@@ -12779,8 +13542,8 @@ $as_echo "no" >&6; }
 else
 	XML_CFLAGS=$pkg_cv_XML_CFLAGS
 	XML_LIBS=$pkg_cv_XML_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	enable_libxml=yes
 fi
 
@@ -12790,28 +13553,24 @@ fi
     LIBS="$XML_LIBS $LIBS"
     HAVE_LIBXML=1
 
-$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
 
-    for ac_header in libxml/SAX2.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "libxml/SAX2.h" "ac_cv_header_libxml_SAX2_h" "$ac_includes_default"
-if test "x$ac_cv_header_libxml_SAX2_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXML_SAX2_H 1
-_ACEOF
+    ac_fn_c_check_header_compile "$LINENO" "libxml/SAX2.h" "ac_cv_header_libxml_SAX2_h" "$ac_includes_default"
+if test "x$ac_cv_header_libxml_SAX2_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBXML_SAX2_H 1" >>confdefs.h
 
 fi
 
-done
-
 
     #--------------------------------------------------------------------
     # Check for (optional) libxslt
     #--------------------------------------------------------------------
     # Check whether --enable-xslt was given.
-if test "${enable_xslt+set}" = set; then :
+if test ${enable_xslt+y}
+then :
   enableval=$enable_xslt;
-else
+else $as_nop
   enable_xslt=yes
 fi
 
@@ -12819,17 +13578,17 @@ fi
     if test $enable_xslt = yes; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSLT" >&5
-$as_echo_n "checking for XSLT... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XSLT" >&5
+printf %s "checking for XSLT... " >&6; }
 
 if test -n "$XSLT_CFLAGS"; then
     pkg_cv_XSLT_CFLAGS="$XSLT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxslt >= 1.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt >= 1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -12843,10 +13602,10 @@ if test -n "$XSLT_LIBS"; then
     pkg_cv_XSLT_LIBS="$XSLT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxslt >= 1.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XSLT_LIBS=`$PKG_CONFIG --libs "libxslt >= 1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -12860,8 +13619,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -12878,31 +13637,29 @@ fi
 
 	xslt_ok=no
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	xslt_ok=no
 else
 	XSLT_CFLAGS=$pkg_cv_XSLT_CFLAGS
 	XSLT_LIBS=$pkg_cv_XSLT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	xslt_ok=yes
 fi
       if test "$xslt_ok" = "yes"; then
-        for ac_header in libxslt/xslt.h
+               for ac_header in libxslt/xslt.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "libxslt/xslt.h" "ac_cv_header_libxslt_xslt_h" "$ac_includes_default"
-if test "x$ac_cv_header_libxslt_xslt_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXSLT_XSLT_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "libxslt/xslt.h" "ac_cv_header_libxslt_xslt_h" "$ac_includes_default"
+if test "x$ac_cv_header_libxslt_xslt_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBXSLT_XSLT_H 1" >>confdefs.h
  xslt_ok=yes
-else
+else $as_nop
   xslt_ok=no
 fi
 
 done
-
       fi
       if test "$xslt_ok" = "yes"; then
         CPPFLAGS="$CPPFLAGS $XSLT_CFLAGS"
@@ -12910,7 +13667,7 @@ done
         LIBS="$XSLT_LIBS $LIBS"
         HAVE_LIBXSLT=1
 
-$as_echo "#define HAVE_LIBXSLT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXSLT 1" >>confdefs.h
 
       else
         echo
@@ -12918,13 +13675,13 @@ $as_echo "#define HAVE_LIBXSLT 1" >>confdefs.h
         echo "Building without them will disable the XSLT extensions."
         echo "If you really want to build gnustep-base without XSLT support,"
         echo "add --disable-xslt to the configure arguments to avoid warning."
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Missing support for XSLT functionality." >&5
-$as_echo "$as_me: WARNING: Missing support for XSLT functionality." >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Missing support for XSLT functionality." >&5
+printf "%s\n" "$as_me: WARNING: Missing support for XSLT functionality." >&2;}
       fi
     else
       HAVE_LIBXSLT=0
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabled support for XSLT funtionality." >&5
-$as_echo "$as_me: WARNING: Disabled support for XSLT funtionality." >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabled support for XSLT funtionality." >&5
+printf "%s\n" "$as_me: WARNING: Disabled support for XSLT funtionality." >&2;}
     fi
 
   else
@@ -12937,8 +13694,8 @@ $as_echo "$as_me: WARNING: Disabled support for XSLT funtionality." >&2;}
     as_fn_error $? "Missing support for XML DOM functionality." "$LINENO" 5
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XML functionality disabled." >&5
-$as_echo "$as_me: WARNING: XML functionality disabled." >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: XML functionality disabled." >&5
+printf "%s\n" "$as_me: WARNING: XML functionality disabled." >&2;}
 fi
 
 
@@ -12947,9 +13704,10 @@ fi
 # See DEPENDENCIES POLICY at the start of this file.
 #--------------------------------------------------------------------
 # Check whether --enable-tls was given.
-if test "${enable_tls+set}" = set; then :
+if test ${enable_tls+y}
+then :
   enableval=$enable_tls;
-else
+else $as_nop
   enable_tls=yes
 fi
 
@@ -12963,8 +13721,8 @@ if test $enable_tls = yes; then
 
   if test -n "$PKG_CONFIG"; then
     if pkg-config --exists gnutls; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking gnutls support" >&5
-$as_echo_n "checking gnutls support... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gnutls support" >&5
+printf %s "checking gnutls support... " >&6; }
       HAVE_GNUTLS=1
       TLS_CFLAGS=`$PKG_CONFIG --cflags gnutls`
       TLS_LIBS=`$PKG_CONFIG --libs gnutls`
@@ -12976,16 +13734,18 @@ $as_echo_n "checking gnutls support... " >&6; }
 
 
 # Check whether --with-tls-prefix was given.
-if test "${with_tls_prefix+set}" = set; then :
+if test ${with_tls_prefix+y}
+then :
   withval=$with_tls_prefix; tls_config_prefix="$withval"
-else
+else $as_nop
   tls_config_prefix=""
 fi
 
 # Check whether --enable-tlstest was given.
-if test "${enable_tlstest+set}" = set; then :
+if test ${enable_tlstest+y}
+then :
   enableval=$enable_tlstest;
-else
+else $as_nop
   enable_tlstest=yes
 fi
 
@@ -13002,11 +13762,12 @@ fi
 
   # Extract the first word of "libgnutls-config", so it can be a program name with args.
 set dummy libgnutls-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TLS_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_TLS_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $TLS_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_TLS_CONFIG="$TLS_CONFIG" # Let the user override the test with a path.
@@ -13016,11 +13777,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_TLS_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -13033,17 +13798,17 @@ esac
 fi
 TLS_CONFIG=$ac_cv_path_TLS_CONFIG
 if test -n "$TLS_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TLS_CONFIG" >&5
-$as_echo "$TLS_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TLS_CONFIG" >&5
+printf "%s\n" "$TLS_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
   min_tls_version=1.4.0
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgnutls - version >= $min_tls_version" >&5
-$as_echo_n "checking for libgnutls - version >= $min_tls_version... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libgnutls - version >= $min_tls_version" >&5
+printf %s "checking for libgnutls - version >= $min_tls_version... " >&6; }
   no_tls=""
   if test "$TLS_CONFIG" = "no" ; then
     if test x$tls_config_prefix != x ; then
@@ -13059,9 +13824,10 @@ $as_echo_n "checking for libgnutls - version >= $min_tls_version... " >&6; }
     CFLAGS="$CFLAGS $TLS_CFLAGS"
     LIBS="$TLS_LIBS $LIBS"
     rm -f conf.tlstest
-    if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes
+then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13089,9 +13855,10 @@ main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-else
+else $as_nop
   no_tls=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13117,9 +13884,10 @@ fi
       CFLAGS="$CFLAGS $TLS_CFLAGS"
       LIBS="$TLS_LIBS $LIBS"
       rm -f conf.tlstest
-      if test "$cross_compiling" = yes; then :
+      if test "$cross_compiling" = yes
+then :
   echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13147,9 +13915,10 @@ main()
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-else
+else $as_nop
   no_tls=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13163,12 +13932,12 @@ fi
   fi
 
   if test "x$no_tls" = x ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     enable_libgnutls=yes
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     if test "$TLS_CONFIG" = "no" ; then
       echo "*** The libgnutls-config script installed by libgnutls could not be found"
       echo "*** If libtgnuls-config was installed in PREFIX, make sure PREFIX/bin is in"
@@ -13199,11 +13968,12 @@ $as_echo "no" >&6; }
   fi
   if test $HAVE_GNUTLS = 1; then
     if ! pkg-config --atleast-version=2.12 gnutls; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcry_control in -lgcrypt" >&5
-$as_echo_n "checking for gcry_control in -lgcrypt... " >&6; }
-if ${ac_cv_lib_gcrypt_gcry_control+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gcry_control in -lgcrypt" >&5
+printf %s "checking for gcry_control in -lgcrypt... " >&6; }
+if test ${ac_cv_lib_gcrypt_gcry_control+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13212,32 +13982,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gcry_control ();
 int
-main ()
+main (void)
 {
 return gcry_control ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gcrypt_gcry_control=yes
-else
+else $as_nop
   ac_cv_lib_gcrypt_gcry_control=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt_gcry_control" >&5
-$as_echo "$ac_cv_lib_gcrypt_gcry_control" >&6; }
-if test "x$ac_cv_lib_gcrypt_gcry_control" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt_gcry_control" >&5
+printf "%s\n" "$ac_cv_lib_gcrypt_gcry_control" >&6; }
+if test "x$ac_cv_lib_gcrypt_gcry_control" = xyes
+then :
   have_gcrypt=yes
-else
+else $as_nop
   have_gcrypt=no
 fi
 
@@ -13252,8 +14021,8 @@ fi
     # Restore the CFLAGS and LIBS because AM_PATH_TLS messes them
     LIBS="$saved_LIBS"
     CFLAGS="$saved_CFLAGS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     echo
     echo "You do not appear to have usable libgnutls headers/library."
     echo "Building without them will disable SSL/TLS/HTTPS in NSStream,"
@@ -13262,48 +14031,38 @@ $as_echo "no" >&6; }
     echo "add --disable-tls to the configure arguments."
     as_fn_error $? "Missing support for TLS functionality." "$LINENO" 5
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     CPPFLAGS="$CPPFLAGS $TLS_CFLAGS"
     INCLUDE_FLAGS="$INCLUDE_FLAGS $TLS_CFLAGS"
     LIBS="$TLS_LIBS $LIBS"
-    for ac_func in gnutls_transport_set_errno
-do :
-  ac_fn_c_check_func "$LINENO" "gnutls_transport_set_errno" "ac_cv_func_gnutls_transport_set_errno"
-if test "x$ac_cv_func_gnutls_transport_set_errno" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GNUTLS_TRANSPORT_SET_ERRNO 1
-_ACEOF
+    ac_fn_c_check_func "$LINENO" "gnutls_transport_set_errno" "ac_cv_func_gnutls_transport_set_errno"
+if test "x$ac_cv_func_gnutls_transport_set_errno" = xyes
+then :
+  printf "%s\n" "#define HAVE_GNUTLS_TRANSPORT_SET_ERRNO 1" >>confdefs.h
 
 fi
-done
 
     if test "$ac_cv_func_gnutls_transport_set_errno" = "no"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Missing support for thread-safe error handling in GNUTLS.  Please check that you have the most recent version installed (2.0 or later chould be fine)." >&5
-$as_echo "$as_me: WARNING: Missing support for thread-safe error handling in GNUTLS.  Please check that you have the most recent version installed (2.0 or later chould be fine)." >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Missing support for thread-safe error handling in GNUTLS.  Please check that you have the most recent version installed (2.0 or later chould be fine)." >&5
+printf "%s\n" "$as_me: WARNING: Missing support for thread-safe error handling in GNUTLS.  Please check that you have the most recent version installed (2.0 or later chould be fine)." >&2;}
     fi
-    for ac_func in gnutls_x509_privkey_import2
-do :
-  ac_fn_c_check_func "$LINENO" "gnutls_x509_privkey_import2" "ac_cv_func_gnutls_x509_privkey_import2"
-if test "x$ac_cv_func_gnutls_x509_privkey_import2" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GNUTLS_X509_PRIVKEY_IMPORT2 1
-_ACEOF
+    ac_fn_c_check_func "$LINENO" "gnutls_x509_privkey_import2" "ac_cv_func_gnutls_x509_privkey_import2"
+if test "x$ac_cv_func_gnutls_x509_privkey_import2" = xyes
+then :
+  printf "%s\n" "#define HAVE_GNUTLS_X509_PRIVKEY_IMPORT2 1" >>confdefs.h
 
 fi
-done
 
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabled support for TLS funtionality." >&5
-$as_echo "$as_me: WARNING: Disabled support for TLS funtionality." >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabled support for TLS funtionality." >&5
+printf "%s\n" "$as_me: WARNING: Disabled support for TLS funtionality." >&2;}
   HAVE_GNUTLS=0
 fi
 if test $HAVE_GNUTLS = 1; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_GNUTLS $HAVE_GNUTLS
-_ACEOF
+printf "%s\n" "#define HAVE_GNUTLS $HAVE_GNUTLS" >>confdefs.h
 
 fi
 
@@ -13315,42 +14074,43 @@ fi
 HAVE_MDNS=0
 HAVE_AVAHI=0
 # Check whether --enable-zeroconf was given.
-if test "${enable_zeroconf+set}" = set; then :
+if test ${enable_zeroconf+y}
+then :
   enableval=$enable_zeroconf;
-else
+else $as_nop
   enable_zeroconf=yes
 fi
 
 
 # Check whether --with-zeroconf-api was given.
-if test "${with_zeroconf_api+set}" = set; then :
+if test ${with_zeroconf_api+y}
+then :
   withval=$with_zeroconf_api; zeroconf_api="$withval"
-else
+else $as_nop
   zeroconf_api="any"
 fi
 
 if test $enable_zeroconf = yes; then
   if test "$zeroconf_api" = "any" || test "$zeroconf_api" = "mdns"; then
-    for ac_header in dns_sd.h
+           for ac_header in dns_sd.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default"
-if test "x$ac_cv_header_dns_sd_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DNS_SD_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default"
+if test "x$ac_cv_header_dns_sd_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DNS_SD_H 1" >>confdefs.h
  have_mdns=yes
-else
+else $as_nop
   have_mdns=no
 fi
 
 done
-
     if test "$have_mdns" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DNSServiceBrowse in -ldns_sd" >&5
-$as_echo_n "checking for DNSServiceBrowse in -ldns_sd... " >&6; }
-if ${ac_cv_lib_dns_sd_DNSServiceBrowse+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DNSServiceBrowse in -ldns_sd" >&5
+printf %s "checking for DNSServiceBrowse in -ldns_sd... " >&6; }
+if test ${ac_cv_lib_dns_sd_DNSServiceBrowse+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldns_sd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13359,32 +14119,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char DNSServiceBrowse ();
 int
-main ()
+main (void)
 {
 return DNSServiceBrowse ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dns_sd_DNSServiceBrowse=yes
-else
+else $as_nop
   ac_cv_lib_dns_sd_DNSServiceBrowse=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dns_sd_DNSServiceBrowse" >&5
-$as_echo "$ac_cv_lib_dns_sd_DNSServiceBrowse" >&6; }
-if test "x$ac_cv_lib_dns_sd_DNSServiceBrowse" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dns_sd_DNSServiceBrowse" >&5
+printf "%s\n" "$ac_cv_lib_dns_sd_DNSServiceBrowse" >&6; }
+if test "x$ac_cv_lib_dns_sd_DNSServiceBrowse" = xyes
+then :
   have_mdns=yes
-else
+else $as_nop
   have_mdns=no
 fi
 
@@ -13395,26 +14154,25 @@ fi
     fi
   fi
   if test "$zeroconf_api" = "any" || test "$zeroconf_api" = "avahi"; then
-    for ac_header in avahi-client/client.h
+           for ac_header in avahi-client/client.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "avahi-client/client.h" "ac_cv_header_avahi_client_client_h" "$ac_includes_default"
-if test "x$ac_cv_header_avahi_client_client_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_AVAHI_CLIENT_CLIENT_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "avahi-client/client.h" "ac_cv_header_avahi_client_client_h" "$ac_includes_default"
+if test "x$ac_cv_header_avahi_client_client_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_AVAHI_CLIENT_CLIENT_H 1" >>confdefs.h
  have_avahi=yes
-else
+else $as_nop
   have_avahi=no
 fi
 
 done
-
     if test "$have_avahi" = "yes"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5
-$as_echo_n "checking for avahi_client_new in -lavahi-client... " >&6; }
-if ${ac_cv_lib_avahi_client_avahi_client_new+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5
+printf %s "checking for avahi_client_new in -lavahi-client... " >&6; }
+if test ${ac_cv_lib_avahi_client_avahi_client_new+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lavahi-client  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13423,32 +14181,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char avahi_client_new ();
 int
-main ()
+main (void)
 {
 return avahi_client_new ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_avahi_client_avahi_client_new=yes
-else
+else $as_nop
   ac_cv_lib_avahi_client_avahi_client_new=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avahi_client_avahi_client_new" >&5
-$as_echo "$ac_cv_lib_avahi_client_avahi_client_new" >&6; }
-if test "x$ac_cv_lib_avahi_client_avahi_client_new" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avahi_client_avahi_client_new" >&5
+printf "%s\n" "$ac_cv_lib_avahi_client_avahi_client_new" >&6; }
+if test "x$ac_cv_lib_avahi_client_avahi_client_new" = xyes
+then :
   have_avahi=yes
-else
+else $as_nop
   have_avahi=no
 fi
 
@@ -13476,33 +14233,35 @@ fi
 #--------------------------------------------------------------------
 HAVE_ICU=0
 # Check whether --enable-icu was given.
-if test "${enable_icu+set}" = set; then :
+if test ${enable_icu+y}
+then :
   enableval=$enable_icu;
-else
+else $as_nop
   enable_icu=yes
 fi
 
 
-if test "x$enable_icu" = "xyes"; then :
+if test "x$enable_icu" = "xyes"
+then :
 
   case "$target_os" in
     mingw*|windows)
       # check for ICU bundled with Windows 10
       old_LIBS="$LIBS"
       LIBS="-licu $LIBS"
-      for ac_header in icu.h
+             for ac_header in icu.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "icu.h" "ac_cv_header_icu_h" "$ac_includes_default"
-if test "x$ac_cv_header_icu_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ICU_H 1
-_ACEOF
- if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  ac_fn_c_check_header_compile "$LINENO" "icu.h" "ac_cv_header_icu_h" "$ac_includes_default"
+if test "x$ac_cv_header_icu_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ICU_H 1" >>confdefs.h
+ if test "$cross_compiling" = yes
+then :
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
 See \`config.log' for more details" "$LINENO" 5; }
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13511,7 +14270,8 @@ else
             return udat_countAvailable() > 0 ? 0 : 1;
           }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   HAVE_ICU=1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13521,29 +14281,28 @@ fi
 fi
 
 done
-
       LIBS="$old_LIBS"
       if test $HAVE_ICU = 1; then
         ICU_LIBS=-licu
-        { $as_echo "$as_me:${as_lineno-$LINENO}: Using system-provided ICU DLL (requires Windows 10 version 1903 or later)" >&5
-$as_echo "$as_me: Using system-provided ICU DLL (requires Windows 10 version 1903 or later)" >&6;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using system-provided ICU DLL (requires Windows 10 version 1903 or later)" >&5
+printf "%s\n" "$as_me: Using system-provided ICU DLL (requires Windows 10 version 1903 or later)" >&6;}
       fi
     ;;
   esac
   if test $HAVE_ICU = 0; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU" >&5
-$as_echo_n "checking for ICU... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ICU" >&5
+printf %s "checking for ICU... " >&6; }
 
 if test -n "$ICU_CFLAGS"; then
     pkg_cv_ICU_CFLAGS="$ICU_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n > 49.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n > 49.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "icu-i18n > 49.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n > 49.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -13557,10 +14316,10 @@ if test -n "$ICU_LIBS"; then
     pkg_cv_ICU_LIBS="$ICU_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n > 49.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-i18n > 49.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "icu-i18n > 49.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-i18n > 49.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -13574,8 +14333,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13592,28 +14351,28 @@ fi
 
 	HAVE_ICU=0
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	HAVE_ICU=0
 else
 	ICU_CFLAGS=$pkg_cv_ICU_CFLAGS
 	ICU_LIBS=$pkg_cv_ICU_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-      for ac_header in unicode/uloc.h unicode/ulocdata.h unicode/ucol.h unicode/ucurr.h unicode/uregex.h unicode/ucal.h unicode/unorm2.h unicode/unum.h unicode/udat.h unicode/udatpg.h unicode/ustring.h unicode/usearch.h unicode/ucnv.h unicode/utext.h unicode/ubrk.h unicode/utypes.h
+             for ac_header in unicode/uloc.h unicode/ulocdata.h unicode/ucol.h unicode/ucurr.h unicode/uregex.h unicode/ucal.h unicode/unorm2.h unicode/unum.h unicode/udat.h unicode/udatpg.h unicode/ustring.h unicode/usearch.h unicode/ucnv.h unicode/utext.h unicode/ubrk.h unicode/utypes.h
 do :
-  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 :
+  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  HAVE_ICU=1
 fi
 
 done
-
 fi
   fi
   if test $HAVE_ICU = 0; then
@@ -13631,9 +14390,10 @@ fi
 
 HAVE_LIBDISPATCH=0
 # Check whether --enable-libdispatch was given.
-if test "${enable_libdispatch+set}" = set; then :
+if test ${enable_libdispatch+y}
+then :
   enableval=$enable_libdispatch; enable_libdispatch=$enableval
-else
+else $as_nop
   enable_libdispatch=yes
 fi
 
@@ -13641,9 +14401,10 @@ fi
 if test $enable_libdispatch = yes; then
 
 # Check whether --with-dispatch-include was given.
-if test "${with_dispatch_include+set}" = set; then :
+if test ${with_dispatch_include+y}
+then :
   withval=$with_dispatch_include; dispatch_incdir="$withval"
-else
+else $as_nop
   dispatch_incdir="no"
 fi
 
@@ -13654,9 +14415,10 @@ fi
 
 
 # Check whether --with-dispatch-library was given.
-if test "${with_dispatch_library+set}" = set; then :
+if test ${with_dispatch_library+y}
+then :
   withval=$with_dispatch_library; dispatch_libdir="$withval"
-else
+else $as_nop
   dispatch_libdir="no"
 fi
 
@@ -13673,57 +14435,49 @@ esac
 
   fi
 
-  for ac_header in dispatch/dispatch.h
+         for ac_header in dispatch/dispatch.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dispatch/dispatch.h" "ac_cv_header_dispatch_dispatch_h" "$ac_includes_default"
-if test "x$ac_cv_header_dispatch_dispatch_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DISPATCH_DISPATCH_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "dispatch/dispatch.h" "ac_cv_header_dispatch_dispatch_h" "$ac_includes_default"
+if test "x$ac_cv_header_dispatch_dispatch_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DISPATCH_DISPATCH_H 1" >>confdefs.h
  have_dispatch=yes
-else
+else $as_nop
   have_dispatch=no
 fi
 
 done
-
   if test "$have_dispatch" = "yes"; then
     # check for private header which includes runloop integration functions in
     # the Swift corelibs libdispatch release
-    for ac_header in dispatch/private.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dispatch/private.h" "ac_cv_header_dispatch_private_h" "$ac_includes_default"
-if test "x$ac_cv_header_dispatch_private_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DISPATCH_PRIVATE_H 1
-_ACEOF
+    ac_fn_c_check_header_compile "$LINENO" "dispatch/private.h" "ac_cv_header_dispatch_private_h" "$ac_includes_default"
+if test "x$ac_cv_header_dispatch_private_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DISPATCH_PRIVATE_H 1" >>confdefs.h
 
 fi
 
-done
-
   else
-    for ac_header in dispatch.h
+           for ac_header in dispatch.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dispatch.h" "ac_cv_header_dispatch_h" "$ac_includes_default"
-if test "x$ac_cv_header_dispatch_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DISPATCH_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "dispatch.h" "ac_cv_header_dispatch_h" "$ac_includes_default"
+if test "x$ac_cv_header_dispatch_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_DISPATCH_H 1" >>confdefs.h
  have_dispatch=yes
-else
+else $as_nop
   have_dispatch=no
 fi
 
 done
-
   fi
   if test "$have_dispatch" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dispatch_queue_create in -ldispatch" >&5
-$as_echo_n "checking for dispatch_queue_create in -ldispatch... " >&6; }
-if ${ac_cv_lib_dispatch_dispatch_queue_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dispatch_queue_create in -ldispatch" >&5
+printf %s "checking for dispatch_queue_create in -ldispatch... " >&6; }
+if test ${ac_cv_lib_dispatch_dispatch_queue_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldispatch  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13732,32 +14486,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dispatch_queue_create ();
 int
-main ()
+main (void)
 {
 return dispatch_queue_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_dispatch_dispatch_queue_create=yes
-else
+else $as_nop
   ac_cv_lib_dispatch_dispatch_queue_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dispatch_dispatch_queue_create" >&5
-$as_echo "$ac_cv_lib_dispatch_dispatch_queue_create" >&6; }
-if test "x$ac_cv_lib_dispatch_dispatch_queue_create" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dispatch_dispatch_queue_create" >&5
+printf "%s\n" "$ac_cv_lib_dispatch_dispatch_queue_create" >&6; }
+if test "x$ac_cv_lib_dispatch_dispatch_queue_create" = xyes
+then :
   have_dispatch=yes
-else
+else $as_nop
   have_dispatch=no
 fi
 
@@ -13766,35 +14519,36 @@ fi
       LIBS="-lobjc -ldispatch";
       # This check is needed because libdispatch might be linked against a
       # version of libBlocksRuntime that defines symbols conflicting with libobjc
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can link libdispatch and libobjc at the same time" >&5
-$as_echo_n "checking whether we can link libdispatch and libobjc at the same time... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can link libdispatch and libobjc at the same time" >&5
+printf %s "checking whether we can link libdispatch and libobjc at the same time... " >&6; }
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   have_dispatch=yes
-else
+else $as_nop
   have_dispatch=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       if test "$have_dispatch" = "yes"; then
 	LIBS="$saveLIBS -ldispatch";
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
 	HAVE_LIBDISPATCH=1;
       else
 	LIBS="$saveLIBS";
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
       fi
     fi
   else
@@ -13808,34 +14562,36 @@ HAVE_LIBDISPATCH_RUNLOOP=0
 if test $HAVE_LIBDISPATCH = 1; then
   # We check whether we have a variant of libdispatch that allows runloop
   # integration
-  for ac_func in dispatch_main_queue_drain_np dispatch_get_main_queue_handle_np
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+  ac_fn_c_check_func "$LINENO" "dispatch_main_queue_drain_np" "ac_cv_func_dispatch_main_queue_drain_np"
+if test "x$ac_cv_func_dispatch_main_queue_drain_np" = xyes
+then :
+  printf "%s\n" "#define HAVE_DISPATCH_MAIN_QUEUE_DRAIN_NP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "dispatch_get_main_queue_handle_np" "ac_cv_func_dispatch_get_main_queue_handle_np"
+if test "x$ac_cv_func_dispatch_get_main_queue_handle_np" = xyes
+then :
+  printf "%s\n" "#define HAVE_DISPATCH_GET_MAIN_QUEUE_HANDLE_NP 1" >>confdefs.h
 
 fi
-done
 
   if test "$ac_cv_func_dispatch_main_queue_drain_np" = "yes" && test "$ac_cv_func_dispatch_get_main_queue_handle_np" = "yes"; then
     HAVE_LIBDISPATCH_RUNLOOP=1
   fi
   # Check for "_4CF" variants of runloop integration functions provided by the
   # Swift corelibs libdispatch release
-  for ac_func in _dispatch_main_queue_callback_4CF _dispatch_get_main_queue_handle_4CF
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+  ac_fn_c_check_func "$LINENO" "_dispatch_main_queue_callback_4CF" "ac_cv_func__dispatch_main_queue_callback_4CF"
+if test "x$ac_cv_func__dispatch_main_queue_callback_4CF" = xyes
+then :
+  printf "%s\n" "#define HAVE__DISPATCH_MAIN_QUEUE_CALLBACK_4CF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "_dispatch_get_main_queue_handle_4CF" "ac_cv_func__dispatch_get_main_queue_handle_4CF"
+if test "x$ac_cv_func__dispatch_get_main_queue_handle_4CF" = xyes
+then :
+  printf "%s\n" "#define HAVE__DISPATCH_GET_MAIN_QUEUE_HANDLE_4CF 1" >>confdefs.h
 
 fi
-done
 
   if test "$ac_cv_func__dispatch_main_queue_callback_4CF" = "yes" && test "$ac_cv_func__dispatch_get_main_queue_handle_4CF" = "yes"; then
     HAVE_LIBDISPATCH_RUNLOOP=1
@@ -13851,7 +14607,8 @@ fi
 CURL_CONFIG="curl-config"
 
 # Check whether --with-curl was given.
-if test "${with_curl+set}" = set; then :
+if test ${with_curl+y}
+then :
   withval=$with_curl;
 fi
 
@@ -13862,8 +14619,8 @@ fi
 HAVE_LIBCURL=0
 SKIP_CURL_CONFIG=0
 curl_all=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl" >&5
-$as_echo_n "checking for libcurl... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl" >&5
+printf %s "checking for libcurl... " >&6; }
 
 case "$target_os" in
     windows)	SKIP_CURL_CONFIG=1;;
@@ -13879,25 +14636,23 @@ if eval $CURL_CONFIG --version 2>/dev/null >/dev/null && test "$SKIP_CURL_CONFIG
   curl_maj=`echo $curl_ver | sed -e "s/^\(.*\)\.\(.*\)\.\(.*\)$/\1/"`
   curl_min=`echo $curl_ver | sed -e "s/^\(.*\)\.\(.*\)\.\(.*\)$/\2/"`
   if test $curl_maj -lt 7 -o \( $curl_maj -eq 7 -a $curl_min -lt 66 \); then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED (version too old to use" >&5
-$as_echo "FAILED (version too old to use" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAILED (version too old to use" >&5
+printf "%s\n" "FAILED (version too old to use" >&6; }
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ... version $curl_ver" >&5
-$as_echo "yes ... version $curl_ver" >&6; }
-    for ac_header in curl/curl.h
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ... version $curl_ver" >&5
+printf "%s\n" "yes ... version $curl_ver" >&6; }
+           for ac_header in curl/curl.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
-if test "x$ac_cv_header_curl_curl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CURL_CURL_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
+if test "x$ac_cv_header_curl_curl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_CURL_CURL_H 1" >>confdefs.h
  curl_ok=yes
-else
+else $as_nop
   curl_ok=no
 fi
 
 done
-
     if test "$curl_ok" = yes; then
       HAVE_LIBCURL=1
       CURLCFLAGS=`$CURL_CONFIG --cflags`
@@ -13910,23 +14665,21 @@ done
 else
   if test -n "$PKG_CONFIG"; then
     if pkg-config --exists libcurl; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ... via pkg-config" >&5
-$as_echo "yes ... via pkg-config" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ... via pkg-config" >&5
+printf "%s\n" "yes ... via pkg-config" >&6; }
       if $PKG_CONFIG --atleast-version 2.66.0 libcurl; then
-        for ac_header in curl/curl.h
+               for ac_header in curl/curl.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
-if test "x$ac_cv_header_curl_curl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_CURL_CURL_H 1
-_ACEOF
+  ac_fn_c_check_header_compile "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
+if test "x$ac_cv_header_curl_curl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_CURL_CURL_H 1" >>confdefs.h
  curl_ok=yes
-else
+else $as_nop
   curl_ok=no
 fi
 
 done
-
         if test "$curl_ok" = yes; then
           HAVE_LIBCURL=1
           CURLCFLAGS=`$PKG_CONFIG --cflags libcurl`
@@ -13936,18 +14689,18 @@ done
           curl_all=yes
         fi
         else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED (version too old to use" >&5
-$as_echo "FAILED (version too old to use" >&6; }
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAILED (version too old to use" >&5
+printf "%s\n" "FAILED (version too old to use" >&6; }
           curl_all=no
       fi
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED (libcurl not found via pkg-config)" >&5
-$as_echo "FAILED (libcurl not found via pkg-config)" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAILED (libcurl not found via pkg-config)" >&5
+printf "%s\n" "FAILED (libcurl not found via pkg-config)" >&6; }
       curl_all=no
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED (curl-config and pkg-config not found)" >&5
-$as_echo "FAILED (curl-config and pkg-config not found)" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: FAILED (curl-config and pkg-config not found)" >&5
+printf "%s\n" "FAILED (curl-config and pkg-config not found)" >&6; }
   fi
 fi
 
@@ -13963,9 +14716,10 @@ fi
 
 GS_HAVE_NSURLSESSION=0
 # Check whether --enable-nsurlsession was given.
-if test "${enable_nsurlsession+set}" = set; then :
+if test ${enable_nsurlsession+y}
+then :
   enableval=$enable_nsurlsession;
-else
+else $as_nop
   enable_nsurlsession=$nsurlsessiondefault
 fi
 
@@ -13980,16 +14734,12 @@ if test $enable_nsurlsession = yes; then
     as_fn_error $? "Missing libdispatch (needed for NSURLSession).  To build without NSURLSession support, please run configure again with the --disable-nsurlsession option." "$LINENO" 5
    fi
   # Check for dispatch_queue_create_with_target needed for NSURLSession
-  for ac_func in dispatch_queue_create_with_target
-do :
   ac_fn_c_check_func "$LINENO" "dispatch_queue_create_with_target" "ac_cv_func_dispatch_queue_create_with_target"
-if test "x$ac_cv_func_dispatch_queue_create_with_target" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DISPATCH_QUEUE_CREATE_WITH_TARGET 1
-_ACEOF
+if test "x$ac_cv_func_dispatch_queue_create_with_target" = xyes
+then :
+  printf "%s\n" "#define HAVE_DISPATCH_QUEUE_CREATE_WITH_TARGET 1" >>confdefs.h
 
 fi
-done
 
   if test $HAVE_LIBCURL = 0; then
     as_fn_error $? "Missing libcurl (needed for NSURLSession). To build without NSURLSession support, please run configure again with the --disable-nsurlsession option." "$LINENO" 5
@@ -14003,18 +14753,20 @@ fi
 #--------------------------------------------------------------------
 
 # Check whether --with-gmp-include was given.
-if test "${with_gmp_include+set}" = set; then :
+if test ${with_gmp_include+y}
+then :
   withval=$with_gmp_include; gmp_incdir="$withval"
-else
+else $as_nop
   gmp_incdir="no"
 fi
 
 
 
 # Check whether --with-gmp-library was given.
-if test "${with_gmp_library+set}" = set; then :
+if test ${with_gmp_library+y}
+then :
   withval=$with_gmp_library; gmp_libdir="$withval"
-else
+else $as_nop
   gmp_libdir="no"
 fi
 
@@ -14039,24 +14791,20 @@ esac
 fi
 
 USE_GMP=0
-for ac_header in gmp.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"
-if test "x$ac_cv_header_gmp_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GMP_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"
+if test "x$ac_cv_header_gmp_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_GMP_H 1" >>confdefs.h
 
 fi
 
-done
-
 if test $ac_cv_header_gmp_h = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpf_abs in -lgmp" >&5
-$as_echo_n "checking for mpf_abs in -lgmp... " >&6; }
-if ${ac_cv_lib_gmp_mpf_abs+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mpf_abs in -lgmp" >&5
+printf %s "checking for mpf_abs in -lgmp... " >&6; }
+if test ${ac_cv_lib_gmp_mpf_abs+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14065,41 +14813,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char mpf_abs ();
 int
-main ()
+main (void)
 {
 return mpf_abs ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gmp_mpf_abs=yes
-else
+else $as_nop
   ac_cv_lib_gmp_mpf_abs=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp_mpf_abs" >&5
-$as_echo "$ac_cv_lib_gmp_mpf_abs" >&6; }
-if test "x$ac_cv_lib_gmp_mpf_abs" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp_mpf_abs" >&5
+printf "%s\n" "$ac_cv_lib_gmp_mpf_abs" >&6; }
+if test "x$ac_cv_lib_gmp_mpf_abs" = xyes
+then :
   gmp_ok=yes
-else
+else $as_nop
   gmp_ok=no
 fi
 
   if test "$gmp_ok" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpf_abs in -lgmp" >&5
-$as_echo_n "checking for __gmpf_abs in -lgmp... " >&6; }
-if ${ac_cv_lib_gmp___gmpf_abs+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gmpf_abs in -lgmp" >&5
+printf %s "checking for __gmpf_abs in -lgmp... " >&6; }
+if test ${ac_cv_lib_gmp___gmpf_abs+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14108,32 +14856,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char __gmpf_abs ();
 int
-main ()
+main (void)
 {
 return __gmpf_abs ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gmp___gmpf_abs=yes
-else
+else $as_nop
   ac_cv_lib_gmp___gmpf_abs=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpf_abs" >&5
-$as_echo "$ac_cv_lib_gmp___gmpf_abs" >&6; }
-if test "x$ac_cv_lib_gmp___gmpf_abs" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpf_abs" >&5
+printf "%s\n" "$ac_cv_lib_gmp___gmpf_abs" >&6; }
+if test "x$ac_cv_lib_gmp___gmpf_abs" = xyes
+then :
   gmp_ok=yes
-else
+else $as_nop
   gmp_ok=no
 fi
 
@@ -14151,36 +14898,38 @@ fi
 # Check whether nl_langinfo(CODESET) is supported, needed by Unicode.m.
 #--------------------------------------------------------------------
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
-$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
-if ${am_cv_langinfo_codeset+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+printf %s "checking for nl_langinfo and CODESET... " >&6; }
+if test ${am_cv_langinfo_codeset+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <langinfo.h>
 int
-main ()
+main (void)
 {
 char* cs = nl_langinfo(CODESET);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_langinfo_codeset=yes
-else
+else $as_nop
   am_cv_langinfo_codeset=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-$as_echo "$am_cv_langinfo_codeset" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
 
-$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
@@ -14192,8 +14941,8 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 #--------------------------------------------------------------------
 # Check for -Wdeclaration-after-statement
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wdeclaration-after-statement" >&5
-$as_echo_n "checking whether the compiler supports -Wdeclaration-after-statement... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wdeclaration-after-statement" >&5
+printf %s "checking whether the compiler supports -Wdeclaration-after-statement... " >&6; }
 
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wdeclaration-after-statement"
@@ -14201,23 +14950,24 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   HAS_W_DECL_AFTER_STATEMENT=yes
-else
+else $as_nop
   HAS_W_DECL_AFTER_STATEMENT=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 CFLAGS="$saved_CFLAGS"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_W_DECL_AFTER_STATEMENT" >&5
-$as_echo "$HAS_W_DECL_AFTER_STATEMENT" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HAS_W_DECL_AFTER_STATEMENT" >&5
+printf "%s\n" "$HAS_W_DECL_AFTER_STATEMENT" >&6; }
 
 if test x"$HAS_W_DECL_AFTER_STATEMENT" = x"yes"; then
   WARN_FLAGS="-Wall -Wdeclaration-after-statement"
@@ -14232,9 +14982,10 @@ fi
 #--------------------------------------------------------------------
 
 # Check whether --with-gdomap-port was given.
-if test "${with_gdomap_port+set}" = set; then :
+if test ${with_gdomap_port+y}
+then :
   withval=$with_gdomap_port; gdomap_port="$withval"
-else
+else $as_nop
   gdomap_port="no"
 fi
 
@@ -14249,23 +15000,24 @@ fi
 #--------------------------------------------------------------------
 # Check if we should install gdomap as setuid
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should install gdomap as setuid" >&5
-$as_echo_n "checking if we should install gdomap as setuid... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we should install gdomap as setuid" >&5
+printf %s "checking if we should install gdomap as setuid... " >&6; }
 # Check whether --enable-setuid-gdomap was given.
-if test "${enable_setuid_gdomap+set}" = set; then :
+if test ${enable_setuid_gdomap+y}
+then :
   enableval=$enable_setuid_gdomap; ac_cv_setuid_gdomap=$enableval
-else
+else $as_nop
   ac_cv_setuid_gdomap="no"
 fi
 
 
 if test "$ac_cv_setuid_gdomap" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; };
   GNUSTEP_INSTALL_GDOMAP_AS_SETUID="yes"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; };
   GNUSTEP_INSTALL_GDOMAP_AS_SETUID="no"
 fi
 
@@ -14274,13 +15026,13 @@ fi
 #--------------------------------------------------------------------
 # Record the version
 #--------------------------------------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the version of gnustep-base we are compiling" >&5
-$as_echo_n "checking for the version of gnustep-base we are compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the version of gnustep-base we are compiling" >&5
+printf %s "checking for the version of gnustep-base we are compiling... " >&6; }
 if test -f "Version"; then
   . ./Version
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VERSION" >&5
-$as_echo "$VERSION" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $VERSION" >&5
+printf "%s\n" "$VERSION" >&6; }
 
 
 
@@ -14319,8 +15071,8 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -14350,15 +15102,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -14372,8 +15124,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -14390,7 +15142,7 @@ U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -14407,8 +15159,8 @@ LTLIBOBJS=$ac_ltlibobjs
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -14431,14 +15183,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -14448,46 +15202,46 @@ esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -14496,13 +15250,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -14511,8 +15258,12 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -14524,30 +15275,10 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -14560,13 +15291,14 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -14593,18 +15325,20 @@ as_fn_unset ()
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -14616,12 +15350,13 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -14652,7 +15387,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -14674,6 +15409,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -14687,6 +15426,12 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -14728,7 +15473,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -14737,7 +15482,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14800,7 +15545,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -14858,14 +15603,16 @@ $config_headers
 Report bugs to the package provider."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -14902,15 +15649,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -14918,7 +15665,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -14927,7 +15674,7 @@ do
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -14955,7 +15702,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -14969,7 +15716,7 @@ exec 5>>config.log
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -14982,7 +15729,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "Headers/GNUstepBase/config.h") CONFIG_HEADERS="$CONFIG_HEADERS Headers/GNUstepBase/config.h" ;;
+    "Headers/GNUstepBase/config.h") CONFIG_HEADERS="$CONFIG_HEADERS Headers/GNUstepBase/config.h:Headers/GNUstepBase/config.h.in" ;;
     "config.mak") CONFIG_FILES="$CONFIG_FILES config.mak" ;;
     "base.make") CONFIG_FILES="$CONFIG_FILES base.make" ;;
     "Source/gnustep-base.pc") CONFIG_FILES="$CONFIG_FILES Source/gnustep-base.pc" ;;
@@ -14998,8 +15745,8 @@ done
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -15335,7 +16082,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -15343,17 +16090,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -15370,7 +16117,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -15394,9 +16141,9 @@ $as_echo X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -15449,8 +16196,8 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -15492,9 +16239,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -15510,20 +16257,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      $as_echo "/* $configure_input  */" \
+      printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    $as_echo "/* $configure_input  */" \
+    printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -15564,7 +16311,8 @@ if test "$no_create" != yes; then
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
diff --git a/configure.ac b/configure.ac
index 3dfb2371c..1acbfda62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,7 +157,7 @@ fi`])
 #--------------------------------------------------------------------
 # Use a .h file with #define's, instead of -D command-line switches
 #--------------------------------------------------------------------
-AC_CONFIG_HEADERS([Headers/GNUstepBase/config.h])
+AC_CONFIG_HEADERS([Headers/GNUstepBase/config.h:Headers/GNUstepBase/config.h.in])
 
 #--------------------------------------------------------------------
 # Determine the host, build, and target systems