diff --git a/config/scripts/version.sh b/config/scripts/version.sh
index c2e7e4de1..65a523a64 100755
--- a/config/scripts/version.sh
+++ b/config/scripts/version.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-UNICON_VERSION=13.3
-UNICON_VERSION_DATE="December 22, 2020"
+UNICON_VERSION=13.4
+UNICON_VERSION_DATE="October 03, 2025"
 
 # Interested in version only
 if [ "x$1" = "xversion"  ]; then
@@ -23,14 +23,14 @@ if [ -d .git ]; then
   REPO_REV_COUNT=`git rev-list --first-parent --count HEAD`
   REPO_REV_HASH=`git rev-parse --short HEAD`
   REPO_REV=${REPO_REV_COUNT}_${REPO_REV_HASH}
-    
-  if test ! -z ${REPO_REV} ; then 
+
+  if test ! -z ${REPO_REV} ; then
       echo "#define REPO_REVISION \"${REPO_REV}\"" > $REV_FILE
   elif test ! -f $REV_FILE ; then
       echo "#define REPO_REVISION \"0\"" > $REV_FILE
   fi
 
-  if test -z ${REPO_REV_DESCR} ; then 
+  if test -z ${REPO_REV_DESCR} ; then
       echo "#define gitDescription \"commit ${REPO_REV_HASH}\"" >> $REV_FILE
   else
       echo "#define gitDescription \"${REPO_REV_DESCR}\"" >> $REV_FILE
@@ -49,10 +49,10 @@ else # not under git revision control
       echo "#define gitBranch \"0\"" >> $REV_FILE
       echo "#define UNICON_VERSION \"${UNICON_VERSION}\"" >> $REV_FILE
       echo "#define UNICON_VERSION_DATE \"${UNICON_VERSION_DATE}\"" >> $REV_FILE
-  fi 
+  fi
 
   REPO_REV=`cat src/h/revision.h | sed -n -e 's/^.*REPO_REVISION //p'`
-  
+
 fi
 
 # Interested in version only
diff --git a/configure b/configure
index 3e0b385c8..9c10d21a6 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Unicon 13.3.
+# Generated by GNU Autoconf 2.69 for Unicon 13.4.
 #
 # Report bugs to <jeffery@unicon.org>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -17,16 +16,14 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (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 $as_nop
+else
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -36,46 +33,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
-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
+# 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
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+if test "${PATH_SEPARATOR+set}" != set; 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 ||
@@ -84,6 +81,13 @@ if ${PATH_SEPARATOR+false} :; 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 #((
@@ -92,12 +96,8 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
@@ -109,10 +109,30 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$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.
@@ -134,22 +154,20 @@ 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'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="as_nop=:
-if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (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 \$as_nop
+else
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -169,53 +187,42 @@ 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 \$as_nop
+else
   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 $as_nop
+else
   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 $as_nop
+else
   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
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
   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_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
-then :
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
   break 2
 fi
 fi
@@ -223,21 +230,14 @@ fi
        esac
   as_found=false
 done
-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 :
+$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
-fi
+fi; }
+IFS=$as_save_IFS
 
 
-      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
@@ -255,19 +255,18 @@ 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'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    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."
+    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."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and jeffery@unicon.org
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and jeffery@unicon.org
 $0: about your system, including any error possibly output
 $0: before this message. Then install a modern shell, or
 $0: manually run the script under such a shell if you do
@@ -295,7 +294,6 @@ as_fn_unset ()
 }
 as_unset=as_fn_unset
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -313,14 +311,6 @@ 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
 # -------------
@@ -335,7 +325,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -344,7 +334,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -383,13 +373,12 @@ 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 $as_nop
+else
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -401,27 +390,18 @@ 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 $as_nop
+else
   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]
 # ----------------------------------------
@@ -433,9 +413,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
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -462,7 +442,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -506,7 +486,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -520,10 +500,6 @@ 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*)
@@ -537,13 +513,6 @@ 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
@@ -611,45 +580,48 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Unicon'
 PACKAGE_TARNAME='unicon'
-PACKAGE_VERSION='13.3'
-PACKAGE_STRING='Unicon 13.3'
+PACKAGE_VERSION='13.4'
+PACKAGE_STRING='Unicon 13.4'
 PACKAGE_BUGREPORT='jeffery@unicon.org'
 PACKAGE_URL='http://www.unicon.org'
 
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stddef.h>
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
 #endif
-#ifdef HAVE_STDLIB_H
+#ifdef STDC_HEADERS
 # 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_unique_file="src/runtime/imain.r"
-ac_func_c_list=
 ac_subst_vars='LTLIBOBJS
 GL_LDFLAGS
 GL_CFLAGS
@@ -666,6 +638,7 @@ XPM
 XL
 GRAPHICS
 XLIBS
+CXXCPP
 SQLITE
 LIBOBJS
 HTMLDOC
@@ -713,10 +686,12 @@ UNICONT
 UNICONX
 ALLOCA
 RANLIB
-CPP
 ac_ct_CXX
 CXXFLAGS
 CXX
+EGREP
+GREP
+CPP
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -826,10 +801,11 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
+CPP
 CXX
 CXXFLAGS
 CCC
-CPP'
+CXXCPP'
 
 
 # Initialize some variables set by options.
@@ -898,6 +874,8 @@ 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 ;;
@@ -938,9 +916,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -964,9 +942,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1177,9 +1155,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1193,9 +1171,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=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1239,9 +1217,9 @@ Try \`$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1257,7 +1235,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1321,7 +1299,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1378,7 +1356,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Unicon 13.3 to adapt to many kinds of systems.
+\`configure' configures Unicon 13.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1444,7 +1422,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Unicon 13.3:";;
+     short | recursive ) echo "Configuration of Unicon 13.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1510,9 +1488,10 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
-  CPP         C preprocessor
+  CXXCPP      C++ preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1534,9 +1513,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=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`$as_echo "$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/ ;;
@@ -1564,8 +1543,7 @@ esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for configure.gnu first; this name is used for a wrapper for
-    # Metaconfig's "Configure" on case-insensitive file systems.
+    # Check for guested configure.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1573,7 +1551,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1582,10 +1560,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Unicon configure 13.3
-generated by GNU Autoconf 2.71
+Unicon configure 13.4
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1602,14 +1580,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 conftest.beam
+  rm -f conftest.$ac_objext
   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\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1617,15 +1595,14 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$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_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1635,6 +1612,176 @@ fi
 
 } # ac_fn_c_try_compile
 
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+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_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$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 :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # 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;}
+( $as_echo "## --------------------------------- ##
+## Report this to jeffery@unicon.org ##
+## --------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&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
@@ -1642,28 +1789,26 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { 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
+  { $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
   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 $as_nop
+else
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -1674,14 +1819,14 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_cxx_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam
+  rm -f conftest.$ac_objext
   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\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1689,15 +1834,14 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext
-then :
+       } && test -s conftest.$ac_objext; then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1707,58 +1851,20 @@ fi
 
 } # ac_fn_cxx_try_compile
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-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_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  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 :
-  ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
 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.beam conftest$ac_exeext
+  rm -f conftest.$ac_objext 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\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1766,18 +1872,17 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$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_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1792,49 +1897,6 @@ fi
 
 } # ac_fn_c_try_link
 
-# 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
@@ -1849,7 +1911,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
 test_array [0] = 0;
@@ -1859,15 +1921,14 @@ 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 (void)
+main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
@@ -1877,10 +1938,9 @@ 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 $as_nop
+else
   as_fn_arith $ac_mid + 1 && ac_lo=$as_val
 			if test $ac_lo -le $ac_mid; then
 			  ac_lo= ac_hi=
@@ -1888,14 +1948,14 @@ else $as_nop
 			fi
 			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
-else $as_nop
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
 test_array [0] = 0;
@@ -1905,15 +1965,14 @@ 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 (void)
+main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
 test_array [0] = 0;
@@ -1923,10 +1982,9 @@ 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 $as_nop
+else
   as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
 			if test $ac_mid -le $ac_hi; then
 			  ac_lo= ac_hi=
@@ -1934,14 +1992,14 @@ else $as_nop
 			fi
 			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
-else $as_nop
+else
   ac_lo= ac_hi=
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext 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
@@ -1949,7 +2007,7 @@ while test "x$ac_lo" != "x$ac_hi"; do
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
@@ -1959,13 +2017,12 @@ 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 $as_nop
+else
   as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in #((
 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
@@ -1975,12 +2032,12 @@ esac
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
-static long int longval (void) { return $2; }
-static unsigned long int ulongval (void) { return $2; }
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
 #include <stdio.h>
 #include <stdlib.h>
 int
-main (void)
+main ()
 {
 
   FILE *f = fopen ("conftest.val", "w");
@@ -2008,10 +2065,9 @@ main (void)
   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 $as_nop
+else
   ac_retval=1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -2031,18 +2087,17 @@ rm -f conftest.val
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { 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
+  { $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=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 if (sizeof ($2))
 	 return 0;
@@ -2050,13 +2105,12 @@ 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 (void)
+main ()
 {
 if (sizeof (($2)))
 	    return 0;
@@ -2064,19 +2118,18 @@ if (sizeof (($2)))
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else $as_nop
+else
   eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
@@ -2087,12 +2140,11 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { 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
+  { $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
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -2100,9 +2152,16 @@ else $as_nop
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-   which can conflict with char $2 (); below.  */
+    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
 
-#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2120,51 +2179,47 @@ choke me
 #endif
 
 int
-main (void)
+main ()
 {
 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 $as_nop
+else
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
-# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
-# ------------------------------------------------------------------
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
-ac_fn_check_decl ()
+# accordingly.
+ac_fn_c_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'`
-  eval ac_save_FLAGS=\$$6
-  as_fn_append $6 " $5"
+  { $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
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
@@ -2178,55 +2233,147 @@ main (void)
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
-else $as_nop
+else
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  eval $6=\$ac_save_FLAGS
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+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_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
 
-} # ac_fn_check_decl
+} # ac_fn_cxx_try_cpp
 
-# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
 # ---------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_cxx_check_header_compile ()
+# 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_cxx_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { 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
+  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_cxx_try_compile "$LINENO"
-then :
-  eval "$3=yes"
-else $as_nop
-  eval "$3=no"
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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_cxx_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_cxx_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;}
+( $as_echo "## --------------------------------- ##
+## Report this to jeffery@unicon.org ##
+## --------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&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
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $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_cxx_check_header_compile
+} # ac_fn_cxx_check_header_mongrel
 
 # ac_fn_cxx_try_link LINENO
 # -------------------------
@@ -2234,14 +2381,14 @@ printf "%s\n" "$ac_res" >&6; }
 ac_fn_cxx_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+  rm -f conftest.$ac_objext 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\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2249,18 +2396,17 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_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_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2282,17 +2428,16 @@ fi
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { 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
+  { $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
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main (void)
+main ()
 {
 static $2 ac_aggr;
 if (ac_aggr.$3)
@@ -2301,15 +2446,14 @@ 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 $as_nop
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main (void)
+main ()
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
@@ -2318,50 +2462,29 @@ 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 $as_nop
+else
   eval "$4=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
-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 Unicon $as_me 13.3, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+It was created by Unicon $as_me 13.4, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ $0$ac_configure_args_raw
+  $ $0 $@
 
 _ACEOF
 exec 5>>config.log
@@ -2394,12 +2517,8 @@ 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
-    printf "%s\n" "PATH: $as_dir"
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2434,7 +2553,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2469,13 +2588,11 @@ 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
 
-    printf "%s\n" "## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -2486,8 +2603,8 @@ trap 'exit_status=$?
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_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;} ;;
+      *_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;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2511,7 +2628,7 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
 )
     echo
 
-    printf "%s\n" "## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -2519,14 +2636,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -2534,15 +2651,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -2550,8 +2667,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
       echo
     fi
     test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2565,48 +2682,63 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
 
 
 # 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
-  ac_site_files="$CONFIG_SITE"
+  # 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
 elif test "x$prefix" != xNONE; then
-  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-
-for ac_site_file in $ac_site_files
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
-  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;}
+  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;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2616,655 +2748,19 @@ 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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
-# 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 " 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"
-# Test code for whether the C++ compiler supports C++98 (global declarations)
-ac_cxx_conftest_cxx98_globals='
-// Does the compiler advertise C++98 conformance?
-#if !defined __cplusplus || __cplusplus < 199711L
-# error "Compiler does not advertise C++98 conformance"
-#endif
-
-// These inclusions are to reject old compilers that
-// lack the unsuffixed header files.
-#include <cstdlib>
-#include <exception>
-
-// <cassert> and <cstring> are *not* freestanding headers in C++98.
-extern void assert (int);
-namespace std {
-  extern int strcmp (const char *, const char *);
-}
-
-// Namespaces, exceptions, and templates were all added after "C++ 2.0".
-using std::exception;
-using std::strcmp;
-
-namespace {
-
-void test_exception_syntax()
-{
-  try {
-    throw "test";
-  } catch (const char *s) {
-    // Extra parentheses suppress a warning when building autoconf itself,
-    // due to lint rules shared with more typical C programs.
-    assert (!(strcmp) (s, "test"));
-  }
-}
-
-template <typename T> struct test_template
-{
-  T const val;
-  explicit test_template(T t) : val(t) {}
-  template <typename U> T add(U u) { return static_cast<T>(u) + val; }
-};
-
-} // anonymous namespace
-'
-
-# Test code for whether the C++ compiler supports C++98 (body of main)
-ac_cxx_conftest_cxx98_main='
-  assert (argc);
-  assert (! argv[0]);
-{
-  test_exception_syntax ();
-  test_template<double> tt (2.0);
-  assert (tt.add (4) == 6.0);
-  assert (true && !false);
-}
-'
-
-# Test code for whether the C++ compiler supports C++11 (global declarations)
-ac_cxx_conftest_cxx11_globals='
-// Does the compiler advertise C++ 2011 conformance?
-#if !defined __cplusplus || __cplusplus < 201103L
-# error "Compiler does not advertise C++11 conformance"
-#endif
-
-namespace cxx11test
-{
-  constexpr int get_val() { return 20; }
-
-  struct testinit
-  {
-    int i;
-    double d;
-  };
-
-  class delegate
-  {
-  public:
-    delegate(int n) : n(n) {}
-    delegate(): delegate(2354) {}
-
-    virtual int getval() { return this->n; };
-  protected:
-    int n;
-  };
-
-  class overridden : public delegate
-  {
-  public:
-    overridden(int n): delegate(n) {}
-    virtual int getval() override final { return this->n * 2; }
-  };
-
-  class nocopy
-  {
-  public:
-    nocopy(int i): i(i) {}
-    nocopy() = default;
-    nocopy(const nocopy&) = delete;
-    nocopy & operator=(const nocopy&) = delete;
-  private:
-    int i;
-  };
-
-  // for testing lambda expressions
-  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
-  {
-    return f(v);
-  }
-
-  // for testing variadic templates and trailing return types
-  template <typename V> auto sum(V first) -> V
-  {
-    return first;
-  }
-  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
-  {
-    return first + sum(rest...);
-  }
-}
-'
-
-# Test code for whether the C++ compiler supports C++11 (body of main)
-ac_cxx_conftest_cxx11_main='
-{
-  // Test auto and decltype
-  auto a1 = 6538;
-  auto a2 = 48573953.4;
-  auto a3 = "String literal";
-
-  int total = 0;
-  for (auto i = a3; *i; ++i) { total += *i; }
-
-  decltype(a2) a4 = 34895.034;
-}
-{
-  // Test constexpr
-  short sa[cxx11test::get_val()] = { 0 };
-}
-{
-  // Test initializer lists
-  cxx11test::testinit il = { 4323, 435234.23544 };
-}
-{
-  // Test range-based for
-  int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
-                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
-  for (auto &x : array) { x += 23; }
-}
-{
-  // Test lambda expressions
-  using cxx11test::eval;
-  assert (eval ([](int x) { return x*2; }, 21) == 42);
-  double d = 2.0;
-  assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);
-  assert (d == 5.0);
-  assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);
-  assert (d == 5.0);
-}
-{
-  // Test use of variadic templates
-  using cxx11test::sum;
-  auto a = sum(1);
-  auto b = sum(1, 2);
-  auto c = sum(1.0, 2.0, 3.0);
-}
-{
-  // Test constructor delegation
-  cxx11test::delegate d1;
-  cxx11test::delegate d2();
-  cxx11test::delegate d3(45);
-}
-{
-  // Test override and final
-  cxx11test::overridden o1(55464);
-}
-{
-  // Test nullptr
-  char *c = nullptr;
-}
-{
-  // Test template brackets
-  test_template<::test_template<int>> v(test_template<int>(12));
-}
-{
-  // Unicode literals
-  char const *utf8 = u8"UTF-8 string \u2500";
-  char16_t const *utf16 = u"UTF-8 string \u2500";
-  char32_t const *utf32 = U"UTF-32 string \u2500";
-}
-'
-
-# Test code for whether the C compiler supports C++11 (complete).
-ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
-${ac_cxx_conftest_cxx11_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_cxx_conftest_cxx98_main}
-  ${ac_cxx_conftest_cxx11_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C++98 (complete).
-ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_cxx_conftest_cxx98_main}
-  return ok;
-}
-"
-
-as_fn_append ac_header_c_list " vfork.h vfork_h HAVE_VFORK_H"
-as_fn_append ac_func_c_list " fork HAVE_FORK"
-as_fn_append ac_func_c_list " vfork HAVE_VFORK"
-
-# 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="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
-
-# 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
@@ -3275,12 +2771,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,)
-      { 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;}
+      { $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;}
       ac_cache_corrupted=: ;;
     ,set)
-      { 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;}
+      { $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;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
@@ -3289,24 +2785,24 @@ printf "%s\n" "$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
-	  { 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;}
+	  { $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;}
 	  ac_cache_corrupted=:
 	else
-	  { 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;}
+	  { $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;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ 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;}
+	{ $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;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -3316,12 +2812,11 @@ printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { 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
+  { $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
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -3335,30 +2830,55 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; 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 \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$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.
 
 
-  # 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
+# 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
+{ $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
   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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -3377,22 +2897,21 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ 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
+{ $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
   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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -3424,28 +2943,28 @@ case $host_cpu in
         unicon_cpu="arm_32"
 	ARCHBITS="32"
 
-printf "%s\n" "#define ARM 1" >>confdefs.h
+$as_echo "#define ARM 1" >>confdefs.h
 
         ;;
      *armv8* | *aarch64*)
         unicon_cpu="arm_64"
 	ARCHBITS="64"
 
-printf "%s\n" "#define ARM 1" >>confdefs.h
+$as_echo "#define ARM 1" >>confdefs.h
 
         ;;
      *riscv64*)
         unicon_cpu="riscv_64"
 	ARCHBITS="64"
 
-printf "%s\n" "#define RISCV 1" >>confdefs.h
+$as_echo "#define RISCV 1" >>confdefs.h
 
         ;;
      *i386* | *i686*)
         unicon_cpu="x86_32"
 	ARCHBITS="32"
 
-printf "%s\n" "#define X86 1" >>confdefs.h
+$as_echo "#define X86 1" >>confdefs.h
 
 	;;
      *)
@@ -3480,13 +2999,13 @@ case $host_os in
         fi
 
 
-printf "%s\n" "#define UNIX 1" >>confdefs.h
+$as_echo "#define UNIX 1" >>confdefs.h
 
 
         case $host_os in
            *musl*)
 
-printf "%s\n" "#define __MUSL__ 1" >>confdefs.h
+$as_echo "#define __MUSL__ 1" >>confdefs.h
 
             MUSLFLG="-D__MUSL__"
             CFLAGS="-fno-pie $CFLAGS"
@@ -3498,44 +3017,44 @@ printf "%s\n" "#define __MUSL__ 1" >>confdefs.h
      *solaris*)
         unicon_os="solaris"
 
-printf "%s\n" "#define UNIX 1" >>confdefs.h
+$as_echo "#define UNIX 1" >>confdefs.h
 
 
-printf "%s\n" "#define SOLARIS 1" >>confdefs.h
+$as_echo "#define SOLARIS 1" >>confdefs.h
 
 
-printf "%s\n" "#define SUN 1" >>confdefs.h
+$as_echo "#define SUN 1" >>confdefs.h
 
         ;;
      *aix*)
         unicon_os="aix"
 
-printf "%s\n" "#define UNIX 1" >>confdefs.h
+$as_echo "#define UNIX 1" >>confdefs.h
 
         ;;
      *bsd*)
         # freebsd for now
         unicon_os="freebsd"
 
-printf "%s\n" "#define UNIX 1" >>confdefs.h
+$as_echo "#define UNIX 1" >>confdefs.h
 
 
-printf "%s\n" "#define FreeBSD 1" >>confdefs.h
+$as_echo "#define FreeBSD 1" >>confdefs.h
 
         ;;
      *darwin*)
         unicon_os="macos"
 
-printf "%s\n" "#define UNIX 1" >>confdefs.h
+$as_echo "#define UNIX 1" >>confdefs.h
 
 
-printf "%s\n" "#define MacOS 1" >>confdefs.h
+$as_echo "#define MacOS 1" >>confdefs.h
 
         ;;
      *cygwin* | *mingw* | *msys*)
         unicon_os="windows"
 
-printf "%s\n" "#define Windows 1" >>confdefs.h
+$as_echo "#define Windows 1" >>confdefs.h
 
         ;;
 esac
@@ -3547,229 +3066,202 @@ echo "Configuring Unicon Host: $unicon_host"
 echo "##########################################"
 
 # Check whether --enable-graphics was given.
-if test ${enable_graphics+y}
-then :
+if test "${enable_graphics+set}" = set; then :
   enableval=$enable_graphics; graphics=$enableval
-else $as_nop
+else
   graphics=on
 fi
 
 # Check whether --enable-graphics3d was given.
-if test ${enable_graphics3d+y}
-then :
+if test "${enable_graphics3d+set}" = set; then :
   enableval=$enable_graphics3d; graphics3d=$enableval
-else $as_nop
+else
   graphics3d=on
 fi
 
 # Check whether --enable-multiprograms was given.
-if test ${enable_multiprograms+y}
-then :
+if test "${enable_multiprograms+set}" = set; then :
   enableval=$enable_multiprograms; multiprograms=$enableval
-else $as_nop
+else
   multiprograms=on
 fi
 
 # Check whether --enable-concurrency was given.
-if test ${enable_concurrency+y}
-then :
+if test "${enable_concurrency+set}" = set; then :
   enableval=$enable_concurrency; concurrency=$enableval
-else $as_nop
+else
   concurrency=on
 fi
 
 # Check whether --enable-pattern was given.
-if test ${enable_pattern+y}
-then :
+if test "${enable_pattern+set}" = set; then :
   enableval=$enable_pattern; pattern=$enableval
-else $as_nop
+else
   pattern=on
 fi
 
 # Check whether --enable-database was given.
-if test ${enable_database+y}
-then :
+if test "${enable_database+set}" = set; then :
   enableval=$enable_database; database=$enableval
-else $as_nop
+else
   database=on
 fi
 
 # Check whether --enable-ssl was given.
-if test ${enable_ssl+y}
-then :
+if test "${enable_ssl+set}" = set; then :
   enableval=$enable_ssl; ssl=$enableval
-else $as_nop
+else
   ssl=on
 fi
 
 # Check whether --enable-audio was given.
-if test ${enable_audio+y}
-then :
+if test "${enable_audio+set}" = set; then :
   enableval=$enable_audio; audio=$enableval
-else $as_nop
+else
   audio=on
 fi
 
 # Check whether --enable-voip was given.
-if test ${enable_voip+y}
-then :
+if test "${enable_voip+set}" = set; then :
   enableval=$enable_voip; voip=$enableval
-else $as_nop
+else
   voip=on
 fi
 
 # Check whether --enable-plugins was given.
-if test ${enable_plugins+y}
-then :
+if test "${enable_plugins+set}" = set; then :
   enableval=$enable_plugins; plugins=$enableval
-else $as_nop
+else
   plugins=on
 fi
 
 
 # Check whether --enable-iconc was given.
-if test ${enable_iconc+y}
-then :
+if test "${enable_iconc+set}" = set; then :
   enableval=$enable_iconc; iconc=$enableval
-else $as_nop
+else
   iconc=on
 fi
 
 
 # Check whether --enable-stdc was given.
-if test ${enable_stdc+y}
-then :
+if test "${enable_stdc+set}" = set; then :
   enableval=$enable_stdc; stdc=$enableval
-else $as_nop
+else
   stdc=on
 fi
 
 
 # Check whether --enable-iconcurrency was given.
-if test ${enable_iconcurrency+y}
-then :
+if test "${enable_iconcurrency+set}" = set; then :
   enableval=$enable_iconcurrency; coniconc=yes
-else $as_nop
+else
   coniconc=no
 fi
 
 # Check whether --enable-ovld was given.
-if test ${enable_ovld+y}
-then :
+if test "${enable_ovld+set}" = set; then :
   enableval=$enable_ovld; ovld=yes
-else $as_nop
+else
   ovld=no
 fi
 
 
 # Check whether --enable-udbtools was given.
-if test ${enable_udbtools+y}
-then :
+if test "${enable_udbtools+set}" = set; then :
   enableval=$enable_udbtools; udbtools=yes
-else $as_nop
+else
   udbtools=no
 fi
 
 
 # Check whether --enable-progs was given.
-if test ${enable_progs+y}
-then :
+if test "${enable_progs+set}" = set; then :
   enableval=$enable_progs; progs=yes
-else $as_nop
+else
   progs=no
 fi
 
 
 # Check whether --enable-verbosebuild was given.
-if test ${enable_verbosebuild+y}
-then :
+if test "${enable_verbosebuild+set}" = set; then :
   enableval=$enable_verbosebuild; verbosebuild=yes
-else $as_nop
+else
   verbosebuild=no
 fi
 
 
 # Check whether --enable-doc was given.
-if test ${enable_doc+y}
-then :
+if test "${enable_doc+set}" = set; then :
   enableval=$enable_doc; doc=yes
-else $as_nop
+else
   doc=no
 fi
 
 # Check whether --enable-htmldoc was given.
-if test ${enable_htmldoc+y}
-then :
+if test "${enable_htmldoc+set}" = set; then :
   enableval=$enable_htmldoc; htmldoc=yes
-else $as_nop
+else
   htmldoc=no
 fi
 
 
 # Check whether --enable-thin was given.
-if test ${enable_thin+y}
-then :
+if test "${enable_thin+set}" = set; then :
   enableval=$enable_thin; thin=yes
-else $as_nop
+else
   thin=no
 fi
 
 
 # Check whether --enable-debug was given.
-if test ${enable_debug+y}
-then :
+if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; debug=yes
-else $as_nop
+else
   debug=no
 fi
 
 # Check whether --enable-debugheap was given.
-if test ${enable_debugheap+y}
-then :
+if test "${enable_debugheap+set}" = set; then :
   enableval=$enable_debugheap; debugheap=yes
-else $as_nop
+else
   debugheap=no
 fi
 
 # Check whether --enable-verifyheap was given.
-if test ${enable_verifyheap+y}
-then :
+if test "${enable_verifyheap+set}" = set; then :
   enableval=$enable_verifyheap; verifyheap=yes
-else $as_nop
+else
   verifyheap=no
 fi
 
 # Check whether --enable-devmode was given.
-if test ${enable_devmode+y}
-then :
+if test "${enable_devmode+set}" = set; then :
   enableval=$enable_devmode; devmode=$enableval
-else $as_nop
+else
   devmode=no
 fi
 
 
 # Check whether --enable-werror was given.
-if test ${enable_werror+y}
-then :
+if test "${enable_werror+set}" = set; then :
   enableval=$enable_werror; werror=yes
-else $as_nop
+else
   werror=no
 fi
 
 # Check whether --enable-warnings was given.
-if test ${enable_warnings+y}
-then :
+if test "${enable_warnings+set}" = set; then :
   enableval=$enable_warnings; warn=yes
-else $as_nop
+else
   warn=no
 fi
 
 
 # Check whether --enable-uniconx was given.
-if test ${enable_uniconx+y}
-then :
+if test "${enable_uniconx+set}" = set; then :
   enableval=$enable_uniconx; uniconx=yes
-else $as_nop
+else
   uniconx=no
 fi
 
@@ -3784,15 +3276,6 @@ 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
 
-
-
-
-
-
-
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3801,12 +3284,11 @@ 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
-{ 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
+{ $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
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3814,15 +3296,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3833,11 +3311,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3846,12 +3324,11 @@ 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
-{ 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
+{ $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
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3859,15 +3336,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3878,11 +3351,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3890,8 +3363,8 @@ fi
   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;}
+{ $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;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3904,12 +3377,11 @@ 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
-{ 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
+{ $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
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3917,15 +3389,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3936,11 +3404,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3949,12 +3417,11 @@ 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
-{ 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
+{ $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
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3963,19 +3430,15 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3991,18 +3454,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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4013,12 +3476,11 @@ 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
-{ 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
+{ $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
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -4026,15 +3488,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4045,11 +3503,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4062,12 +3520,11 @@ 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
-{ 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
+{ $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
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -4075,15 +3532,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4094,11 +3547,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4110,138 +3563,34 @@ done
   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
-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
-
-
-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;}
+{ $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;}
 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;}
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$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.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$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 -version; do
+for ac_option in --version -v -V -qversion; 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\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -4251,7 +3600,7 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -4259,7 +3608,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -4271,9 +3620,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.
-{ 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[^ ]*//'`
+{ $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[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -4294,12 +3643,11 @@ case "(($ac_try" in
   *) 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
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
+  $as_echo "$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,
@@ -4316,7 +3664,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -4332,46 +3680,44 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else $as_nop
+else
   ac_file=''
 fi
-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
+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
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$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_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-fi
-{ 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; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "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; }
 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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-printf %s "checking for suffix of executables... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "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\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$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; }
-then :
+  $as_echo "$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
@@ -4385,15 +3731,15 @@ for ac_file in conftest.exe conftest conftest.*; do
     * ) break;;
   esac
 done
-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;}
+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 compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -4402,7 +3748,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main (void)
+main ()
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -4414,8 +3760,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.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-printf %s "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -4423,10 +3769,10 @@ case "(($ac_try" in
   *) 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
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -4434,40 +3780,39 @@ printf "%s\n" "$ac_try_echo"; } >&5
   *) 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
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$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
-	{ { 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.
+	{ { $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.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ 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
+{ $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
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -4481,12 +3826,11 @@ case "(($ac_try" in
   *) 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
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
+  $as_echo "$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
@@ -4495,32 +3839,31 @@ then :
        break;;
   esac
 done
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $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 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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ 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
+{ $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
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -4530,33 +3873,29 @@ main (void)
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else $as_nop
+else
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ 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
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+y}
+ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ 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
+{ $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
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -4565,60 +3904,57 @@ else $as_nop
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   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 $as_nop
+else
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else $as_nop
+else
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   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.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ 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
+{ $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
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -4633,144 +3969,232 @@ else
     CFLAGS=
   fi
 fi
-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
+{ $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_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c11_program
+#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;
+}
 _ACEOF
-for ac_arg in '' -std=gnu11
+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 :
-  ac_cv_prog_cc_c11=$ac_arg
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c11" != "xno" && break
+rm -f core conftest.err conftest.$ac_objext
+  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_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
+fi
+
+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
+
+
+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
+{ $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; }
+# 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"
+    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.  */
-$ac_c_conftest_c99_program
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
 _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
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
+rm -f conftest.err conftest.i conftest.$ac_ext
+
 done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
+# 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 :
+  break
 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
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$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.  */
-$ac_c_conftest_c89_program
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
 _ACEOF
-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 :
-  ac_cv_prog_cc_c89=$ac_arg
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
 fi
-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
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-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
+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 :
+
+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 $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4780,175 +4204,325 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
+{ $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
 do
-  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
+  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
     fi
-    ac_header= ac_cache=
-  elif test $ac_header; then
-    ac_cache=$ac_item
-  else
-    ac_header=$ac_item
-  fi
-done
-
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
+    # 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
 
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+      $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
+{ $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"
 
 
-  { 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
+{ $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>
 
-#         define __EXTENSIONS__ 1
-          $ac_includes_default
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_safe_to_define___extensions__=yes
-else $as_nop
-  ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
 fi
-{ 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; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  { 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 :
+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>
 
-          #include <wchar.h>
-          mbstate_t x;
-int
-main (void)
-{
+_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>
 
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+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
 
-else $as_nop
+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 _XOPEN_SOURCE 500
-            #include <wchar.h>
-            mbstate_t x;
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
-main (void)
+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_compile "$LINENO"
-then :
-  ac_cv_should_define__xopen_source=yes
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+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
-{ 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; }
+{ $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
 
-  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+fi
 
-  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+# 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
 
-  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+fi
 
-  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+done
 
-  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
+  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=
+fi
 
-  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
+  if test "$MINIX" = yes; then
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+$as_echo "#define _POSIX_SOURCE 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
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
 
-  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+$as_echo "#define _MINIX 1" >>confdefs.h
 
-  if test $ac_cv_header_minix_config_h = yes
-then :
-  MINIX=yes
-    printf "%s\n" "#define _MINIX 1" >>confdefs.h
+  fi
 
-    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
 
-    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+  { $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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end 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
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
 fi
-  if test $ac_cv_should_define__xopen_source = yes
-then :
-  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
-
+rm -f core conftest.err conftest.$ac_objext 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
+
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
 
 # Try CC 11
 ac_cc="$CC"
@@ -4963,35 +4537,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -std=c11"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -std=c11" >&5
-printf %s "checking whether $CC supports -std=c11... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -std=c11" >&5
+$as_echo_n "checking whether $CC supports -std=c11... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5010,38 +4583,37 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -std=c11"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -std=c11" >&5
-printf %s "checking whether $CC supports -std=c11... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -std=c11" >&5
+$as_echo_n "checking whether $CC supports -std=c11... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 				CFLAGS="$ac_c_flag_save"
 				 CFLAGS="$CFLAGS -std=c11"
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 			as_fn_error $? "\"-std=c11 is required but not available\"" "$LINENO" 5
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5060,38 +4632,37 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -std=$stdc"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -std=$stdc" >&5
-printf %s "checking whether $CC supports -std=$stdc... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -std=$stdc" >&5
+$as_echo_n "checking whether $CC supports -std=$stdc... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 				CFLAGS="$ac_c_flag_save"
 				 CFLAGS="$CFLAGS -std=$stdc"
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 			as_fn_error $? "\"-std=$stdc is required but not available\"" "$LINENO" 5
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5114,24 +4685,23 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS $ARCHFLAG"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $ARCHFLAG" >&5
-printf %s "checking whether $CC supports $ARCHFLAG... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $ARCHFLAG" >&5
+$as_echo_n "checking whether $CC supports $ARCHFLAG... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 				CFLAGS="$ac_c_flag_save"
 
@@ -5141,17 +4711,17 @@ printf "%s\n" "yes" >&6; }
 
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 			 ARCHFLAG=""
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5172,7 +4742,7 @@ fi
 
 if test x"$uniconx" = x"yes" ; then
 
-printf "%s\n" "#define UniconX 1" >>confdefs.h
+$as_echo "#define UniconX 1" >>confdefs.h
 
   UNICONX=uniconx
   UNICONWX=wuniconx
@@ -5191,7 +4761,7 @@ if test x"$devmode" = x"yes" || test x"$devmode" = x"all"; then
   debug=yes
   warn=yes
 
-printf "%s\n" "#define DEVELOPMODE 1" >>confdefs.h
+$as_echo "#define DEVELOPMODE 1" >>confdefs.h
 
   if test x"$devmode" = x"all"; then
    debugheap=yes
@@ -5201,14 +4771,14 @@ fi
 
 if test x"$debugheap" = x"yes" ; then
 
-printf "%s\n" "#define DebugHeap 1" >>confdefs.h
+$as_echo "#define DebugHeap 1" >>confdefs.h
 
   debugheapreport="DebugHeap"
 fi
 
 if test x"$verifyheap" = x"yes" ; then
 
-printf "%s\n" "#define VerifyHeap 1" >>confdefs.h
+$as_echo "#define VerifyHeap 1" >>confdefs.h
 
     verifyheapreport="VerifyHeap"
 fi
@@ -5233,35 +4803,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -g"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -g" >&5
-printf %s "checking whether $CC supports -g... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -g" >&5
+$as_echo_n "checking whether $CC supports -g... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5278,35 +4847,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -O0"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -O0" >&5
-printf %s "checking whether $CC supports -O0... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -O0" >&5
+$as_echo_n "checking whether $CC supports -O0... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5324,31 +4892,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -O2"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -O2" >&5
-printf %s "checking whether $CC supports -O2... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -O2" >&5
+$as_echo_n "checking whether $CC supports -O2... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
     {
 	ac_ext=c
@@ -5359,35 +4926,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -Os"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Os" >&5
-printf %s "checking whether $CC supports -Os... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Os" >&5
+$as_echo_n "checking whether $CC supports -Os... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5398,7 +4964,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5419,35 +4985,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -Wall"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wall" >&5
-printf %s "checking whether $CC supports -Wall... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wall" >&5
+$as_echo_n "checking whether $CC supports -Wall... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5464,35 +5029,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -Wno-missing-braces"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wno-missing-braces" >&5
-printf %s "checking whether $CC supports -Wno-missing-braces... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wno-missing-braces" >&5
+$as_echo_n "checking whether $CC supports -Wno-missing-braces... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5518,35 +5082,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -fno-omit-frame-pointer"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-omit-frame-pointer" >&5
-printf %s "checking whether $CC supports -fno-omit-frame-pointer... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-omit-frame-pointer" >&5
+$as_echo_n "checking whether $CC supports -fno-omit-frame-pointer... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5564,35 +5127,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -fno-strict-aliasing"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-strict-aliasing" >&5
-printf %s "checking whether $CC supports -fno-strict-aliasing... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-strict-aliasing" >&5
+$as_echo_n "checking whether $CC supports -fno-strict-aliasing... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5611,38 +5173,37 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -Werror -Wno-parentheses-equality"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Werror -Wno-parentheses-equality" >&5
-printf %s "checking whether $CC supports -Werror -Wno-parentheses-equality... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Werror -Wno-parentheses-equality" >&5
+$as_echo_n "checking whether $CC supports -Werror -Wno-parentheses-equality... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 				CFLAGS="$ac_c_flag_save"
 				CFLAGS="$CFLAGS -Wno-parentheses-equality"
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5667,12 +5228,11 @@ 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
-{ 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
+{ $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
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5680,15 +5240,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5699,11 +5255,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5712,12 +5268,11 @@ 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
-{ 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
+{ $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
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -5725,15 +5280,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5744,11 +5295,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5756,8 +5307,8 @@ fi
   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;}
+{ $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;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5770,12 +5321,11 @@ 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
-{ 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
+{ $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
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5783,15 +5333,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5802,11 +5348,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5815,12 +5361,11 @@ 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
-{ 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
+{ $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
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5829,19 +5374,15 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5857,18 +5398,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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5879,12 +5420,11 @@ 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
-{ 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
+{ $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
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5892,15 +5432,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5911,11 +5447,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5928,12 +5464,11 @@ 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
-{ 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
+{ $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
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -5941,15 +5476,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5960,11 +5491,11 @@ 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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5976,138 +5507,34 @@ done
   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
-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
-
-
-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;}
+{ $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;}
 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;}
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$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.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$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 -version; do
+for ac_option in --version -v -V -qversion; 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\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -6117,21 +5544,20 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ 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
+{ $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
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -6141,33 +5567,29 @@ main (void)
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else $as_nop
+else
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ 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
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+y}
+ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ 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
+{ $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
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -6176,60 +5598,57 @@ else $as_nop
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   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 $as_nop
+else
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else $as_nop
+else
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   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.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ 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
+{ $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
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -6244,144 +5663,94 @@ else
     CFLAGS=
   fi
 fi
-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
+{ $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_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c89_program
+#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;
+}
 _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 conftest.beam
+rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-fi
 
-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
+# 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 :
+
 fi
 
 ac_ext=c
@@ -6390,12 +5759,6 @@ 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
 
-
-
-
-
-
-
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6406,16 +5769,15 @@ if test -z "$CXX"; then
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
   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
-{ 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_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -6423,15 +5785,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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_CXX="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6442,11 +5800,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-printf "%s\n" "$CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6455,16 +5813,15 @@ fi
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; 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_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $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_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
@@ -6472,15 +5829,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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_CXX="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6491,11 +5844,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-printf "%s\n" "$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6507,8 +5860,8 @@ done
   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;}
+{ $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;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -6518,7 +5871,7 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$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
@@ -6528,7 +5881,7 @@ case "(($ac_try" in
   *) 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
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -6538,21 +5891,20 @@ printf "%s\n" "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ 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_cxx_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $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_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -6562,33 +5914,29 @@ main (void)
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else $as_nop
+else
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
 else
   GXX=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+y}
+ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-printf %s "checking whether $CXX accepts -g... " >&6; }
-if test ${ac_cv_prog_cxx_g+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
@@ -6597,60 +5945,57 @@ else $as_nop
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
-else $as_nop
+else
   CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-else $as_nop
+else
   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
-if test $ac_test_CXXFLAGS; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
@@ -6665,100 +6010,6 @@ else
     CXXFLAGS=
   fi
 fi
-ac_prog_cxx_stdcxx=no
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
-printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cxx_cxx11=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx11_program
-_ACEOF
-for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX
-fi
-
-if test "x$ac_cv_prog_cxx_cxx11" = 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_cxx_cxx11" = 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_cxx_cxx11" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx11"
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
-  ac_prog_cxx_stdcxx=cxx11
-fi
-fi
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
-printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cxx_cxx98=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx98_program
-_ACEOF
-for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx98=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX
-fi
-
-if test "x$ac_cv_prog_cxx_cxx98" = 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_cxx_cxx98" = 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_cxx_cxx98" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx98"
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-  ac_prog_cxx_stdcxx=cxx98
-fi
-fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6770,36 +6021,40 @@ 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
-{ 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; }
+{ $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; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  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
+  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"
     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.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-else $as_nop
+else
   # Broken: fails on valid input.
 continue
 fi
@@ -6811,11 +6066,10 @@ 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 $as_nop
+else
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -6825,8 +6079,7 @@ 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
 
@@ -6838,24 +6091,29 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$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.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-else $as_nop
+else
   # Broken: fails on valid input.
 continue
 fi
@@ -6867,11 +6125,10 @@ 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 $as_nop
+else
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -6881,12 +6138,11 @@ 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_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -6900,12 +6156,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
@@ -6913,15 +6168,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6932,11 +6183,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6945,12 +6196,11 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; 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_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $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_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
@@ -6958,15 +6208,11 @@ 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
+  test -z "$as_dir" && as_dir=.
     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_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6977,11 +6223,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -6989,8 +6235,8 @@ fi
   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;}
+{ $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;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -6999,12 +6245,11 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-printf %s "checking for socket in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_socket+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+$as_echo_n "checking for socket in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7013,41 +6258,43 @@ 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 socket ();
 int
-main (void)
+main ()
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_socket=yes
-else $as_nop
+else
   ac_cv_lib_socket_socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-printf "%s\n" "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+$as_echo "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSOCKET 1
+_ACEOF
 
   LIBS="-lsocket $LIBS"
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-printf %s "checking for gethostbyname in -lnsl... " >&6; }
-if test ${ac_cv_lib_nsl_gethostbyname+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7056,151 +6303,70 @@ 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 (void)
+main ()
 {
 return gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostbyname=yes
-else $as_nop
+else
   ac_cv_lib_nsl_gethostbyname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBNSL 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNSL 1
+_ACEOF
 
   LIBS="-lnsl $LIBS"
 
 fi
 
 
-ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
-if test "x$ac_cv_header_errno_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_ERRNO_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default"
-if test "x$ac_cv_header_netdb_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_NETDB_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" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default"
-if test "x$ac_cv_header_strings_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
-if test "x$ac_cv_header_arpa_inet_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_ARPA_INET_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "net/errno.h" "ac_cv_header_net_errno_h" "$ac_includes_default"
-if test "x$ac_cv_header_net_errno_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_NET_ERRNO_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" "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" "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" "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" "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/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
-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
-ac_fn_c_check_header_compile "$LINENO" "sys/errno.h" "ac_cv_header_sys_errno_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_errno_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_ERRNO_H 1" >>confdefs.h
-
-fi
-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
+for ac_header in errno.h netdb.h unistd.h strings.h arpa/inet.h net/errno.h \
+		 stdlib.h string.h fcntl.h memory.h sys/file.h sys/resource.h \
+                 netinet/in.h sys/errno.h sys/socket.h sys/types.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
-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
+done
 
 
 # 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.
-{ 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 $as_nop
+{ $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 :
+
+else
   if test "$ac_cv_type_int" = 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_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -7209,31 +6375,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-printf "%s\n" "$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
 
 
 # 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.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5
-printf %s "checking size of long int... " >&6; }
-if test ${ac_cv_sizeof_long_int+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int"        "$ac_includes_default"
-then :
-
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5
+$as_echo_n "checking size of long int... " >&6; }
+if ${ac_cv_sizeof_long_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int"        "$ac_includes_default"; then :
+
+else
   if test "$ac_cv_type_long_int" = 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_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long int)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -7242,31 +6408,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_int" >&5
-printf "%s\n" "$ac_cv_sizeof_long_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_int" >&5
+$as_echo "$ac_cv_sizeof_long_int" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
+_ACEOF
 
 
 # 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.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5
-printf %s "checking size of long long int... " >&6; }
-if test ${ac_cv_sizeof_long_long_int+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int"        "$ac_includes_default"
-then :
-
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5
+$as_echo_n "checking size of long long int... " >&6; }
+if ${ac_cv_sizeof_long_long_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int"        "$ac_includes_default"; then :
+
+else
   if test "$ac_cv_type_long_long_int" = 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_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long int)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -7275,31 +6441,31 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5
-printf "%s\n" "$ac_cv_sizeof_long_long_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5
+$as_echo "$ac_cv_sizeof_long_long_int" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
+_ACEOF
 
 
 # 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.
-{ 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_p+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p"        "$ac_includes_default"
-then :
-
-else $as_nop
+{ $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_p+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p"        "$ac_includes_default"; then :
+
+else
   if test "$ac_cv_type_int_p" = 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_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int *)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -7308,21 +6474,22 @@ See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_p" >&5
-printf "%s\n" "$ac_cv_sizeof_int_p" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int_p" >&5
+$as_echo "$ac_cv_sizeof_int_p" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_INT_P $ac_cv_sizeof_int_p" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT_P $ac_cv_sizeof_int_p
+_ACEOF
 
 
 
- { 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
+ { $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
   ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7333,8 +6500,7 @@ else $as_nop
 	     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.
@@ -7358,7 +6524,7 @@ then :
 	 fi
        done
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext 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
@@ -7367,7 +6533,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	     #include <sys/param.h>
 
 int
-main (void)
+main ()
 {
 #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
 		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
@@ -7379,8 +6545,7 @@ main (void)
   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.  */
@@ -7388,7 +6553,7 @@ then :
 		#include <sys/param.h>
 
 int
-main (void)
+main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
 		 not big endian
@@ -7398,15 +6563,14 @@ main (void)
   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 $as_nop
+else
   ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext 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).
@@ -7415,7 +6579,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 #include <limits.h>
 
 int
-main (void)
+main ()
 {
 #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 	      bogus endian macros
@@ -7425,15 +6589,14 @@ main (void)
   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 (void)
+main ()
 {
 #ifndef _BIG_ENDIAN
 		 not big endian
@@ -7443,33 +6606,31 @@ main (void)
   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 $as_nop
+else
   ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext 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.  */
-unsigned short int ascii_mm[] =
+short int ascii_mm[] =
 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		unsigned short int ascii_ii[] =
+		short int ascii_ii[] =
 		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 		int use_ascii (int i) {
 		  return ascii_mm[i] + ascii_ii[i];
 		}
-		unsigned short int ebcdic_ii[] =
+		short int ebcdic_ii[] =
 		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		unsigned short int ebcdic_mm[] =
+		short int ebcdic_mm[] =
 		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 		int use_ebcdic (int i) {
 		  return ebcdic_mm[i] + ebcdic_ii[i];
@@ -7477,15 +6638,14 @@ unsigned short int ascii_mm[] =
 		extern int foo;
 
 int
-main (void)
+main ()
 {
 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
@@ -7498,13 +6658,13 @@ then :
 	      fi
 	    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-else $as_nop
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main (void)
+main ()
 {
 
 	     /* Are we little or big endian?  From Harbison&Steele.  */
@@ -7520,10 +6680,9 @@ main (void)
   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 $as_nop
+else
   ac_cv_c_bigendian=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7532,17 +6691,17 @@ fi
 
     fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-printf "%s\n" "$ac_cv_c_bigendian" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
       ;; #(
    universal)
 
-printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -7550,17 +6709,16 @@ printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-printf %s "checking for an ANSI C-conforming const... " >&6; }
-if test ${ac_cv_c_const+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
 #ifndef __cplusplus
@@ -7573,7 +6731,7 @@ main (void)
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
-  /* IBM XL C 1.02.0.0 rejects this.
+  /* AIX XL C 1.02.0.0 rejects this.
      It does not let you subtract one const X* pointer from another in
      an arm of an if-expression whose if-part is not a constant
      expression */
@@ -7601,7 +6759,7 @@ main (void)
     iptr p = 0;
     ++p;
   }
-  { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
     struct s { int j; const int *ap[3]; } bx;
     struct s *b = &bx; b->j = 5;
@@ -7617,45 +6775,44 @@ main (void)
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_const=yes
-else $as_nop
+else
   ac_cv_c_const=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-printf "%s\n" "$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-printf "%s\n" "#define const /**/" >>confdefs.h
+$as_echo "#define const /**/" >>confdefs.h
 
 fi
 
 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 $as_nop
+else
 
-printf "%s\n" "#define size_t unsigned int" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
 
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-printf %s "checking for working alloca.h... " >&6; }
-if test ${ac_cv_working_alloca_h+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if ${ac_cv_working_alloca_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
-main (void)
+main ()
 {
 char *p = (char *) alloca (2 * sizeof (int));
 			  if (p) return 0;
@@ -7663,52 +6820,52 @@ char *p = (char *) alloca (2 * sizeof (int));
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
-else $as_nop
+else
   ac_cv_working_alloca_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-printf %s "checking for alloca... " >&6; }
-if test ${ac_cv_func_alloca_works+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test $ac_cv_working_alloca_h = yes; then
-  ac_cv_func_alloca_works=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if ${ac_cv_func_alloca_works+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-#include <stddef.h>
-#ifndef alloca
-# ifdef __GNUC__
-#  define alloca __builtin_alloca
-# elif defined _MSC_VER
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
 # else
-#  ifdef  __cplusplus
-extern "C"
-#  endif
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca (size_t);
+#    endif
+#   endif
+#  endif
 # endif
 #endif
 
 int
-main (void)
+main ()
 {
 char *p = (char *) alloca (1);
 				    if (p) return 0;
@@ -7716,22 +6873,20 @@ char *p = (char *) alloca (1);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
-else $as_nop
+else
   ac_cv_func_alloca_works=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -7741,19 +6896,58 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if ${ac_cv_os_cray+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then :
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; 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 CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
 
+  done
+fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-printf %s "checking stack direction for C alloca... " >&6; }
-if test ${ac_cv_c_stack_direction+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if ${ac_cv_c_stack_direction+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
-else $as_nop
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
@@ -7774,10 +6968,9 @@ main (int argc, char **argv)
   return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
-else $as_nop
+else
   ac_cv_c_stack_direction=-1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7785,31 +6978,35 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
-printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
 
 
 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 $as_nop
+else
 
-printf "%s\n" "#define off_t long int" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define off_t long int
+_ACEOF
 
 fi
 
 
 ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = xyes
-then :
+if test "x$ac_cv_type_ssize_t" = xyes; then :
 
-else $as_nop
+else
 
-printf "%s\n" "#define ssize_t signed" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define ssize_t signed
+_ACEOF
 
 fi
 
@@ -8022,280 +7219,61 @@ if test "x$thin" = "xyes"; then
    if test "x$multiprograms" = "xon"; then
       multiprograms=no
    fi
-  # what else we need to disable?
-fi
-
-ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = xyes
-then :
-  printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "bcopy" "ac_cv_func_bcopy"
-if test "x$ac_cv_func_bcopy" = xyes
-then :
-  printf "%s\n" "#define HAVE_BCOPY 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "bzero" "ac_cv_func_bzero"
-if test "x$ac_cv_func_bzero" = xyes
-then :
-  printf "%s\n" "#define HAVE_BZERO 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "memcpy" "ac_cv_func_memcpy"
-if test "x$ac_cv_func_memcpy" = xyes
-then :
-  printf "%s\n" "#define HAVE_MEMCPY 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset"
-if test "x$ac_cv_func_memset" = xyes
-then :
-  printf "%s\n" "#define HAVE_MEMSET 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" "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" "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" "rename" "ac_cv_func_rename"
-if test "x$ac_cv_func_rename" = xyes
-then :
-  printf "%s\n" "#define HAVE_RENAME 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate"
-if test "x$ac_cv_func_ftruncate" = xyes
-then :
-  printf "%s\n" "#define HAVE_FTRUNCATE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
-if test "x$ac_cv_func_flock" = xyes
-then :
-  printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "fsync" "ac_cv_func_fsync"
-if test "x$ac_cv_func_fsync" = xyes
-then :
-  printf "%s\n" "#define HAVE_FSYNC 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
-if test "x$ac_cv_func_getrlimit" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETRLIMIT 1" >>confdefs.h
-
-fi
-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
-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
-ac_fn_c_check_func "$LINENO" "vfork" "ac_cv_func_vfork"
-if test "x$ac_cv_func_vfork" = xyes
-then :
-  printf "%s\n" "#define HAVE_VFORK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage"
-if test "x$ac_cv_func_getrusage" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETRUSAGE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "sysconf" "ac_cv_func_sysconf"
-if test "x$ac_cv_func_sysconf" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "profil" "ac_cv_func_profil"
-if test "x$ac_cv_func_profil" = xyes
-then :
-  printf "%s\n" "#define HAVE_PROFIL 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getenv_r" "ac_cv_func_getenv_r"
-if test "x$ac_cv_func_getenv_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETENV_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
-if test "x$ac_cv_func_clock_gettime" = xyes
-then :
-  printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ctime_r" "ac_cv_func_ctime_r"
-if test "x$ac_cv_func_ctime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_CTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "asctime_r" "ac_cv_func_asctime_r"
-if test "x$ac_cv_func_asctime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_ASCTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
-if test "x$ac_cv_func_gmtime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
-if test "x$ac_cv_func_localtime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h
-
+  # what else we need to disable?
 fi
 
-
-{ 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;
-}
+for ac_func in socket bcopy bzero memcpy memset inet_aton inet_pton \
+	       snprintf vsprintf rename ftruncate flock fsync \
+	       getrlimit setrlimit strerror vfork \
+	       getrusage sysconf profil getenv_r clock_gettime \
+          ctime_r asctime_r gmtime_r localtime_r
+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
-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
+done
 
-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_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 :
   ac_have_decl=1
-else $as_nop
+else
   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
 
-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
+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
 
 fi
+done
 
-{ 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
+{ $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
 
     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.  */
-#include <string.h>
+$ac_includes_default
 int
-main (void)
+main ()
 {
 
 	  char buf[100];
@@ -8307,30 +7285,58 @@ main (void)
   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 conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
     fi
 
 fi
-{ 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; }
+{ $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; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
 
-printf "%s\n" "#define STRERROR_R_CHAR_P 1" >>confdefs.h
+$as_echo "#define STRERROR_R_CHAR_P 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
+if test "x$ac_cv_func_getopt" = xyes; then :
+  $as_echo "#define HAVE_GETOPT 1" >>confdefs.h
 
-else $as_nop
+else
   case " $LIBOBJS " in
   *" getopt.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
@@ -8340,75 +7346,55 @@ esac
 fi
 
 
-  ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default
-"
-if test "x$ac_cv_type_pid_t" = xyes
-then :
-
-else $as_nop
-                                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-          #if defined _WIN64 && !defined __CYGWIN__
-          LLP64
-          #endif
-
-int
-main (void)
-{
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
 
-  ;
-  return 0;
-}
+else
 
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_pid_type='int'
-else $as_nop
-  ac_pid_type='__int64'
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
-printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h
-
 
 fi
 
+for ac_header in vfork.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
+if test "x$ac_cv_header_vfork_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VFORK_H 1
+_ACEOF
 
+fi
 
-ac_func=
-for ac_item in $ac_func_c_list
-do
-  if test $ac_func; then
-    ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func
-    if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then
-      echo "#define $ac_item 1" >> confdefs.h
-    fi
-    ac_func=
-  else
-    ac_func=$ac_item
-  fi
 done
 
+for ac_func in fork vfork
+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
 
+fi
+done
 
 if test "x$ac_cv_func_fork" = xyes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
-printf %s "checking for working fork... " >&6; }
-if test ${ac_cv_func_fork_works+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
+$as_echo_n "checking for working fork... " >&6; }
+if ${ac_cv_func_fork_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_fork_works=cross
-else $as_nop
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main (void)
+main ()
 {
 
 	  /* By Ruediger Kuhlmann. */
@@ -8418,10 +7404,9 @@ main (void)
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_fork_works=yes
-else $as_nop
+else
   ac_cv_func_fork_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8429,8 +7414,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
-printf "%s\n" "$ac_cv_func_fork_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
+$as_echo "$ac_cv_func_fork_works" >&6; }
 
 else
   ac_cv_func_fork_works=$ac_cv_func_fork
@@ -8445,37 +7430,27 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
-printf "%s\n" "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
-printf %s "checking for working vfork... " >&6; }
-if test ${ac_cv_func_vfork_works+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
+$as_echo_n "checking for working vfork... " >&6; }
+if ${ac_cv_func_vfork_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_vfork_works=cross
-else $as_nop
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Thanks to Paul Eggert for this test.  */
 $ac_includes_default
-#include <signal.h>
 #include <sys/wait.h>
 #ifdef HAVE_VFORK_H
 # include <vfork.h>
 #endif
-
-static void
-do_nothing (int sig)
-{
-  (void) sig;
-}
-
 /* On some sparc systems, changes by the child to local and incoming
    argument registers are propagated back to the parent.  The compiler
    is told about this with #include <vfork.h>, but some compilers
@@ -8483,7 +7458,11 @@ do_nothing (int sig)
    static variable whose address is put into a register that is
    clobbered by the vfork.  */
 static void
+#ifdef __cplusplus
 sparc_address_test (int arg)
+# else
+sparc_address_test (arg) int arg;
+#endif
 {
   static pid_t child;
   if (!child) {
@@ -8501,18 +7480,13 @@ sparc_address_test (int arg)
 }
 
 int
-main (void)
+main ()
 {
   pid_t parent = getpid ();
   pid_t child;
 
   sparc_address_test (0);
 
-  /* On Solaris 2.4, changes by the child to the signal handler
-     also munge signal handlers in the parent.  To detect this,
-     start by putting the parent's handler in a known state.  */
-  signal (SIGTERM, SIG_DFL);
-
   child = vfork ();
 
   if (child == 0) {
@@ -8534,10 +7508,6 @@ main (void)
 	|| p != p5 || p != p6 || p != p7)
       _exit(1);
 
-    /* Alter the child's signal handler.  */
-    if (signal (SIGTERM, do_nothing) != SIG_DFL)
-      _exit(1);
-
     /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
        from child file descriptors.  If the child closes a descriptor
        before it execs or exits, this munges the parent's descriptor
@@ -8553,9 +7523,6 @@ main (void)
 	 /* Was there some problem with vforking?  */
 	 child < 0
 
-	 /* Did the child munge the parent's signal handler?  */
-	 || signal (SIGTERM, SIG_DFL) != SIG_DFL
-
 	 /* Did the child fail?  (This shouldn't happen.)  */
 	 || status
 
@@ -8568,10 +7535,9 @@ main (void)
   }
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_vfork_works=yes
-else $as_nop
+else
   ac_cv_func_vfork_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -8579,37 +7545,36 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
-printf "%s\n" "$ac_cv_func_vfork_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
+$as_echo "$ac_cv_func_vfork_works" >&6; }
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=$ac_cv_func_vfork
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
-printf "%s\n" "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
 fi
 
 if test "x$ac_cv_func_vfork_works" = xyes; then
 
-printf "%s\n" "#define HAVE_WORKING_VFORK 1" >>confdefs.h
+$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
 
 else
 
-printf "%s\n" "#define vfork fork" >>confdefs.h
+$as_echo "#define vfork fork" >>confdefs.h
 
 fi
 if test "x$ac_cv_func_fork_works" = xyes; then
 
-printf "%s\n" "#define HAVE_WORKING_FORK 1" >>confdefs.h
+$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -ldbm" >&5
-printf %s "checking for main in -ldbm... " >&6; }
-if test ${ac_cv_lib_dbm_main+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldbm" >&5
+$as_echo_n "checking for main in -ldbm... " >&6; }
+if ${ac_cv_lib_dbm_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8617,39 +7582,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 
 int
-main (void)
+main ()
 {
 return main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dbm_main=yes
-else $as_nop
+else
   ac_cv_lib_dbm_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbm_main" >&5
-printf "%s\n" "$ac_cv_lib_dbm_main" >&6; }
-if test "x$ac_cv_lib_dbm_main" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBDBM 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbm_main" >&5
+$as_echo "$ac_cv_lib_dbm_main" >&6; }
+if test "x$ac_cv_lib_dbm_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDBM 1
+_ACEOF
 
   LIBS="-ldbm $LIBS"
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lndbm" >&5
-printf %s "checking for main in -lndbm... " >&6; }
-if test ${ac_cv_lib_ndbm_main+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lndbm" >&5
+$as_echo_n "checking for main in -lndbm... " >&6; }
+if ${ac_cv_lib_ndbm_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lndbm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8657,28 +7621,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 
 int
-main (void)
+main ()
 {
 return main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ndbm_main=yes
-else $as_nop
+else
   ac_cv_lib_ndbm_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ndbm_main" >&5
-printf "%s\n" "$ac_cv_lib_ndbm_main" >&6; }
-if test "x$ac_cv_lib_ndbm_main" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBNDBM 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ndbm_main" >&5
+$as_echo "$ac_cv_lib_ndbm_main" >&6; }
+if test "x$ac_cv_lib_ndbm_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNDBM 1
+_ACEOF
 
   LIBS="-lndbm $LIBS"
 
@@ -8687,19 +7651,23 @@ fi
 
 # we don't need sqlite to be added to $LIBS, not yet at least
 saved_libs="$LIBS"
-ac_fn_c_check_header_compile "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlite3_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SQLITE3_H 1" >>confdefs.h
+for ac_header in sqlite3.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlite3_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLITE3_H 1
+_ACEOF
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_config in -lsqlite3" >&5
-printf %s "checking for sqlite3_config in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_config+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_config in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_config in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_config+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8708,30 +7676,33 @@ 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 sqlite3_config ();
 int
-main (void)
+main ()
 {
 return sqlite3_config ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_config=yes
-else $as_nop
+else
   ac_cv_lib_sqlite3_sqlite3_config=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_config" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_config" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_config" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBSQLITE3 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_config" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_config" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_config" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSQLITE3 1
+_ACEOF
 
   LIBS="-lsqlite3 $LIBS"
 
@@ -8746,12 +7717,11 @@ else
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
-printf %s "checking for library containing getaddrinfo... " >&6; }
-if test ${ac_cv_search_getaddrinfo+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
+$as_echo_n "checking for library containing getaddrinfo... " >&6; }
+if ${ac_cv_search_getaddrinfo+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8759,61 +7729,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 getaddrinfo ();
 int
-main (void)
+main ()
 {
 return getaddrinfo ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' socket
-do
+for ac_lib in '' socket; 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_getaddrinfo=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_getaddrinfo+y}
-then :
+  if ${ac_cv_search_getaddrinfo+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_getaddrinfo+y}
-then :
+if ${ac_cv_search_getaddrinfo+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_getaddrinfo=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
-printf "%s\n" "$ac_cv_search_getaddrinfo" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getaddrinfo" >&5
+$as_echo "$ac_cv_search_getaddrinfo" >&6; }
 ac_res=$ac_cv_search_getaddrinfo
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h
+$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
 
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
-printf %s "checking for library containing crypt... " >&6; }
-if test ${ac_cv_search_crypt+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
+$as_echo_n "checking for library containing crypt... " >&6; }
+if ${ac_cv_search_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8821,107 +7788,104 @@ 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 crypt ();
 int
-main (void)
+main ()
 {
 return crypt ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' crypt
-do
+for ac_lib in '' crypt; 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_crypt=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_crypt+y}
-then :
+  if ${ac_cv_search_crypt+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_crypt+y}
-then :
+if ${ac_cv_search_crypt+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_crypt=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5
-printf "%s\n" "$ac_cv_search_crypt" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5
+$as_echo "$ac_cv_search_crypt" >&6; }
 ac_res=$ac_cv_search_crypt
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
 
 fi
 
 
 if test "x$multiprograms" = "xno"; then
 
-printf "%s\n" "#define NoMultiProgram 1" >>confdefs.h
+$as_echo "#define NoMultiProgram 1" >>confdefs.h
 
 fi
 
 if test "x$concurrency" = "xno"; then
 
-printf "%s\n" "#define NoConcurrent 1" >>confdefs.h
+$as_echo "#define NoConcurrent 1" >>confdefs.h
 
 fi
 
 if test "x$coniconc" != "xyes"; then
 
-printf "%s\n" "#define NoConcurrentCOMPILER 1" >>confdefs.h
+$as_echo "#define NoConcurrentCOMPILER 1" >>confdefs.h
 
 fi
 
 if test "x$pattern" = "xno"; then
 
-printf "%s\n" "#define NoPattern 1" >>confdefs.h
+$as_echo "#define NoPattern 1" >>confdefs.h
 
 fi
 
 if test "x$ovld" = "xyes"; then
 
-printf "%s\n" "#define OVLD 1" >>confdefs.h
+$as_echo "#define OVLD 1" >>confdefs.h
 
 fi
 #AM_CONDITIONAL([GRAPHICS], [test x$graphics = xyes])
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if zlib is wanted" >&5
-printf %s "checking if zlib is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if zlib is wanted" >&5
+$as_echo_n "checking if zlib is wanted... " >&6; }
 
 # Check whether --with-zlib was given.
-if test ${with_zlib+y}
-then :
+if test "${with_zlib+set}" = set; then :
   withval=$with_zlib; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          zlib_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -8970,18 +7934,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in zlib.h
+	for ac_header in zlib.h
 do :
-  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
+  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
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -9078,25 +8044,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in zlib.h
+        for ac_header in zlib.h
 do :
-  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
+  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
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inflateEnd" >&5
-printf %s "checking for library containing inflateEnd... " >&6; }
-if test ${ac_cv_search_inflateEnd+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflateEnd" >&5
+$as_echo_n "checking for library containing inflateEnd... " >&6; }
+if ${ac_cv_search_inflateEnd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9104,57 +8071,55 @@ 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 inflateEnd ();
 int
-main (void)
+main ()
 {
 return inflateEnd ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' z
-do
+for ac_lib in '' z; 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_inflateEnd=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_inflateEnd+y}
-then :
+  if ${ac_cv_search_inflateEnd+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_inflateEnd+y}
-then :
+if ${ac_cv_search_inflateEnd+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_inflateEnd=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflateEnd" >&5
-printf "%s\n" "$ac_cv_search_inflateEnd" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflateEnd" >&5
+$as_echo "$ac_cv_search_inflateEnd" >&6; }
 ac_res=$ac_cv_search_inflateEnd
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libz=yes
 	      if test -n HAVE_LIBZ ; then
 
-printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h
+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libz=no
 
 
@@ -9163,10 +8128,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib z in (${zlib_HOME})" >&5
-printf %s "checking checking lib z in (${zlib_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib z in (${zlib_HOME})" >&5
+$as_echo_n "checking checking lib z in (${zlib_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -9178,10 +8143,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib z in (${zlib_HOME})" >&5
-printf %s "checking checking lib z in (${zlib_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib z in (${zlib_HOME})" >&5
+$as_echo_n "checking checking lib z in (${zlib_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -9198,25 +8163,24 @@ if ! test "x$graphics" = "xno"; then
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if xlib is wanted" >&5
-printf %s "checking if xlib is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if xlib is wanted" >&5
+$as_echo_n "checking if xlib is wanted... " >&6; }
 
 # Check whether --with-xlib was given.
-if test ${with_xlib+y}
-then :
+if test "${with_xlib+set}" = set; then :
   withval=$with_xlib; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          xlib_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -9284,21 +8248,21 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in X11/Xlib.h X11/Xos.h X11/Xutil.h X11/Xatom.h
+	for ac_header in X11/Xlib.h X11/Xos.h X11/Xutil.h X11/Xatom.h
 do :
-  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 :
+  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 `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -9395,28 +8359,27 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in X11/Xlib.h X11/Xos.h X11/Xutil.h X11/Xatom.h
+        for ac_header in X11/Xlib.h X11/Xos.h X11/Xutil.h X11/Xatom.h
 do :
-  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 :
+  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 `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing XAllocColorCells" >&5
-printf %s "checking for library containing XAllocColorCells... " >&6; }
-if test ${ac_cv_search_XAllocColorCells+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing XAllocColorCells" >&5
+$as_echo_n "checking for library containing XAllocColorCells... " >&6; }
+if ${ac_cv_search_XAllocColorCells+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9424,57 +8387,55 @@ 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 XAllocColorCells ();
 int
-main (void)
+main ()
 {
 return XAllocColorCells ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' X11
-do
+for ac_lib in '' X11; 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_XAllocColorCells=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_XAllocColorCells+y}
-then :
+  if ${ac_cv_search_XAllocColorCells+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_XAllocColorCells+y}
-then :
+if ${ac_cv_search_XAllocColorCells+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_XAllocColorCells=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_XAllocColorCells" >&5
-printf "%s\n" "$ac_cv_search_XAllocColorCells" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_XAllocColorCells" >&5
+$as_echo "$ac_cv_search_XAllocColorCells" >&6; }
 ac_res=$ac_cv_search_XAllocColorCells
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libX11=yes
 	      if test -n HAVE_LIBX11 ; then
 
-printf "%s\n" "#define HAVE_LIBX11 1" >>confdefs.h
+$as_echo "#define HAVE_LIBX11 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libX11=no
 
 
@@ -9483,10 +8444,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib X11 in (${XLIB_HOME})" >&5
-printf %s "checking checking lib X11 in (${XLIB_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib X11 in (${XLIB_HOME})" >&5
+$as_echo_n "checking checking lib X11 in (${XLIB_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -9498,10 +8459,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib X11 in (${XLIB_HOME})" >&5
-printf %s "checking checking lib X11 in (${XLIB_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib X11 in (${XLIB_HOME})" >&5
+$as_echo_n "checking checking lib X11 in (${XLIB_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -9518,25 +8479,24 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if freetype is wanted" >&5
-printf %s "checking if freetype is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if freetype is wanted" >&5
+$as_echo_n "checking if freetype is wanted... " >&6; }
 
 # Check whether --with-freetype was given.
-if test ${with_freetype+y}
-then :
+if test "${with_freetype+set}" = set; then :
   withval=$with_freetype; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          freetype_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -9612,18 +8572,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in freetype/fttypes.h
+	for ac_header in freetype/fttypes.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "freetype/fttypes.h" "ac_cv_header_freetype_fttypes_h" "$ac_includes_default"
-if test "x$ac_cv_header_freetype_fttypes_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_FREETYPE_FTTYPES_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "freetype/fttypes.h" "ac_cv_header_freetype_fttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_freetype_fttypes_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FREETYPE_FTTYPES_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -9720,25 +8682,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in freetype/fttypes.h
+        for ac_header in freetype/fttypes.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "freetype/fttypes.h" "ac_cv_header_freetype_fttypes_h" "$ac_includes_default"
-if test "x$ac_cv_header_freetype_fttypes_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_FREETYPE_FTTYPES_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "freetype/fttypes.h" "ac_cv_header_freetype_fttypes_h" "$ac_includes_default"
+if test "x$ac_cv_header_freetype_fttypes_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FREETYPE_FTTYPES_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing FT_Open_Face" >&5
-printf %s "checking for library containing FT_Open_Face... " >&6; }
-if test ${ac_cv_search_FT_Open_Face+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing FT_Open_Face" >&5
+$as_echo_n "checking for library containing FT_Open_Face... " >&6; }
+if ${ac_cv_search_FT_Open_Face+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9746,57 +8709,55 @@ 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 FT_Open_Face ();
 int
-main (void)
+main ()
 {
 return FT_Open_Face ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' freetype
-do
+for ac_lib in '' freetype; 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_FT_Open_Face=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_FT_Open_Face+y}
-then :
+  if ${ac_cv_search_FT_Open_Face+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_FT_Open_Face+y}
-then :
+if ${ac_cv_search_FT_Open_Face+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_FT_Open_Face=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_FT_Open_Face" >&5
-printf "%s\n" "$ac_cv_search_FT_Open_Face" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_FT_Open_Face" >&5
+$as_echo "$ac_cv_search_FT_Open_Face" >&6; }
 ac_res=$ac_cv_search_FT_Open_Face
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libfreetype=yes
 	      if test -n HAVE_LIBFREETYPE ; then
 
-printf "%s\n" "#define HAVE_LIBFREETYPE 1" >>confdefs.h
+$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libfreetype=no
 
 
@@ -9805,10 +8766,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib freetype in (${freetype_HOME})" >&5
-printf %s "checking checking lib freetype in (${freetype_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib freetype in (${freetype_HOME})" >&5
+$as_echo_n "checking checking lib freetype in (${freetype_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -9820,10 +8781,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib freetype in (${freetype_HOME})" >&5
-printf %s "checking checking lib freetype in (${freetype_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib freetype in (${freetype_HOME})" >&5
+$as_echo_n "checking checking lib freetype in (${freetype_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -9840,25 +8801,24 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Xft is wanted" >&5
-printf %s "checking if Xft is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xft is wanted" >&5
+$as_echo_n "checking if Xft is wanted... " >&6; }
 
 # Check whether --with-Xft was given.
-if test ${with_Xft+y}
-then :
+if test "${with_Xft+set}" = set; then :
   withval=$with_Xft; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          Xft_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -9907,18 +8867,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in X11/Xft/Xft.h
+	for ac_header in X11/Xft/Xft.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_X11_XFT_XFT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_X11_XFT_XFT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -10015,25 +8977,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in X11/Xft/Xft.h
+        for ac_header in X11/Xft/Xft.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_X11_XFT_XFT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_X11_XFT_XFT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing XftFontOpenPattern" >&5
-printf %s "checking for library containing XftFontOpenPattern... " >&6; }
-if test ${ac_cv_search_XftFontOpenPattern+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing XftFontOpenPattern" >&5
+$as_echo_n "checking for library containing XftFontOpenPattern... " >&6; }
+if ${ac_cv_search_XftFontOpenPattern+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10041,57 +9004,55 @@ 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 XftFontOpenPattern ();
 int
-main (void)
+main ()
 {
 return XftFontOpenPattern ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' Xft
-do
+for ac_lib in '' Xft; 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_XftFontOpenPattern=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_XftFontOpenPattern+y}
-then :
+  if ${ac_cv_search_XftFontOpenPattern+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_XftFontOpenPattern+y}
-then :
+if ${ac_cv_search_XftFontOpenPattern+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_XftFontOpenPattern=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_XftFontOpenPattern" >&5
-printf "%s\n" "$ac_cv_search_XftFontOpenPattern" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_XftFontOpenPattern" >&5
+$as_echo "$ac_cv_search_XftFontOpenPattern" >&6; }
 ac_res=$ac_cv_search_XftFontOpenPattern
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libXft=yes
 	      if test -n HAVE_LIBXFT ; then
 
-printf "%s\n" "#define HAVE_LIBXFT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXFT 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libXft=no
 
 
@@ -10100,10 +9061,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib Xft in (${Xft_HOME})" >&5
-printf %s "checking checking lib Xft in (${Xft_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib Xft in (${Xft_HOME})" >&5
+$as_echo_n "checking checking lib Xft in (${Xft_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -10115,10 +9076,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib Xft in (${Xft_HOME})" >&5
-printf %s "checking checking lib Xft in (${Xft_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib Xft in (${Xft_HOME})" >&5
+$as_echo_n "checking checking lib Xft in (${Xft_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -10132,25 +9093,24 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if jpeg is wanted" >&5
-printf %s "checking if jpeg is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jpeg is wanted" >&5
+$as_echo_n "checking if jpeg is wanted... " >&6; }
 
 # Check whether --with-jpeg was given.
-if test ${with_jpeg+y}
-then :
+if test "${with_jpeg+set}" = set; then :
   withval=$with_jpeg; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          jpeg_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -10199,21 +9159,21 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in jpeglib.h jerror.h
+	for ac_header in jpeglib.h jerror.h
 do :
-  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 :
+  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 `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -10310,28 +9270,27 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in jpeglib.h jerror.h
+        for ac_header in jpeglib.h jerror.h
 do :
-  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 :
+  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 `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing jpeg_destroy_decompress" >&5
-printf %s "checking for library containing jpeg_destroy_decompress... " >&6; }
-if test ${ac_cv_search_jpeg_destroy_decompress+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing jpeg_destroy_decompress" >&5
+$as_echo_n "checking for library containing jpeg_destroy_decompress... " >&6; }
+if ${ac_cv_search_jpeg_destroy_decompress+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10339,57 +9298,55 @@ 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 jpeg_destroy_decompress ();
 int
-main (void)
+main ()
 {
 return jpeg_destroy_decompress ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' jpeg
-do
+for ac_lib in '' jpeg; 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_jpeg_destroy_decompress=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_jpeg_destroy_decompress+y}
-then :
+  if ${ac_cv_search_jpeg_destroy_decompress+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_jpeg_destroy_decompress+y}
-then :
+if ${ac_cv_search_jpeg_destroy_decompress+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_jpeg_destroy_decompress=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_jpeg_destroy_decompress" >&5
-printf "%s\n" "$ac_cv_search_jpeg_destroy_decompress" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_jpeg_destroy_decompress" >&5
+$as_echo "$ac_cv_search_jpeg_destroy_decompress" >&6; }
 ac_res=$ac_cv_search_jpeg_destroy_decompress
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libjpeg=yes
 	      if test -n HAVE_LIBJPEG ; then
 
-printf "%s\n" "#define HAVE_LIBJPEG 1" >>confdefs.h
+$as_echo "#define HAVE_LIBJPEG 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libjpeg=no
 
 
@@ -10398,10 +9355,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib jpeg in (${jpeg_HOME})" >&5
-printf %s "checking checking lib jpeg in (${jpeg_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib jpeg in (${jpeg_HOME})" >&5
+$as_echo_n "checking checking lib jpeg in (${jpeg_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -10413,10 +9370,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib jpeg in (${jpeg_HOME})" >&5
-printf %s "checking checking lib jpeg in (${jpeg_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib jpeg in (${jpeg_HOME})" >&5
+$as_echo_n "checking checking lib jpeg in (${jpeg_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -10430,25 +9387,24 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if png is wanted" >&5
-printf %s "checking if png is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if png is wanted" >&5
+$as_echo_n "checking if png is wanted... " >&6; }
 
 # Check whether --with-png was given.
-if test ${with_png+y}
-then :
+if test "${with_png+set}" = set; then :
   withval=$with_png; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          png_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -10497,18 +9453,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in png.h
+	for ac_header in png.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-if test "x$ac_cv_header_png_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_PNG_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+if test "x$ac_cv_header_png_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PNG_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -10605,25 +9563,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in png.h
+        for ac_header in png.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-if test "x$ac_cv_header_png_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_PNG_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+if test "x$ac_cv_header_png_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PNG_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing png_read_image" >&5
-printf %s "checking for library containing png_read_image... " >&6; }
-if test ${ac_cv_search_png_read_image+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing png_read_image" >&5
+$as_echo_n "checking for library containing png_read_image... " >&6; }
+if ${ac_cv_search_png_read_image+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -10631,57 +9590,55 @@ 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 png_read_image ();
 int
-main (void)
+main ()
 {
 return png_read_image ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' png
-do
+for ac_lib in '' png; 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_png_read_image=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_png_read_image+y}
-then :
+  if ${ac_cv_search_png_read_image+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_png_read_image+y}
-then :
+if ${ac_cv_search_png_read_image+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_png_read_image=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_png_read_image" >&5
-printf "%s\n" "$ac_cv_search_png_read_image" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_png_read_image" >&5
+$as_echo "$ac_cv_search_png_read_image" >&6; }
 ac_res=$ac_cv_search_png_read_image
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libpng=yes
 	      if test -n HAVE_LIBPNG ; then
 
-printf "%s\n" "#define HAVE_LIBPNG 1" >>confdefs.h
+$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libpng=no
 
 
@@ -10690,10 +9647,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib png in (${png_HOME})" >&5
-printf %s "checking checking lib png in (${png_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib png in (${png_HOME})" >&5
+$as_echo_n "checking checking lib png in (${png_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -10705,10 +9662,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib png in (${png_HOME})" >&5
-printf %s "checking checking lib png in (${png_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib png in (${png_HOME})" >&5
+$as_echo_n "checking checking lib png in (${png_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -10727,33 +9684,32 @@ fi
           cv_libGL=yes
 	  cv_libGLU=yes
 	  cv_opengl=yes
-	  printf "%s\n" "#define HAVE_LIBGL 1" >>confdefs.h
+	  $as_echo "#define HAVE_LIBGL 1" >>confdefs.h
 
-	  printf "%s\n" "#define HAVE_LIBGLU 1" >>confdefs.h
+	  $as_echo "#define HAVE_LIBGLU 1" >>confdefs.h
 
        else
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if opengl is wanted" >&5
-printf %s "checking if opengl is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if opengl is wanted" >&5
+$as_echo_n "checking if opengl is wanted... " >&6; }
 
 # Check whether --with-opengl was given.
-if test ${with_opengl+y}
-then :
+if test "${with_opengl+set}" = set; then :
   withval=$with_opengl; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          opengl_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -10850,27 +9806,26 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-         for ac_header in GL/gl.h GL/glu.h
+  for ac_header in GL/gl.h GL/glu.h
 do :
-  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 :
+  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 `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-else $as_nop
+else
   cv_opengl_h=no
 fi
 
 done
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glAccum in -lGL" >&5
-printf %s "checking for glAccum in -lGL... " >&6; }
-if test ${ac_cv_lib_GL_glAccum+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glAccum in -lGL" >&5
+$as_echo_n "checking for glAccum in -lGL... " >&6; }
+if ${ac_cv_lib_GL_glAccum+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGL  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10879,40 +9834,40 @@ 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 glAccum ();
 int
-main (void)
+main ()
 {
 return glAccum ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_GL_glAccum=yes
-else $as_nop
+else
   ac_cv_lib_GL_glAccum=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glAccum" >&5
-printf "%s\n" "$ac_cv_lib_GL_glAccum" >&6; }
-if test "x$ac_cv_lib_GL_glAccum" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glAccum" >&5
+$as_echo "$ac_cv_lib_GL_glAccum" >&6; }
+if test "x$ac_cv_lib_GL_glAccum" = xyes; then :
   cv_libGL=yes
-else $as_nop
+else
   cv_libGL=no
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5
-printf %s "checking for gluBeginCurve in -lGLU... " >&6; }
-if test ${ac_cv_lib_GLU_gluBeginCurve+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5
+$as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; }
+if ${ac_cv_lib_GLU_gluBeginCurve+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGLU -lGL $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10921,44 +9876,45 @@ 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 gluBeginCurve ();
 int
-main (void)
+main ()
 {
 return gluBeginCurve ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_GLU_gluBeginCurve=yes
-else $as_nop
+else
   ac_cv_lib_GLU_gluBeginCurve=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5
-printf "%s\n" "$ac_cv_lib_GLU_gluBeginCurve" >&6; }
-if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5
+$as_echo "$ac_cv_lib_GLU_gluBeginCurve" >&6; }
+if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes; then :
   cv_libGLU=yes
-else $as_nop
+else
   cv_libGLU=no
 fi
 
 
   if test "x$cv_libX11" = "xyes" ; then
-     ac_fn_c_check_header_compile "$LINENO" "GL/glx.h" "ac_cv_header_GL_glx_h" "$ac_includes_default"
-if test "x$ac_cv_header_GL_glx_h" = xyes
-then :
+     ac_fn_c_check_header_mongrel "$LINENO" "GL/glx.h" "ac_cv_header_GL_glx_h" "$ac_includes_default"
+if test "x$ac_cv_header_GL_glx_h" = xyes; then :
   cv_glx_h=yes
-else $as_nop
+else
   cv_glx_h=no
 fi
 
+
   else
     cv_glx_h="yes"
   fi
@@ -10972,12 +9928,11 @@ fi
 	        GL_CFLAGS=
 	        GL_LDFLAGS=
        fi
-  		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
-printf %s "checking for cos in -lm... " >&6; }
-if test ${ac_cv_lib_m_cos+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+  		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if ${ac_cv_lib_m_cos+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10986,41 +9941,43 @@ 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 cos ();
 int
-main (void)
+main ()
 {
 return cos ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_cos=yes
-else $as_nop
+else
   ac_cv_lib_m_cos=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
-printf "%s\n" "$ac_cv_lib_m_cos" >&6; }
-if test "x$ac_cv_lib_m_cos" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
 
   LIBS="-lm $LIBS"
 
 fi
 
-  		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glAccum in -lGL" >&5
-printf %s "checking for glAccum in -lGL... " >&6; }
-if test ${ac_cv_lib_GL_glAccum+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+  		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glAccum in -lGL" >&5
+$as_echo_n "checking for glAccum in -lGL... " >&6; }
+if ${ac_cv_lib_GL_glAccum+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGL  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11029,41 +9986,43 @@ 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 glAccum ();
 int
-main (void)
+main ()
 {
 return glAccum ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_GL_glAccum=yes
-else $as_nop
+else
   ac_cv_lib_GL_glAccum=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glAccum" >&5
-printf "%s\n" "$ac_cv_lib_GL_glAccum" >&6; }
-if test "x$ac_cv_lib_GL_glAccum" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBGL 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glAccum" >&5
+$as_echo "$ac_cv_lib_GL_glAccum" >&6; }
+if test "x$ac_cv_lib_GL_glAccum" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGL 1
+_ACEOF
 
   LIBS="-lGL $LIBS"
 
 fi
 
-  		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5
-printf %s "checking for gluBeginCurve in -lGLU... " >&6; }
-if test ${ac_cv_lib_GLU_gluBeginCurve+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+  		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5
+$as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; }
+if ${ac_cv_lib_GLU_gluBeginCurve+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGLU  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11072,30 +10031,33 @@ 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 gluBeginCurve ();
 int
-main (void)
+main ()
 {
 return gluBeginCurve ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_GLU_gluBeginCurve=yes
-else $as_nop
+else
   ac_cv_lib_GLU_gluBeginCurve=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5
-printf "%s\n" "$ac_cv_lib_GLU_gluBeginCurve" >&6; }
-if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBGLU 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5
+$as_echo "$ac_cv_lib_GLU_gluBeginCurve" >&6; }
+if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGLU 1
+_ACEOF
 
   LIBS="-lGLU $LIBS"
 
@@ -11113,10 +10075,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib OpenGL" >&5
-printf %s "checking checking lib OpenGL... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib OpenGL" >&5
+$as_echo_n "checking checking lib OpenGL... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
   fi
   ac_ext=c
@@ -11131,27 +10093,160 @@ fi
        # A C++ compiler must be present and usable
        if test "x$CXX" = "xg++" -a "x$GXX" = "xyes"; then
 
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_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; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_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
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+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 :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_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
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+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 :
+
+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 $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ftgl is wanted" >&5
-printf %s "checking if ftgl is wanted... " >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ftgl is wanted" >&5
+$as_echo_n "checking if ftgl is wanted... " >&6; }
 
 # Check whether --with-ftgl was given.
-if test ${with_ftgl+y}
-then :
+if test "${with_ftgl+set}" = set; then :
   withval=$with_ftgl; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          ftgl_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -11200,18 +10295,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in FTGL/FTGLExtrdFont.h
+	for ac_header in FTGL/FTGLExtrdFont.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "FTGL/FTGLExtrdFont.h" "ac_cv_header_FTGL_FTGLExtrdFont_h" "$ac_includes_default"
-if test "x$ac_cv_header_FTGL_FTGLExtrdFont_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_FTGL_FTGLEXTRDFONT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "FTGL/FTGLExtrdFont.h" "ac_cv_header_FTGL_FTGLExtrdFont_h" "$ac_includes_default"
+if test "x$ac_cv_header_FTGL_FTGLExtrdFont_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FTGL_FTGLEXTRDFONT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -11308,82 +10405,82 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in FTGL/FTGLExtrdFont.h
+        for ac_header in FTGL/FTGLExtrdFont.h
 do :
-  ac_fn_cxx_check_header_compile "$LINENO" "FTGL/FTGLExtrdFont.h" "ac_cv_header_FTGL_FTGLExtrdFont_h" "$ac_includes_default"
-if test "x$ac_cv_header_FTGL_FTGLExtrdFont_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_FTGL_FTGLEXTRDFONT_H 1" >>confdefs.h
+  ac_fn_cxx_check_header_mongrel "$LINENO" "FTGL/FTGLExtrdFont.h" "ac_cv_header_FTGL_FTGLExtrdFont_h" "$ac_includes_default"
+if test "x$ac_cv_header_FTGL_FTGLExtrdFont_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FTGL_FTGLEXTRDFONT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing _ZN6FTFaceD2Ev" >&5
-printf %s "checking for library containing _ZN6FTFaceD2Ev... " >&6; }
-if test ${ac_cv_search__ZN6FTFaceD2Ev+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing _ZN6FTFaceD2Ev" >&5
+$as_echo_n "checking for library containing _ZN6FTFaceD2Ev... " >&6; }
+if ${ac_cv_search__ZN6FTFaceD2Ev+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-namespace conftest {
-  extern "C" int _ZN6FTFaceD2Ev ();
-}
+/* 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 _ZN6FTFaceD2Ev ();
 int
-main (void)
+main ()
 {
-return conftest::_ZN6FTFaceD2Ev ();
+return _ZN6FTFaceD2Ev ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ftgl
-do
+for ac_lib in '' ftgl; 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_cxx_try_link "$LINENO"
-then :
+  if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_search__ZN6FTFaceD2Ev=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search__ZN6FTFaceD2Ev+y}
-then :
+  if ${ac_cv_search__ZN6FTFaceD2Ev+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search__ZN6FTFaceD2Ev+y}
-then :
+if ${ac_cv_search__ZN6FTFaceD2Ev+:} false; then :
 
-else $as_nop
+else
   ac_cv_search__ZN6FTFaceD2Ev=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search__ZN6FTFaceD2Ev" >&5
-printf "%s\n" "$ac_cv_search__ZN6FTFaceD2Ev" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search__ZN6FTFaceD2Ev" >&5
+$as_echo "$ac_cv_search__ZN6FTFaceD2Ev" >&6; }
 ac_res=$ac_cv_search__ZN6FTFaceD2Ev
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libftgl=yes
 	      if test -n HAVE_LIBFTGL ; then
 
-printf "%s\n" "#define HAVE_LIBFTGL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBFTGL 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libftgl=no
 
 
@@ -11392,10 +10489,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib ftgl in (${ftgl_HOME})" >&5
-printf %s "checking checking lib ftgl in (${ftgl_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib ftgl in (${ftgl_HOME})" >&5
+$as_echo_n "checking checking lib ftgl in (${ftgl_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -11407,10 +10504,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib ftgl in (${ftgl_HOME})" >&5
-printf %s "checking checking lib ftgl in (${ftgl_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib ftgl in (${ftgl_HOME})" >&5
+$as_echo_n "checking checking lib ftgl in (${ftgl_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -11430,7 +10527,7 @@ fi
        fi
     else
 
-printf "%s\n" "#define NoGraphics3D 1" >>confdefs.h
+$as_echo "#define NoGraphics3D 1" >>confdefs.h
 
     fi
 
@@ -11472,10 +10569,10 @@ else
   echo "Building without graphics..."
   graphics3d=no
 
-printf "%s\n" "#define NoGraphics 1" >>confdefs.h
+$as_echo "#define NoGraphics 1" >>confdefs.h
 
 
-printf "%s\n" "#define NoGraphics3D 1" >>confdefs.h
+$as_echo "#define NoGraphics3D 1" >>confdefs.h
 
 fi
 
@@ -11501,19 +10598,18 @@ else
    else
       echo "No native coswitch for $unicon_host , switching to pthreadcoswitch..."
 
-printf "%s\n" "#define NoNativeCoswitch 1" >>confdefs.h
+$as_echo "#define NoNativeCoswitch 1" >>confdefs.h
 
       cp src/common/pthreadcoswitch.c src/common/rswitch.c
    fi
 fi
 
 if ! test "x$plugins" = "xno"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
-printf %s "checking for library containing dlopen... " >&6; }
-if test ${ac_cv_search_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -11521,63 +10617,60 @@ 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 dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' dl dld
-do
+for ac_lib in '' dl dld; 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_dlopen=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_dlopen+y}
-then :
+  if ${ac_cv_search_dlopen+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_dlopen+y}
-then :
+if ${ac_cv_search_dlopen+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_dlopen=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
-printf "%s\n" "$ac_cv_search_dlopen" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
 ac_res=$ac_cv_search_dlopen
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
 
 fi
 
 
   if test "x$ac_cv_search_dlopen" != "xno" ; then
     PLUGINS=upexample
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lxc_get_version in -llxc" >&5
-printf %s "checking for lxc_get_version in -llxc... " >&6; }
-if test ${ac_cv_lib_lxc_lxc_get_version+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lxc_get_version in -llxc" >&5
+$as_echo_n "checking for lxc_get_version in -llxc... " >&6; }
+if ${ac_cv_lib_lxc_lxc_get_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llxc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11586,29 +10679,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 lxc_get_version ();
 int
-main (void)
+main ()
 {
 return lxc_get_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_lxc_lxc_get_version=yes
-else $as_nop
+else
   ac_cv_lib_lxc_lxc_get_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lxc_lxc_get_version" >&5
-printf "%s\n" "$ac_cv_lib_lxc_lxc_get_version" >&6; }
-if test "x$ac_cv_lib_lxc_lxc_get_version" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lxc_lxc_get_version" >&5
+$as_echo "$ac_cv_lib_lxc_lxc_get_version" >&6; }
+if test "x$ac_cv_lib_lxc_lxc_get_version" = xyes; then :
   PLUGINS="$PLUGINS lxcunicon"
 fi
 
@@ -11616,7 +10710,7 @@ fi
   fi
 else
 
-printf "%s\n" "#define NoLoadFunc 1" >>confdefs.h
+$as_echo "#define NoLoadFunc 1" >>confdefs.h
 
   CFUNCTARGET="disabled"
 fi
@@ -11626,25 +10720,24 @@ fi
 if ! test "x$audio" = "xno"; then
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ogg is wanted" >&5
-printf %s "checking if ogg is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ogg is wanted" >&5
+$as_echo_n "checking if ogg is wanted... " >&6; }
 
 # Check whether --with-ogg was given.
-if test ${with_ogg+y}
-then :
+if test "${with_ogg+set}" = set; then :
   withval=$with_ogg; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          ogg_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -11693,18 +10786,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in ogg/ogg.h
+	for ac_header in ogg/ogg.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "ogg/ogg.h" "ac_cv_header_ogg_ogg_h" "$ac_includes_default"
-if test "x$ac_cv_header_ogg_ogg_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OGG_OGG_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "ogg/ogg.h" "ac_cv_header_ogg_ogg_h" "$ac_includes_default"
+if test "x$ac_cv_header_ogg_ogg_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OGG_OGG_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -11801,25 +10896,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in ogg/ogg.h
+        for ac_header in ogg/ogg.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "ogg/ogg.h" "ac_cv_header_ogg_ogg_h" "$ac_includes_default"
-if test "x$ac_cv_header_ogg_ogg_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OGG_OGG_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "ogg/ogg.h" "ac_cv_header_ogg_ogg_h" "$ac_includes_default"
+if test "x$ac_cv_header_ogg_ogg_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OGG_OGG_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing oggpack_write" >&5
-printf %s "checking for library containing oggpack_write... " >&6; }
-if test ${ac_cv_search_oggpack_write+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing oggpack_write" >&5
+$as_echo_n "checking for library containing oggpack_write... " >&6; }
+if ${ac_cv_search_oggpack_write+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -11827,57 +10923,55 @@ 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 oggpack_write ();
 int
-main (void)
+main ()
 {
 return oggpack_write ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ogg
-do
+for ac_lib in '' ogg; 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_oggpack_write=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_oggpack_write+y}
-then :
+  if ${ac_cv_search_oggpack_write+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_oggpack_write+y}
-then :
+if ${ac_cv_search_oggpack_write+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_oggpack_write=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_oggpack_write" >&5
-printf "%s\n" "$ac_cv_search_oggpack_write" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_oggpack_write" >&5
+$as_echo "$ac_cv_search_oggpack_write" >&6; }
 ac_res=$ac_cv_search_oggpack_write
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libogg=yes
 	      if test -n HAVE_LIBOGG ; then
 
-printf "%s\n" "#define HAVE_LIBOGG 1" >>confdefs.h
+$as_echo "#define HAVE_LIBOGG 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libogg=no
 
 
@@ -11886,10 +10980,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib ogg in (${ogg_HOME})" >&5
-printf %s "checking checking lib ogg in (${ogg_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib ogg in (${ogg_HOME})" >&5
+$as_echo_n "checking checking lib ogg in (${ogg_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -11901,10 +10995,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib ogg in (${ogg_HOME})" >&5
-printf %s "checking checking lib ogg in (${ogg_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib ogg in (${ogg_HOME})" >&5
+$as_echo_n "checking checking lib ogg in (${ogg_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -11957,18 +11051,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in vorbis/codec.h
+	for ac_header in vorbis/codec.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default"
-if test "x$ac_cv_header_vorbis_codec_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_VORBIS_CODEC_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default"
+if test "x$ac_cv_header_vorbis_codec_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VORBIS_CODEC_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -12065,25 +11161,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in vorbis/codec.h
+        for ac_header in vorbis/codec.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default"
-if test "x$ac_cv_header_vorbis_codec_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_VORBIS_CODEC_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default"
+if test "x$ac_cv_header_vorbis_codec_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VORBIS_CODEC_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing vorbis_info_init" >&5
-printf %s "checking for library containing vorbis_info_init... " >&6; }
-if test ${ac_cv_search_vorbis_info_init+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing vorbis_info_init" >&5
+$as_echo_n "checking for library containing vorbis_info_init... " >&6; }
+if ${ac_cv_search_vorbis_info_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -12091,57 +11188,55 @@ 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 vorbis_info_init ();
 int
-main (void)
+main ()
 {
 return vorbis_info_init ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' vorbis
-do
+for ac_lib in '' vorbis; 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_vorbis_info_init=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_vorbis_info_init+y}
-then :
+  if ${ac_cv_search_vorbis_info_init+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_vorbis_info_init+y}
-then :
+if ${ac_cv_search_vorbis_info_init+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_vorbis_info_init=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_vorbis_info_init" >&5
-printf "%s\n" "$ac_cv_search_vorbis_info_init" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_vorbis_info_init" >&5
+$as_echo "$ac_cv_search_vorbis_info_init" >&6; }
 ac_res=$ac_cv_search_vorbis_info_init
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libvorbis=yes
 	      if test -n HAVE_LIBVORBIS ; then
 
-printf "%s\n" "#define HAVE_LIBVORBIS 1" >>confdefs.h
+$as_echo "#define HAVE_LIBVORBIS 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libvorbis=no
 
 
@@ -12150,10 +11245,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib vorbis in (${ogg_HOME})" >&5
-printf %s "checking checking lib vorbis in (${ogg_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib vorbis in (${ogg_HOME})" >&5
+$as_echo_n "checking checking lib vorbis in (${ogg_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -12165,10 +11260,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib vorbis in (${ogg_HOME})" >&5
-printf %s "checking checking lib vorbis in (${ogg_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib vorbis in (${ogg_HOME})" >&5
+$as_echo_n "checking checking lib vorbis in (${ogg_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -12221,18 +11316,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in vorbis/vorbisfile.h
+	for ac_header in vorbis/vorbisfile.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "vorbis/vorbisfile.h" "ac_cv_header_vorbis_vorbisfile_h" "$ac_includes_default"
-if test "x$ac_cv_header_vorbis_vorbisfile_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_VORBIS_VORBISFILE_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "vorbis/vorbisfile.h" "ac_cv_header_vorbis_vorbisfile_h" "$ac_includes_default"
+if test "x$ac_cv_header_vorbis_vorbisfile_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VORBIS_VORBISFILE_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -12329,25 +11426,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in vorbis/vorbisfile.h
+        for ac_header in vorbis/vorbisfile.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "vorbis/vorbisfile.h" "ac_cv_header_vorbis_vorbisfile_h" "$ac_includes_default"
-if test "x$ac_cv_header_vorbis_vorbisfile_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_VORBIS_VORBISFILE_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "vorbis/vorbisfile.h" "ac_cv_header_vorbis_vorbisfile_h" "$ac_includes_default"
+if test "x$ac_cv_header_vorbis_vorbisfile_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VORBIS_VORBISFILE_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing ov_open" >&5
-printf %s "checking for library containing ov_open... " >&6; }
-if test ${ac_cv_search_ov_open+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ov_open" >&5
+$as_echo_n "checking for library containing ov_open... " >&6; }
+if ${ac_cv_search_ov_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -12355,57 +11453,55 @@ 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 ov_open ();
 int
-main (void)
+main ()
 {
 return ov_open ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' vorbisfile
-do
+for ac_lib in '' vorbisfile; 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_ov_open=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_ov_open+y}
-then :
+  if ${ac_cv_search_ov_open+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_ov_open+y}
-then :
+if ${ac_cv_search_ov_open+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_ov_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ov_open" >&5
-printf "%s\n" "$ac_cv_search_ov_open" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ov_open" >&5
+$as_echo "$ac_cv_search_ov_open" >&6; }
 ac_res=$ac_cv_search_ov_open
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libvorbisfile=yes
 	      if test -n HAVE_LIBVORBISFILE ; then
 
-printf "%s\n" "#define HAVE_LIBVORBISFILE 1" >>confdefs.h
+$as_echo "#define HAVE_LIBVORBISFILE 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libvorbisfile=no
 
 
@@ -12414,10 +11510,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib vorbisfile in (${ogg_HOME})" >&5
-printf %s "checking checking lib vorbisfile in (${ogg_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib vorbisfile in (${ogg_HOME})" >&5
+$as_echo_n "checking checking lib vorbisfile in (${ogg_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -12429,10 +11525,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib vorbisfile in (${ogg_HOME})" >&5
-printf %s "checking checking lib vorbisfile in (${ogg_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib vorbisfile in (${ogg_HOME})" >&5
+$as_echo_n "checking checking lib vorbisfile in (${ogg_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -12446,25 +11542,24 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if SDL is wanted" >&5
-printf %s "checking if SDL is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if SDL is wanted" >&5
+$as_echo_n "checking if SDL is wanted... " >&6; }
 
 # Check whether --with-SDL was given.
-if test ${with_SDL+y}
-then :
+if test "${with_SDL+set}" = set; then :
   withval=$with_SDL; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          SDL_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -12513,18 +11608,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in SDL/SDL_audio.h
+	for ac_header in SDL/SDL_audio.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "SDL/SDL_audio.h" "ac_cv_header_SDL_SDL_audio_h" "$ac_includes_default"
-if test "x$ac_cv_header_SDL_SDL_audio_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SDL_SDL_AUDIO_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "SDL/SDL_audio.h" "ac_cv_header_SDL_SDL_audio_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_SDL_audio_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SDL_SDL_AUDIO_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -12621,25 +11718,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in SDL/SDL_audio.h
+        for ac_header in SDL/SDL_audio.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "SDL/SDL_audio.h" "ac_cv_header_SDL_SDL_audio_h" "$ac_includes_default"
-if test "x$ac_cv_header_SDL_SDL_audio_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SDL_SDL_AUDIO_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "SDL/SDL_audio.h" "ac_cv_header_SDL_SDL_audio_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_SDL_audio_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SDL_SDL_AUDIO_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing SDL_AudioInit" >&5
-printf %s "checking for library containing SDL_AudioInit... " >&6; }
-if test ${ac_cv_search_SDL_AudioInit+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SDL_AudioInit" >&5
+$as_echo_n "checking for library containing SDL_AudioInit... " >&6; }
+if ${ac_cv_search_SDL_AudioInit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -12647,57 +11745,55 @@ 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 SDL_AudioInit ();
 int
-main (void)
+main ()
 {
 return SDL_AudioInit ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' SDL
-do
+for ac_lib in '' SDL; 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_SDL_AudioInit=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_SDL_AudioInit+y}
-then :
+  if ${ac_cv_search_SDL_AudioInit+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_SDL_AudioInit+y}
-then :
+if ${ac_cv_search_SDL_AudioInit+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_SDL_AudioInit=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SDL_AudioInit" >&5
-printf "%s\n" "$ac_cv_search_SDL_AudioInit" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SDL_AudioInit" >&5
+$as_echo "$ac_cv_search_SDL_AudioInit" >&6; }
 ac_res=$ac_cv_search_SDL_AudioInit
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libSDL=yes
 	      if test -n HAVE_LIBSDL ; then
 
-printf "%s\n" "#define HAVE_LIBSDL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSDL 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libSDL=no
 
 
@@ -12706,10 +11802,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib SDL in (${SDL_HOME})" >&5
-printf %s "checking checking lib SDL in (${SDL_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib SDL in (${SDL_HOME})" >&5
+$as_echo_n "checking checking lib SDL in (${SDL_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -12721,10 +11817,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib SDL in (${SDL_HOME})" >&5
-printf %s "checking checking lib SDL in (${SDL_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib SDL in (${SDL_HOME})" >&5
+$as_echo_n "checking checking lib SDL in (${SDL_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -12738,25 +11834,24 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if smpeg is wanted" >&5
-printf %s "checking if smpeg is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if smpeg is wanted" >&5
+$as_echo_n "checking if smpeg is wanted... " >&6; }
 
 # Check whether --with-smpeg was given.
-if test ${with_smpeg+y}
-then :
+if test "${with_smpeg+set}" = set; then :
   withval=$with_smpeg; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          smpeg_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -12805,18 +11900,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in smpeg.h
+	for ac_header in smpeg.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "smpeg.h" "ac_cv_header_smpeg_h" "$ac_includes_default"
-if test "x$ac_cv_header_smpeg_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SMPEG_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "smpeg.h" "ac_cv_header_smpeg_h" "$ac_includes_default"
+if test "x$ac_cv_header_smpeg_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SMPEG_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -12913,25 +12010,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in smpeg.h
+        for ac_header in smpeg.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "smpeg.h" "ac_cv_header_smpeg_h" "$ac_includes_default"
-if test "x$ac_cv_header_smpeg_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SMPEG_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "smpeg.h" "ac_cv_header_smpeg_h" "$ac_includes_default"
+if test "x$ac_cv_header_smpeg_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SMPEG_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing SMPEG_playAudio" >&5
-printf %s "checking for library containing SMPEG_playAudio... " >&6; }
-if test ${ac_cv_search_SMPEG_playAudio+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SMPEG_playAudio" >&5
+$as_echo_n "checking for library containing SMPEG_playAudio... " >&6; }
+if ${ac_cv_search_SMPEG_playAudio+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -12939,57 +12037,55 @@ 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 SMPEG_playAudio ();
 int
-main (void)
+main ()
 {
 return SMPEG_playAudio ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' smpeg
-do
+for ac_lib in '' smpeg; 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_SMPEG_playAudio=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_SMPEG_playAudio+y}
-then :
+  if ${ac_cv_search_SMPEG_playAudio+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_SMPEG_playAudio+y}
-then :
+if ${ac_cv_search_SMPEG_playAudio+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_SMPEG_playAudio=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SMPEG_playAudio" >&5
-printf "%s\n" "$ac_cv_search_SMPEG_playAudio" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SMPEG_playAudio" >&5
+$as_echo "$ac_cv_search_SMPEG_playAudio" >&6; }
 ac_res=$ac_cv_search_SMPEG_playAudio
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libsmpeg=yes
 	      if test -n HAVE_LIBSMPEG ; then
 
-printf "%s\n" "#define HAVE_LIBSMPEG 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSMPEG 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libsmpeg=no
 
 
@@ -12998,10 +12094,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib smpeg in (${smpeg_HOME})" >&5
-printf %s "checking checking lib smpeg in (${smpeg_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib smpeg in (${smpeg_HOME})" >&5
+$as_echo_n "checking checking lib smpeg in (${smpeg_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -13013,10 +12109,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib smpeg in (${smpeg_HOME})" >&5
-printf %s "checking checking lib smpeg in (${smpeg_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib smpeg in (${smpeg_HOME})" >&5
+$as_echo_n "checking checking lib smpeg in (${smpeg_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -13030,25 +12126,24 @@ fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if openal is wanted" >&5
-printf %s "checking if openal is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openal is wanted" >&5
+$as_echo_n "checking if openal is wanted... " >&6; }
 
 # Check whether --with-openal was given.
-if test ${with_openal+y}
-then :
+if test "${with_openal+set}" = set; then :
   withval=$with_openal; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          openal_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -13097,18 +12192,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in AL/al.h
+	for ac_header in AL/al.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "AL/al.h" "ac_cv_header_AL_al_h" "$ac_includes_default"
-if test "x$ac_cv_header_AL_al_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_AL_AL_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "AL/al.h" "ac_cv_header_AL_al_h" "$ac_includes_default"
+if test "x$ac_cv_header_AL_al_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AL_AL_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -13205,25 +12302,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in AL/al.h
+        for ac_header in AL/al.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "AL/al.h" "ac_cv_header_AL_al_h" "$ac_includes_default"
-if test "x$ac_cv_header_AL_al_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_AL_AL_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "AL/al.h" "ac_cv_header_AL_al_h" "$ac_includes_default"
+if test "x$ac_cv_header_AL_al_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AL_AL_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing alGetSourceiv" >&5
-printf %s "checking for library containing alGetSourceiv... " >&6; }
-if test ${ac_cv_search_alGetSourceiv+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing alGetSourceiv" >&5
+$as_echo_n "checking for library containing alGetSourceiv... " >&6; }
+if ${ac_cv_search_alGetSourceiv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13231,57 +12329,55 @@ 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 alGetSourceiv ();
 int
-main (void)
+main ()
 {
 return alGetSourceiv ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' openal
-do
+for ac_lib in '' openal; 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_alGetSourceiv=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_alGetSourceiv+y}
-then :
+  if ${ac_cv_search_alGetSourceiv+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_alGetSourceiv+y}
-then :
+if ${ac_cv_search_alGetSourceiv+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_alGetSourceiv=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_alGetSourceiv" >&5
-printf "%s\n" "$ac_cv_search_alGetSourceiv" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_alGetSourceiv" >&5
+$as_echo "$ac_cv_search_alGetSourceiv" >&6; }
 ac_res=$ac_cv_search_alGetSourceiv
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libopenal=yes
 	      if test -n HAVE_LIBOPENAL ; then
 
-printf "%s\n" "#define HAVE_LIBOPENAL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBOPENAL 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libopenal=no
 
 
@@ -13290,10 +12386,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib openal in (${openal_HOME})" >&5
-printf %s "checking checking lib openal in (${openal_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib openal in (${openal_HOME})" >&5
+$as_echo_n "checking checking lib openal in (${openal_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -13305,10 +12401,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib openal in (${openal_HOME})" >&5
-printf %s "checking checking lib openal in (${openal_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib openal in (${openal_HOME})" >&5
+$as_echo_n "checking checking lib openal in (${openal_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -13361,18 +12457,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in AL/alut.h
+	for ac_header in AL/alut.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "AL/alut.h" "ac_cv_header_AL_alut_h" "$ac_includes_default"
-if test "x$ac_cv_header_AL_alut_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_AL_ALUT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "AL/alut.h" "ac_cv_header_AL_alut_h" "$ac_includes_default"
+if test "x$ac_cv_header_AL_alut_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AL_ALUT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -13469,25 +12567,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in AL/alut.h
+        for ac_header in AL/alut.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "AL/alut.h" "ac_cv_header_AL_alut_h" "$ac_includes_default"
-if test "x$ac_cv_header_AL_alut_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_AL_ALUT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "AL/alut.h" "ac_cv_header_AL_alut_h" "$ac_includes_default"
+if test "x$ac_cv_header_AL_alut_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AL_ALUT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing alutGetMajorVersion" >&5
-printf %s "checking for library containing alutGetMajorVersion... " >&6; }
-if test ${ac_cv_search_alutGetMajorVersion+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing alutGetMajorVersion" >&5
+$as_echo_n "checking for library containing alutGetMajorVersion... " >&6; }
+if ${ac_cv_search_alutGetMajorVersion+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13495,57 +12594,55 @@ 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 alutGetMajorVersion ();
 int
-main (void)
+main ()
 {
 return alutGetMajorVersion ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' alut
-do
+for ac_lib in '' alut; 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_alutGetMajorVersion=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_alutGetMajorVersion+y}
-then :
+  if ${ac_cv_search_alutGetMajorVersion+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_alutGetMajorVersion+y}
-then :
+if ${ac_cv_search_alutGetMajorVersion+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_alutGetMajorVersion=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_alutGetMajorVersion" >&5
-printf "%s\n" "$ac_cv_search_alutGetMajorVersion" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_alutGetMajorVersion" >&5
+$as_echo "$ac_cv_search_alutGetMajorVersion" >&6; }
 ac_res=$ac_cv_search_alutGetMajorVersion
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libalut=yes
 	      if test -n HAVE_LIBALUT ; then
 
-printf "%s\n" "#define HAVE_LIBALUT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBALUT 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libalut=no
 
 
@@ -13554,10 +12651,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib alut in (${openal_HOME})" >&5
-printf %s "checking checking lib alut in (${openal_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib alut in (${openal_HOME})" >&5
+$as_echo_n "checking checking lib alut in (${openal_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -13569,10 +12666,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib alut in (${openal_HOME})" >&5
-printf %s "checking checking lib alut in (${openal_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib alut in (${openal_HOME})" >&5
+$as_echo_n "checking checking lib alut in (${openal_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -13586,7 +12683,7 @@ fi
 
 else
 
-printf "%s\n" "#define NoAudio 1" >>confdefs.h
+$as_echo "#define NoAudio 1" >>confdefs.h
 
 fi
 
@@ -13595,25 +12692,24 @@ if ! test "x$voip" = "xno"; then
     if test "$CXX" = "g++" -a "$GXX" = "yes"; then
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if jvoip is wanted" >&5
-printf %s "checking if jvoip is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jvoip is wanted" >&5
+$as_echo_n "checking if jvoip is wanted... " >&6; }
 
 # Check whether --with-jvoip was given.
-if test ${with_jvoip+y}
-then :
+if test "${with_jvoip+set}" = set; then :
   withval=$with_jvoip; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          jvoip_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -13665,167 +12761,171 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 #  _ZN7JThread13ThreadStartedEv
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _ZN9RTPPacket5ClearEv in -ljrtp" >&5
-printf %s "checking for _ZN9RTPPacket5ClearEv in -ljrtp... " >&6; }
-if test ${ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN9RTPPacket5ClearEv in -ljrtp" >&5
+$as_echo_n "checking for _ZN9RTPPacket5ClearEv in -ljrtp... " >&6; }
+if ${ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljrtp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-namespace conftest {
-  extern "C" int _ZN9RTPPacket5ClearEv ();
-}
+/* 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 _ZN9RTPPacket5ClearEv ();
 int
-main (void)
+main ()
 {
-return conftest::_ZN9RTPPacket5ClearEv ();
+return _ZN9RTPPacket5ClearEv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"
-then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv=yes
-else $as_nop
+else
   ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" >&5
-printf "%s\n" "$ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" >&6; }
-if test "x$ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" >&5
+$as_echo "$ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" >&6; }
+if test "x$ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" = xyes; then :
   cv_libjrtp=yes
-else $as_nop
+else
   cv_libjrtp=no
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _ZN6JMutex4InitEv in -ljthread" >&5
-printf %s "checking for _ZN6JMutex4InitEv in -ljthread... " >&6; }
-if test ${ac_cv_lib_jthread__ZN6JMutex4InitEv+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN6JMutex4InitEv in -ljthread" >&5
+$as_echo_n "checking for _ZN6JMutex4InitEv in -ljthread... " >&6; }
+if ${ac_cv_lib_jthread__ZN6JMutex4InitEv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-namespace conftest {
-  extern "C" int _ZN6JMutex4InitEv ();
-}
+/* 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 _ZN6JMutex4InitEv ();
 int
-main (void)
+main ()
 {
-return conftest::_ZN6JMutex4InitEv ();
+return _ZN6JMutex4InitEv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"
-then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_jthread__ZN6JMutex4InitEv=yes
-else $as_nop
+else
   ac_cv_lib_jthread__ZN6JMutex4InitEv=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jthread__ZN6JMutex4InitEv" >&5
-printf "%s\n" "$ac_cv_lib_jthread__ZN6JMutex4InitEv" >&6; }
-if test "x$ac_cv_lib_jthread__ZN6JMutex4InitEv" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jthread__ZN6JMutex4InitEv" >&5
+$as_echo "$ac_cv_lib_jthread__ZN6JMutex4InitEv" >&6; }
+if test "x$ac_cv_lib_jthread__ZN6JMutex4InitEv" = xyes; then :
   cv_libjthread=yes
-else $as_nop
+else
   cv_libjthread=no
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _Z19JVOIPGetErrorStringi in -ljvoip" >&5
-printf %s "checking for _Z19JVOIPGetErrorStringi in -ljvoip... " >&6; }
-if test ${ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _Z19JVOIPGetErrorStringi in -ljvoip" >&5
+$as_echo_n "checking for _Z19JVOIPGetErrorStringi in -ljvoip... " >&6; }
+if ${ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljvoip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-namespace conftest {
-  extern "C" int _Z19JVOIPGetErrorStringi ();
-}
+/* 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 _Z19JVOIPGetErrorStringi ();
 int
-main (void)
+main ()
 {
-return conftest::_Z19JVOIPGetErrorStringi ();
+return _Z19JVOIPGetErrorStringi ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"
-then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi=yes
-else $as_nop
+else
   ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" >&5
-printf "%s\n" "$ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" >&6; }
-if test "x$ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" >&5
+$as_echo "$ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" >&6; }
+if test "x$ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" = xyes; then :
   cv_libjvoip=yes
-else $as_nop
+else
   cv_libjvoip=no
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _Z11dummy_printc in -lvoip" >&5
-printf %s "checking for _Z11dummy_printc in -lvoip... " >&6; }
-if test ${ac_cv_lib_voip__Z11dummy_printc+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _Z11dummy_printc in -lvoip" >&5
+$as_echo_n "checking for _Z11dummy_printc in -lvoip... " >&6; }
+if ${ac_cv_lib_voip__Z11dummy_printc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvoip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-namespace conftest {
-  extern "C" int _Z11dummy_printc ();
-}
+/* 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 _Z11dummy_printc ();
 int
-main (void)
+main ()
 {
-return conftest::_Z11dummy_printc ();
+return _Z11dummy_printc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"
-then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_voip__Z11dummy_printc=yes
-else $as_nop
+else
   ac_cv_lib_voip__Z11dummy_printc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_voip__Z11dummy_printc" >&5
-printf "%s\n" "$ac_cv_lib_voip__Z11dummy_printc" >&6; }
-if test "x$ac_cv_lib_voip__Z11dummy_printc" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_voip__Z11dummy_printc" >&5
+$as_echo "$ac_cv_lib_voip__Z11dummy_printc" >&6; }
+if test "x$ac_cv_lib_voip__Z11dummy_printc" = xyes; then :
   cv_libvoip=yes
-else $as_nop
+else
   cv_libvoip=no
 fi
 
@@ -13836,171 +12936,183 @@ if test "x$cv_libjvoip" = "xyes" -a "x$cv_libjthread" = "xyes" -a "x$cv_libjrtp"
                 #
                 # If all libraries were found, use them
                 #
-                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _ZN9RTPPacket5ClearEv in -ljrtp" >&5
-printf %s "checking for _ZN9RTPPacket5ClearEv in -ljrtp... " >&6; }
-if test ${ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN9RTPPacket5ClearEv in -ljrtp" >&5
+$as_echo_n "checking for _ZN9RTPPacket5ClearEv in -ljrtp... " >&6; }
+if ${ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljrtp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-namespace conftest {
-  extern "C" int _ZN9RTPPacket5ClearEv ();
-}
+/* 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 _ZN9RTPPacket5ClearEv ();
 int
-main (void)
+main ()
 {
-return conftest::_ZN9RTPPacket5ClearEv ();
+return _ZN9RTPPacket5ClearEv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"
-then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv=yes
-else $as_nop
+else
   ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" >&5
-printf "%s\n" "$ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" >&6; }
-if test "x$ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBJRTP 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" >&5
+$as_echo "$ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" >&6; }
+if test "x$ac_cv_lib_jrtp__ZN9RTPPacket5ClearEv" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBJRTP 1
+_ACEOF
 
   LIBS="-ljrtp $LIBS"
 
 fi
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _ZN6JMutex4InitEv in -ljthread" >&5
-printf %s "checking for _ZN6JMutex4InitEv in -ljthread... " >&6; }
-if test ${ac_cv_lib_jthread__ZN6JMutex4InitEv+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN6JMutex4InitEv in -ljthread" >&5
+$as_echo_n "checking for _ZN6JMutex4InitEv in -ljthread... " >&6; }
+if ${ac_cv_lib_jthread__ZN6JMutex4InitEv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-namespace conftest {
-  extern "C" int _ZN6JMutex4InitEv ();
-}
+/* 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 _ZN6JMutex4InitEv ();
 int
-main (void)
+main ()
 {
-return conftest::_ZN6JMutex4InitEv ();
+return _ZN6JMutex4InitEv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"
-then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_jthread__ZN6JMutex4InitEv=yes
-else $as_nop
+else
   ac_cv_lib_jthread__ZN6JMutex4InitEv=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jthread__ZN6JMutex4InitEv" >&5
-printf "%s\n" "$ac_cv_lib_jthread__ZN6JMutex4InitEv" >&6; }
-if test "x$ac_cv_lib_jthread__ZN6JMutex4InitEv" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBJTHREAD 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jthread__ZN6JMutex4InitEv" >&5
+$as_echo "$ac_cv_lib_jthread__ZN6JMutex4InitEv" >&6; }
+if test "x$ac_cv_lib_jthread__ZN6JMutex4InitEv" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBJTHREAD 1
+_ACEOF
 
   LIBS="-ljthread $LIBS"
 
 fi
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _Z19JVOIPGetErrorStringi in -ljvoip" >&5
-printf %s "checking for _Z19JVOIPGetErrorStringi in -ljvoip... " >&6; }
-if test ${ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _Z19JVOIPGetErrorStringi in -ljvoip" >&5
+$as_echo_n "checking for _Z19JVOIPGetErrorStringi in -ljvoip... " >&6; }
+if ${ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljvoip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-namespace conftest {
-  extern "C" int _Z19JVOIPGetErrorStringi ();
-}
+/* 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 _Z19JVOIPGetErrorStringi ();
 int
-main (void)
+main ()
 {
-return conftest::_Z19JVOIPGetErrorStringi ();
+return _Z19JVOIPGetErrorStringi ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"
-then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi=yes
-else $as_nop
+else
   ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" >&5
-printf "%s\n" "$ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" >&6; }
-if test "x$ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBJVOIP 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" >&5
+$as_echo "$ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" >&6; }
+if test "x$ac_cv_lib_jvoip__Z19JVOIPGetErrorStringi" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBJVOIP 1
+_ACEOF
 
   LIBS="-ljvoip $LIBS"
 
 fi
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _Z11dummy_printc in -lvoip" >&5
-printf %s "checking for _Z11dummy_printc in -lvoip... " >&6; }
-if test ${ac_cv_lib_voip__Z11dummy_printc+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _Z11dummy_printc in -lvoip" >&5
+$as_echo_n "checking for _Z11dummy_printc in -lvoip... " >&6; }
+if ${ac_cv_lib_voip__Z11dummy_printc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvoip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-namespace conftest {
-  extern "C" int _Z11dummy_printc ();
-}
+/* 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 _Z11dummy_printc ();
 int
-main (void)
+main ()
 {
-return conftest::_Z11dummy_printc ();
+return _Z11dummy_printc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"
-then :
+if ac_fn_cxx_try_link "$LINENO"; then :
   ac_cv_lib_voip__Z11dummy_printc=yes
-else $as_nop
+else
   ac_cv_lib_voip__Z11dummy_printc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_voip__Z11dummy_printc" >&5
-printf "%s\n" "$ac_cv_lib_voip__Z11dummy_printc" >&6; }
-if test "x$ac_cv_lib_voip__Z11dummy_printc" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBVOIP 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_voip__Z11dummy_printc" >&5
+$as_echo "$ac_cv_lib_voip__Z11dummy_printc" >&6; }
+if test "x$ac_cv_lib_voip__Z11dummy_printc" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBVOIP 1
+_ACEOF
 
   LIBS="-lvoip $LIBS"
 
@@ -14019,10 +13131,10 @@ else
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib voip in $JVOIPLIB_HOME" >&5
-printf %s "checking checking lib voip in $JVOIPLIB_HOME... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib voip in $JVOIPLIB_HOME" >&5
+$as_echo_n "checking checking lib voip in $JVOIPLIB_HOME... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -14039,7 +13151,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
     fi
 else
 
-printf "%s\n" "#define NoVoip 1" >>confdefs.h
+$as_echo "#define NoVoip 1" >>confdefs.h
 
 fi
 
@@ -14047,25 +13159,24 @@ if ! test "x$database" = "xno"; then
    if test "ms$unicon_os" = "mswindows" ; then
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if odbc is wanted" >&5
-printf %s "checking if odbc is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if odbc is wanted" >&5
+$as_echo_n "checking if odbc is wanted... " >&6; }
 
 # Check whether --with-odbc was given.
-if test ${with_odbc+y}
-then :
+if test "${with_odbc+set}" = set; then :
   withval=$with_odbc; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          odbc_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -14162,30 +13273,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libodbc32_h=yes
-	       for ac_header in sqlext.h
+	for ac_header in sqlext.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "
           #include <windows.h>
     	  #include <sqlext.h>
 
 "
-if test "x$ac_cv_header_sqlext_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SQLEXT_H 1" >>confdefs.h
+if test "x$ac_cv_header_sqlext_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLEXT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libodbc32_h=no
 fi
 
 done
 
+
 	if test x$cv_libodbc32_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing SQLConnect" >&5
-printf %s "checking for library containing SQLConnect... " >&6; }
-if test ${ac_cv_search_SQLConnect+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SQLConnect" >&5
+$as_echo_n "checking for library containing SQLConnect... " >&6; }
+if ${ac_cv_search_SQLConnect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14193,55 +13305,53 @@ 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 SQLConnect ();
 int
-main (void)
+main ()
 {
 return SQLConnect ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' odbc32
-do
+for ac_lib in '' odbc32; 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_SQLConnect=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_SQLConnect+y}
-then :
+  if ${ac_cv_search_SQLConnect+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_SQLConnect+y}
-then :
+if ${ac_cv_search_SQLConnect+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_SQLConnect=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SQLConnect" >&5
-printf "%s\n" "$ac_cv_search_SQLConnect" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SQLConnect" >&5
+$as_echo "$ac_cv_search_SQLConnect" >&6; }
 ac_res=$ac_cv_search_SQLConnect
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libodbc=yes
 
-printf "%s\n" "#define HAVE_LIBODBC 1" >>confdefs.h
+$as_echo "#define HAVE_LIBODBC 1" >>confdefs.h
 
 
-else $as_nop
+else
   cv_libodbc=no
 
 
@@ -14250,10 +13360,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib odbc32 in (${odbc_HOME})" >&5
-printf %s "checking checking lib odbc32 in (${odbc_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib odbc32 in (${odbc_HOME})" >&5
+$as_echo_n "checking checking lib odbc32 in (${odbc_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 
 fi
@@ -14266,10 +13376,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib odbc32 in (${odbc_HOME})" >&5
-printf %s "checking checking lib odbc32 in (${odbc_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib odbc32 in (${odbc_HOME})" >&5
+$as_echo_n "checking checking lib odbc32 in (${odbc_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
         fi
 	ac_ext=c
@@ -14283,25 +13393,24 @@ fi
    else
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if odbc is wanted" >&5
-printf %s "checking if odbc is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if odbc is wanted" >&5
+$as_echo_n "checking if odbc is wanted... " >&6; }
 
 # Check whether --with-odbc was given.
-if test ${with_odbc+y}
-then :
+if test "${with_odbc+set}" = set; then :
   withval=$with_odbc; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          odbc_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -14350,18 +13459,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in sqlext.h
+	for ac_header in sqlext.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlext_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SQLEXT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlext_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLEXT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -14458,25 +13569,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in sqlext.h
+        for ac_header in sqlext.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlext_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SQLEXT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlext_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLEXT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing SQLAllocConnect" >&5
-printf %s "checking for library containing SQLAllocConnect... " >&6; }
-if test ${ac_cv_search_SQLAllocConnect+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SQLAllocConnect" >&5
+$as_echo_n "checking for library containing SQLAllocConnect... " >&6; }
+if ${ac_cv_search_SQLAllocConnect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14484,57 +13596,55 @@ 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 SQLAllocConnect ();
 int
-main (void)
+main ()
 {
 return SQLAllocConnect ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' iodbc
-do
+for ac_lib in '' iodbc; 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_SQLAllocConnect=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_SQLAllocConnect+y}
-then :
+  if ${ac_cv_search_SQLAllocConnect+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_SQLAllocConnect+y}
-then :
+if ${ac_cv_search_SQLAllocConnect+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_SQLAllocConnect=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SQLAllocConnect" >&5
-printf "%s\n" "$ac_cv_search_SQLAllocConnect" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SQLAllocConnect" >&5
+$as_echo "$ac_cv_search_SQLAllocConnect" >&6; }
 ac_res=$ac_cv_search_SQLAllocConnect
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libiodbc=yes
 	      if test -n HAVE_LIBIODBC ; then
 
-printf "%s\n" "#define HAVE_LIBIODBC 1" >>confdefs.h
+$as_echo "#define HAVE_LIBIODBC 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libiodbc=no
 
 
@@ -14543,10 +13653,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib iodbc in (${odbc_HOME})" >&5
-printf %s "checking checking lib iodbc in (${odbc_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib iodbc in (${odbc_HOME})" >&5
+$as_echo_n "checking checking lib iodbc in (${odbc_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -14558,10 +13668,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib iodbc in (${odbc_HOME})" >&5
-printf %s "checking checking lib iodbc in (${odbc_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib iodbc in (${odbc_HOME})" >&5
+$as_echo_n "checking checking lib iodbc in (${odbc_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -14616,18 +13726,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in sqlext.h
+	for ac_header in sqlext.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlext_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SQLEXT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlext_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLEXT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -14724,25 +13836,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in sqlext.h
+        for ac_header in sqlext.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlext_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SQLEXT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlext_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLEXT_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing SQLConnect" >&5
-printf %s "checking for library containing SQLConnect... " >&6; }
-if test ${ac_cv_search_SQLConnect+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SQLConnect" >&5
+$as_echo_n "checking for library containing SQLConnect... " >&6; }
+if ${ac_cv_search_SQLConnect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14750,57 +13863,55 @@ 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 SQLConnect ();
 int
-main (void)
+main ()
 {
 return SQLConnect ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' odbc
-do
+for ac_lib in '' odbc; 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_SQLConnect=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_SQLConnect+y}
-then :
+  if ${ac_cv_search_SQLConnect+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_SQLConnect+y}
-then :
+if ${ac_cv_search_SQLConnect+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_SQLConnect=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SQLConnect" >&5
-printf "%s\n" "$ac_cv_search_SQLConnect" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SQLConnect" >&5
+$as_echo "$ac_cv_search_SQLConnect" >&6; }
 ac_res=$ac_cv_search_SQLConnect
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libodbc=yes
 	      if test -n HAVE_LIBODBC ; then
 
-printf "%s\n" "#define HAVE_LIBODBC 1" >>confdefs.h
+$as_echo "#define HAVE_LIBODBC 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libodbc=no
 
 
@@ -14809,10 +13920,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib odbc in (${odbc_HOME})" >&5
-printf %s "checking checking lib odbc in (${odbc_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib odbc in (${odbc_HOME})" >&5
+$as_echo_n "checking checking lib odbc in (${odbc_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -14824,10 +13935,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib odbc in (${odbc_HOME})" >&5
-printf %s "checking checking lib odbc in (${odbc_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib odbc in (${odbc_HOME})" >&5
+$as_echo_n "checking checking lib odbc in (${odbc_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -14843,32 +13954,31 @@ fi
    fi
 else
 
-printf "%s\n" "#define NoDatabase 1" >>confdefs.h
+$as_echo "#define NoDatabase 1" >>confdefs.h
 
 fi
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if pthread is wanted" >&5
-printf %s "checking if pthread is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthread is wanted" >&5
+$as_echo_n "checking if pthread is wanted... " >&6; }
 
 # Check whether --with-pthread was given.
-if test ${with_pthread+y}
-then :
+if test "${with_pthread+set}" = set; then :
   withval=$with_pthread; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          pthread_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -14917,18 +14027,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in pthread.h
+	for ac_header in pthread.h
 do :
-  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
+  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
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -15025,25 +14137,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in pthread.h
+        for ac_header in pthread.h
 do :
-  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
+  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
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
-printf %s "checking for library containing pthread_create... " >&6; }
-if test ${ac_cv_search_pthread_create+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
+$as_echo_n "checking for library containing pthread_create... " >&6; }
+if ${ac_cv_search_pthread_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15051,57 +14164,55 @@ 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_create ();
 int
-main (void)
+main ()
 {
 return pthread_create ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' pthread
-do
+for ac_lib in '' pthread; 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_pthread_create=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_pthread_create+y}
-then :
+  if ${ac_cv_search_pthread_create+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_pthread_create+y}
-then :
+if ${ac_cv_search_pthread_create+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_pthread_create=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5
-printf "%s\n" "$ac_cv_search_pthread_create" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5
+$as_echo "$ac_cv_search_pthread_create" >&6; }
 ac_res=$ac_cv_search_pthread_create
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libpthread=yes
 	      if test -n HAVE_LIBPTHREAD ; then
 
-printf "%s\n" "#define HAVE_LIBPTHREAD 1" >>confdefs.h
+$as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libpthread=no
 
 
@@ -15110,10 +14221,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib pthread in (${pthread_HOME})" >&5
-printf %s "checking checking lib pthread in (${pthread_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib pthread in (${pthread_HOME})" >&5
+$as_echo_n "checking checking lib pthread in (${pthread_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -15125,10 +14236,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib pthread in (${pthread_HOME})" >&5
-printf %s "checking checking lib pthread in (${pthread_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib pthread in (${pthread_HOME})" >&5
+$as_echo_n "checking checking lib pthread in (${pthread_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -15144,25 +14255,24 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if ! test "x$ssl" = "xno" ; then
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ssl is wanted" >&5
-printf %s "checking if ssl is wanted... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ssl is wanted" >&5
+$as_echo_n "checking if ssl is wanted... " >&6; }
 
 # Check whether --with-ssl was given.
-if test ${with_ssl+y}
-then :
+if test "${with_ssl+set}" = set; then :
   withval=$with_ssl; if test x$withval != xno ; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       if test x$withval != xyes ; then
          ssl_HOME="$withval"
       fi
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
-else $as_nop
-   { 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: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -15211,18 +14321,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in openssl/bio.h
+	for ac_header in openssl/bio.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "openssl/bio.h" "ac_cv_header_openssl_bio_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_bio_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OPENSSL_BIO_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "openssl/bio.h" "ac_cv_header_openssl_bio_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_bio_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_BIO_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -15319,25 +14431,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in openssl/bio.h
+        for ac_header in openssl/bio.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "openssl/bio.h" "ac_cv_header_openssl_bio_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_bio_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OPENSSL_BIO_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "openssl/bio.h" "ac_cv_header_openssl_bio_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_bio_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_BIO_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing BIO_read" >&5
-printf %s "checking for library containing BIO_read... " >&6; }
-if test ${ac_cv_search_BIO_read+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing BIO_read" >&5
+$as_echo_n "checking for library containing BIO_read... " >&6; }
+if ${ac_cv_search_BIO_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15345,57 +14458,55 @@ 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 BIO_read ();
 int
-main (void)
+main ()
 {
 return BIO_read ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' crypto
-do
+for ac_lib in '' crypto; 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_BIO_read=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_BIO_read+y}
-then :
+  if ${ac_cv_search_BIO_read+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_BIO_read+y}
-then :
+if ${ac_cv_search_BIO_read+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_BIO_read=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_BIO_read" >&5
-printf "%s\n" "$ac_cv_search_BIO_read" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_BIO_read" >&5
+$as_echo "$ac_cv_search_BIO_read" >&6; }
 ac_res=$ac_cv_search_BIO_read
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libcrypto=yes
 	      if test -n HAVE_LIBCRYPTO ; then
 
-printf "%s\n" "#define HAVE_LIBCRYPTO 1" >>confdefs.h
+$as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libcrypto=no
 
 
@@ -15404,10 +14515,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib crypto in (${ssl_HOME})" >&5
-printf %s "checking checking lib crypto in (${ssl_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib crypto in (${ssl_HOME})" >&5
+$as_echo_n "checking checking lib crypto in (${ssl_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -15419,10 +14530,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib crypto in (${ssl_HOME})" >&5
-printf %s "checking checking lib crypto in (${ssl_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib crypto in (${ssl_HOME})" >&5
+$as_echo_n "checking checking lib crypto in (${ssl_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -15475,18 +14586,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in openssl/ssl.h
+	for ac_header in openssl/ssl.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OPENSSL_SSL_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_SSL_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -15583,25 +14696,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in openssl/ssl.h
+        for ac_header in openssl/ssl.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OPENSSL_SSL_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_SSL_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
-printf %s "checking for library containing SSL_library_init... " >&6; }
-if test ${ac_cv_search_SSL_library_init+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
+$as_echo_n "checking for library containing SSL_library_init... " >&6; }
+if ${ac_cv_search_SSL_library_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15609,57 +14723,55 @@ 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 SSL_library_init ();
 int
-main (void)
+main ()
 {
 return SSL_library_init ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ssl
-do
+for ac_lib in '' ssl; 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_SSL_library_init=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_SSL_library_init+y}
-then :
+  if ${ac_cv_search_SSL_library_init+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_SSL_library_init+y}
-then :
+if ${ac_cv_search_SSL_library_init+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_SSL_library_init=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
-printf "%s\n" "$ac_cv_search_SSL_library_init" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
+$as_echo "$ac_cv_search_SSL_library_init" >&6; }
 ac_res=$ac_cv_search_SSL_library_init
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libssl=yes
 	      if test -n HAVE_LIBSSL ; then
 
-printf "%s\n" "#define HAVE_LIBSSL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSSL 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libssl=no
 
 
@@ -15668,10 +14780,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib ssl in (${ssl_HOME})" >&5
-printf %s "checking checking lib ssl in (${ssl_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib ssl in (${ssl_HOME})" >&5
+$as_echo_n "checking checking lib ssl in (${ssl_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -15683,10 +14795,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib ssl in (${ssl_HOME})" >&5
-printf %s "checking checking lib ssl in (${ssl_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib ssl in (${ssl_HOME})" >&5
+$as_echo_n "checking checking lib ssl in (${ssl_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -15740,18 +14852,20 @@ then
 
 
 	cv_libthislib_h=yes
-	       for ac_header in openssl/ssl.h
+	for ac_header in openssl/ssl.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OPENSSL_SSL_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_SSL_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h == xno ;  then
 
 	CFLAGS=$TMP_CFLAGS
@@ -15848,25 +14962,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	# If we have mulltiple headers, any missing one will set this to no
 	cv_libthislib_h=yes
-               for ac_header in openssl/ssl.h
+        for ac_header in openssl/ssl.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OPENSSL_SSL_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_SSL_H 1
+_ACEOF
 
-else $as_nop
+else
   cv_libthislib_h=no
 fi
 
 done
+
 	if test x$cv_libthislib_h != xno ;  then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing OPENSSL_init_ssl" >&5
-printf %s "checking for library containing OPENSSL_init_ssl... " >&6; }
-if test ${ac_cv_search_OPENSSL_init_ssl+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing OPENSSL_init_ssl" >&5
+$as_echo_n "checking for library containing OPENSSL_init_ssl... " >&6; }
+if ${ac_cv_search_OPENSSL_init_ssl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15874,57 +14989,55 @@ 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 OPENSSL_init_ssl ();
 int
-main (void)
+main ()
 {
 return OPENSSL_init_ssl ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' ssl
-do
+for ac_lib in '' ssl; 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_OPENSSL_init_ssl=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_OPENSSL_init_ssl+y}
-then :
+  if ${ac_cv_search_OPENSSL_init_ssl+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_OPENSSL_init_ssl+y}
-then :
+if ${ac_cv_search_OPENSSL_init_ssl+:} false; then :
 
-else $as_nop
+else
   ac_cv_search_OPENSSL_init_ssl=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_OPENSSL_init_ssl" >&5
-printf "%s\n" "$ac_cv_search_OPENSSL_init_ssl" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_OPENSSL_init_ssl" >&5
+$as_echo "$ac_cv_search_OPENSSL_init_ssl" >&6; }
 ac_res=$ac_cv_search_OPENSSL_init_ssl
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   cv_libssl=yes
 	      if test -n HAVE_LIBSSL ; then
 
-printf "%s\n" "#define HAVE_LIBSSL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSSL 1" >>confdefs.h
 
 	      fi
 
-else $as_nop
+else
   cv_libssl=no
 
 
@@ -15933,10 +15046,10 @@ else $as_nop
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib ssl in (${ssl_HOME})" >&5
-printf %s "checking checking lib ssl in (${ssl_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib ssl in (${ssl_HOME})" >&5
+$as_echo_n "checking checking lib ssl in (${ssl_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 fi
 
@@ -15948,10 +15061,10 @@ fi
 	CPPFLAGS=$TMP_CPPFLAGS
  	LIBS=$TMP_LIBS
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking checking lib ssl in (${ssl_HOME})" >&5
-printf %s "checking checking lib ssl in (${ssl_HOME})... " >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking lib ssl in (${ssl_HOME})" >&5
+$as_echo_n "checking checking lib ssl in (${ssl_HOME})... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 
 	fi
 	ac_ext=c
@@ -15967,7 +15080,7 @@ fi
 
 else
 
-printf "%s\n" "#define NoDatabase 1" >>confdefs.h
+$as_echo "#define NoDatabase 1" >>confdefs.h
 
 fi
 
@@ -15986,35 +15099,34 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 	ac_c_flag_save="$CFLAGS"
 	CFLAGS="$CFLAGS -Werror"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Werror" >&5
-printf %s "checking whether $CC supports -Werror... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Werror" >&5
+$as_echo_n "checking whether $CC supports -Werror... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else $as_nop
+else
 
 			CFLAGS="$ac_c_flag_save"
-			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -16056,125 +15168,136 @@ done
 
 
 
-printf "%s\n" "#define config_prefix \"${cprefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define config_prefix "${cprefix}"
+_ACEOF
 
 
-printf "%s\n" "#define config_exec_prefix \"${cexec_prefix}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define config_exec_prefix "${cexec_prefix}"
+_ACEOF
 
 
-printf "%s\n" "#define config_bindir \"${cbindir}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define config_bindir "${cbindir}"
+_ACEOF
 
 
-printf "%s\n" "#define config_libdir \"${clibdir}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define config_libdir "${clibdir}"
+_ACEOF
 
 
-printf "%s\n" "#define config_docdir \"${cdocdir}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define config_docdir "${cdocdir}"
+_ACEOF
 
 
-printf "%s\n" "#define config_man \"${cmandir}\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define config_man "${cmandir}"
+_ACEOF
 
 
 for ac_global in sys_nerr
 do
    ac_tr_global=HAVE_`echo $ac_global | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for global variable ${ac_global}" >&5
-printf %s "checking for global variable ${ac_global}... " >&6; }
-   if eval test \${ac_cv_global_$ac_global+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for global variable ${ac_global}" >&5
+$as_echo_n "checking for global variable ${ac_global}... " >&6; }
+   if eval \${ac_cv_global_$ac_global+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
     /* no includes */
 int
-main (void)
+main ()
 {
 extern long int $ac_global;  exit((int)$ac_global)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "ac_cv_global_${ac_global}=yes"
-else $as_nop
+else
   eval "ac_cv_global_${ac_global}=no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
 
   if eval "test \"`echo '$ac_cv_global_'$ac_global`\" = yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-    printf "%s\n" "#define $ac_tr_global 1" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define $ac_tr_global 1
+_ACEOF
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 done
 
 for ac_global in sys_errlist
 do
    ac_tr_global=HAVE_`echo $ac_global | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for global variable ${ac_global}" >&5
-printf %s "checking for global variable ${ac_global}... " >&6; }
-   if eval test \${ac_cv_global_$ac_global+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for global variable ${ac_global}" >&5
+$as_echo_n "checking for global variable ${ac_global}... " >&6; }
+   if eval \${ac_cv_global_$ac_global+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
     /* no includes */
 int
-main (void)
+main ()
 {
 extern long int $ac_global;  exit((int)$ac_global)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "ac_cv_global_${ac_global}=yes"
-else $as_nop
+else
   eval "ac_cv_global_${ac_global}=no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
 
   if eval "test \"`echo '$ac_cv_global_'$ac_global`\" = yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-    printf "%s\n" "#define $ac_tr_global 1" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    cat >>confdefs.h <<_ACEOF
+#define $ac_tr_global 1
+_ACEOF
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test ${ac_cv_struct_tm+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if ${ac_cv_struct_tm+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <time.h>
 
 int
-main (void)
+main ()
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
@@ -16183,19 +15306,18 @@ struct tm tm;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_struct_tm=time.h
-else $as_nop
+else
   ac_cv_struct_tm=sys/time.h
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-printf "%s\n" "$ac_cv_struct_tm" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
-printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
 
 fi
 
@@ -16203,35 +15325,37 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_
 #include <$ac_cv_struct_tm>
 
 "
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes
-then :
+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_TM_TM_ZONE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_TM_TM_ZONE 1
+_ACEOF
 
 
 fi
 
 if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
 
-printf "%s\n" "#define HAVE_TM_ZONE 1" >>confdefs.h
+$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
 
 else
-  ac_fn_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_tzname" = xyes
-then :
+  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_tzname" = xyes; then :
   ac_have_decl=1
-else $as_nop
+else
   ac_have_decl=0
 fi
-printf "%s\n" "#define HAVE_DECL_TZNAME $ac_have_decl" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
-printf %s "checking for tzname... " >&6; }
-if test ${ac_cv_var_tzname+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TZNAME $ac_have_decl
+_ACEOF
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+$as_echo_n "checking for tzname... " >&6; }
+if ${ac_cv_var_tzname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
@@ -16240,134 +15364,127 @@ extern char *tzname[];
 #endif
 
 int
-main (void)
+main ()
 {
 return tzname[0][0];
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_var_tzname=yes
-else $as_nop
+else
   ac_cv_var_tzname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
-printf "%s\n" "$ac_cv_var_tzname" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
+$as_echo "$ac_cv_var_tzname" >&6; }
   if test $ac_cv_var_tzname = yes; then
 
-printf "%s\n" "#define HAVE_TZNAME 1" >>confdefs.h
+$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
 
   fi
 fi
 
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timezone external" >&5
-printf %s "checking for timezone external... " >&6; }
-if test ${mb_cv_var_timezone+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone external" >&5
+$as_echo_n "checking for timezone external... " >&6; }
+if ${mb_cv_var_timezone+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
-main (void)
+main ()
 {
 return (int)timezone;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   mb_cv_var_timezone=yes
-else $as_nop
+else
   mb_cv_var_timezone=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $mb_cv_var_timezone" >&5
-printf "%s\n" "$mb_cv_var_timezone" >&6; }
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for altzone external" >&5
-printf %s "checking for altzone external... " >&6; }
-if test ${mb_cv_var_altzone+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mb_cv_var_timezone" >&5
+$as_echo "$mb_cv_var_timezone" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for altzone external" >&5
+$as_echo_n "checking for altzone external... " >&6; }
+if ${mb_cv_var_altzone+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
-main (void)
+main ()
 {
 return (int)altzone;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   mb_cv_var_altzone=yes
-else $as_nop
+else
   mb_cv_var_altzone=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $mb_cv_var_altzone" >&5
-printf "%s\n" "$mb_cv_var_altzone" >&6; }
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for daylight external" >&5
-printf %s "checking for daylight external... " >&6; }
-if test ${mb_cv_var_daylight+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mb_cv_var_altzone" >&5
+$as_echo "$mb_cv_var_altzone" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daylight external" >&5
+$as_echo_n "checking for daylight external... " >&6; }
+if ${mb_cv_var_daylight+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
-main (void)
+main ()
 {
 return (int)daylight;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   mb_cv_var_daylight=yes
-else $as_nop
+else
   mb_cv_var_daylight=no
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $mb_cv_var_daylight" >&5
-printf "%s\n" "$mb_cv_var_daylight" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mb_cv_var_daylight" >&5
+$as_echo "$mb_cv_var_daylight" >&6; }
    if test $mb_cv_var_timezone = yes; then
 
-printf "%s\n" "#define HAVE_TIMEZONE 1" >>confdefs.h
+$as_echo "#define HAVE_TIMEZONE 1" >>confdefs.h
 
    fi
    if test $mb_cv_var_altzone = yes; then
 
-printf "%s\n" "#define HAVE_ALTZONE 1" >>confdefs.h
+$as_echo "#define HAVE_ALTZONE 1" >>confdefs.h
 
    fi
    if test $mb_cv_var_daylight = yes; then
 
-printf "%s\n" "#define HAVE_DAYLIGHT 1" >>confdefs.h
+$as_echo "#define HAVE_DAYLIGHT 1" >>confdefs.h
 
    fi
 
@@ -16375,35 +15492,37 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_
 #include <$ac_cv_struct_tm>
 
 "
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes
-then :
+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_TM_TM_ZONE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_TM_TM_ZONE 1
+_ACEOF
 
 
 fi
 
 if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
 
-printf "%s\n" "#define HAVE_TM_ZONE 1" >>confdefs.h
+$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
 
 else
-  ac_fn_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_tzname" = xyes
-then :
+  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_tzname" = xyes; then :
   ac_have_decl=1
-else $as_nop
+else
   ac_have_decl=0
 fi
-printf "%s\n" "#define HAVE_DECL_TZNAME $ac_have_decl" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
-printf %s "checking for tzname... " >&6; }
-if test ${ac_cv_var_tzname+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TZNAME $ac_have_decl
+_ACEOF
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+$as_echo_n "checking for tzname... " >&6; }
+if ${ac_cv_var_tzname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
@@ -16412,27 +15531,26 @@ extern char *tzname[];
 #endif
 
 int
-main (void)
+main ()
 {
 return tzname[0][0];
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_var_tzname=yes
-else $as_nop
+else
   ac_cv_var_tzname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
-printf "%s\n" "$ac_cv_var_tzname" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
+$as_echo "$ac_cv_var_tzname" >&6; }
   if test $ac_cv_var_tzname = yes; then
 
-printf "%s\n" "#define HAVE_TZNAME 1" >>confdefs.h
+$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
 
   fi
 fi
@@ -16474,8 +15592,8 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_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;} ;;
+      *_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;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -16505,15 +15623,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;}
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      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
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -16527,8 +15645,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { 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;}
+    { $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;}
   fi
 fi
 rm -f confcache
@@ -16545,7 +15663,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=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$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"
@@ -16562,8 +15680,8 @@ LTLIBOBJS=$ac_ltlibobjs
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -16586,16 +15704,14 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (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 $as_nop
+else
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -16605,46 +15721,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
-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
+# 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
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+if test "${PATH_SEPARATOR+set}" != set; 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 ||
@@ -16653,6 +15769,13 @@ if ${PATH_SEPARATOR+false} :; 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 #((
@@ -16661,12 +15784,8 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
@@ -16678,10 +15797,30 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$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]
@@ -16694,14 +15833,13 @@ 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
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -16728,20 +15866,18 @@ 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 $as_nop
+else
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -16753,13 +15889,12 @@ 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 $as_nop
+else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -16790,7 +15925,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -16812,10 +15947,6 @@ 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*)
@@ -16829,12 +15960,6 @@ 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
@@ -16876,7 +16001,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -16885,7 +16010,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -16947,8 +16072,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Unicon $as_me 13.3, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+This file was extended by Unicon $as_me 13.4, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -17007,16 +16132,14 @@ Report bugs to <jeffery@unicon.org>.
 Unicon home page: <http://www.unicon.org>."
 
 _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='$ac_cs_config_escaped'
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Unicon config.status 13.3
-configured by $0, generated by GNU Autoconf 2.71,
+Unicon config.status 13.4
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -17053,15 +16176,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -17069,7 +16192,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -17078,7 +16201,7 @@ do
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -17106,7 +16229,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
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -17120,7 +16243,7 @@ exec 5>>config.log
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  printf "%s\n" "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
@@ -17148,8 +16271,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+y} || CONFIG_FILES=$config_files
-  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -17485,7 +16608,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -17493,17 +16616,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`$as_echo "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -17520,7 +16643,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -17544,9 +16667,9 @@ printf "%s\n" X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`$as_echo "$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/ ;;
@@ -17599,8 +16722,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@*)
-  { 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;}
+  { $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;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -17642,9 +16765,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"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -17660,20 +16783,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      $as_echo "/* $configure_input  */" \
       && 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
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$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
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -17714,8 +16837,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
-  { 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;}
+  { $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;}
 fi
 
 
@@ -18023,4 +17146,3 @@ cat unicon-config.log
 echo ""
 echo "do make to continue the build"
 echo "or make -j8 for parallel and faster build"
-
diff --git a/ipl/procs/io.icn b/ipl/procs/io.icn
index 6bf7ba6ce..0d3fc60cc 100644
--- a/ipl/procs/io.icn
+++ b/ipl/procs/io.icn
@@ -108,7 +108,7 @@
 #	pathfind(fname, path)
 #		returns the full path of fname if found along the list of
 #		directories in "path", else fails.  If no path is given,
-#		getenv("DPATH") || getenv("PATH") is the default. As is 
+#		getenv("DPATH") || getenv("PATH") is the default. As is
 #               customary in Icon path searching, "." is prepended to the path.
 #
 #	pathload(fname, entry)
@@ -159,32 +159,32 @@
 #
 #  DOS helpers:
 #
-#	dosdir(diropts)	generates records of type dirinfo for each file 
+#	dosdir(diropts)	generates records of type dirinfo for each file
 #			found in the directory, failing when no more files
 #			are available, as in
 #
-#				every dirent := dosdir("*.*") do .... 
+#				every dirent := dosdir("*.*") do ....
 #
 # 	known problems:
 #
-#     	When used to traverse directories and sub-directories in nested every 
+#     	When used to traverse directories and sub-directories in nested every
 #     	loops it doesn't work as expected - requires further investigation.
-#     	Bypass by building lists of the subdirectories to be traversed. 
+#     	Bypass by building lists of the subdirectories to be traversed.
 #
 #	dosdirlist( dpath, dpart2, infotab )
 # 	    	returns a list containing the qualified file names for files
 #		in dpath and matching file patterns and/or options specified
-#		in dpart2. For example, 
+#		in dpart2. For example,
 #
 #        	   dirlist := dosdirlist( "..", "*.* /o:n /a:r-d" )
 #
-#     		returns a list of all read-only-non-directory files in the 
+#     		returns a list of all read-only-non-directory files in the
 #    		parent directory on a MS-DOS compatible system.
 #
-#     	If the optional infotab is specified, 
+#     	If the optional infotab is specified,
 #
-#     	(1)   it must be a table or a run time error will result 
-#     	(2)   the contents of the table will be updated as follows   
+#     	(1)   it must be a table or a run time error will result
+#     	(2)   the contents of the table will be updated as follows
 #             a dirinfo record will be created for each filename
 #     	(3)   the filename will be the key to the table
 #
@@ -283,17 +283,17 @@ procedure DOS_FileParts(filename)	#: parse DOSfile name
 
 local dev, path, name, ext, p, d
 
-filename   ? { 
+filename   ? {
                dev := 1( tab( upto(':') ), move(1) ) | ""
                d := &pos - 1
-               tab(0) 
+               tab(0)
          } ? {
-               p := 1 
-               path := tab( ( every p := upto('\\') + 1 ) |  p ) 
+               p := 1
+               path := tab( ( every p := upto('\\') + 1 ) |  p )
                tab(0)
          } ? {
                name := 1( tab( upto('.') ), move(1) ) | tab(0)
-               ext := tab(0) 
+               ext := tab(0)
          }
 
 
@@ -359,7 +359,7 @@ procedure Write(s)			#: write in buffered mode
    initial buffer_out := []
 
    push(buffer_out,s)
- 
+
    return s
 
 end
@@ -383,8 +383,8 @@ procedure dopen(s)			#: open file on DPATH
    if file := open(s) then return file		# look in current directory
 
    paths := getenv("DPATH") | "."
-       
-   if (binpath := (&features ? (="Binaries at " & tab(0)))) |
+
+   if (binpath := (&config ? (="Binaries at " & tab(0)))) |
       ((f := open((binpath:=getpaths()) ||
 		  ("iconx"|"iconx.exe"|"wiconx.exe")))) then {
       close(\f)
@@ -407,25 +407,25 @@ procedure dopen(s)			#: open file on DPATH
 end
 
 procedure dosdir( diropts )		#: process DOS directory
-   local de, line 
+   local de, line
 
    static tempfn, tempf, dosdir_ver
 
 initial {
 
    close(open(tempfn := tempname(),"w"))
-   
+
    system("ver > " || tempfn)
-   
-   (tempf := open(tempfn,"r")) | 
+
+   (tempf := open(tempfn,"r")) |
        stop("Unable to open ",tempfn," from dosdir.")
-   
-   while line := read(tempf) do 
+
+   while line := read(tempf) do
 
       if find("MS-DOS",line) then
          if find("6.20",line) then
             dosdir_ver := dosdir_62
-         else 
+         else
             dosdir_ver := dosdir_xx
 
    close(tempf)
@@ -439,10 +439,10 @@ system("dir " || diropts || " > " || tempfn)                # get dir
 tempf := open(tempfn,"r")                               # open file
 
 while line := map(read(tempf)) do {
-   line ? 
+   line ?
       if de := dosdir_ver() then
          suspend de
-      else 
+      else
          next
    }
 
@@ -459,7 +459,7 @@ initial nb := ~' '
 
 if *&subject = 43  & (tab(any(nb)), move(-1)) then {
    de := dirinfo()
-   (de.name := trim(move(8)), move(1), 
+   (de.name := trim(move(8)), move(1),
    de.ext  := trim(move(3)), move(1),
    de.size := move(13), move(1),
    de.date := move(8), move(2),
@@ -478,7 +478,7 @@ initial nb := ~' '
 
 if *&subject = 39  & (tab(any(nb)), move(-1)) then {
    de := dirinfo()
-   (de.name := trim(move(8)), move(1), 
+   (de.name := trim(move(8)), move(1),
    de.ext  := trim(move(3)), move(1),
    de.size := integer(move(9)), move(1),
    de.date := move(8), move(2),
@@ -499,7 +499,7 @@ dpath ||:= dpath[-1] ~== "\\"
 /dpart2 := "*.*"
 
 dl := []
-every di := dosdir( dpath || dpart2 ) do        
+every di := dosdir( dpath || dpart2 ) do
    if not ( di.name == ("." | "..") ) then {
       put( dl, fn := ( dpath || di.name || "." || trim(di.ext) ) )
       (\infotab)[fn] := di
@@ -510,26 +510,26 @@ every di := dosdir( dpath || dpart2 ) do
 end
 
 $ifdef _MSDOS
- 
+
 procedure dosfiles(pfn)			#: DOS file names
    local asciiz, fnr, prefix, k, name
    local ds, dx, result, fnloc, string_block
- 
+
 # Get Disk Transfer Address; filename locn is 30 beyond that.
- 
+
    result := Int86([16r21, 16r2f00] ||| list(7,0))
    # pointer arithmetic wrong: fnloc := 16 * result[8] + result[3]+ 30
    fnloc := ishift( result[8], 16 ) + result[3] + 30
- 
+
 # Get the generalized filename.
- 
+
    fnr := reverse(pfn)
    k := upto("\\:", fnr) | *fnr + 1
    prefix := reverse(fnr[k:0])
    name := "" ~== reverse(fnr[1:k]) | "*.*"
- 
+
 # Get the first file in the sequence.
- 
+
    asciiz := prefix || name || "\x00"
    Poke(string_block := GetSpace(*asciiz), asciiz) |
       stop( "dosfiles(): GetSpace() failed." )
@@ -545,19 +545,19 @@ procedure dosfiles(pfn)			#: DOS file names
       default : stop("I/O Error ", result[2])
       }
    suspend prefix || extract_name(fnloc)
- 
+
 # Get the remaining files in the sequence.
- 
+
    while Int86([16r21, 16r4f00, 0, 0, 0, 0, 0, 0, 0])[2] = 0 do
       suspend prefix || extract_name(fnloc)
 end
 
 $endif
- 
+
 procedure dosname(namein)		#: convert file name to DOS format
 
     local prefix, base, extension, pair, extended_name
-    
+
     namein := replace(namein, "/", "\\")
     pair := tail(namein, "\\")
     prefix := pair[1]
@@ -565,12 +565,12 @@ procedure dosname(namein)		#: convert file name to DOS format
     pair := suffix(extended_name)
     base := pair[1]
     extension := pair[2]
-    
+
     base := base[1:9]
     extension := extension[1:4]
-    
+
     return map(prefix || "\\" || base || "." || extension)
-    
+
 end
 
 procedure dpath(s)			#: full path to file on DPATH
@@ -607,7 +607,7 @@ procedure directory(name)		#: succeed if name is a directory
 end
 
 $ifdef _MSDOS
- 
+
 procedure extract_name(fnloc)
    local asciiz
    asciiz := Peek(fnloc, 13)
@@ -663,7 +663,7 @@ procedure filetext(f)			#: read file into list
    return text
 
 end
- 
+
 $ifdef _MSDOS
 
 procedure getdrive()			#: get current DOS drive
@@ -703,9 +703,9 @@ procedure pathfind(fname, path, psep)		#: find file on path
       /psep := ':'
    $else
    $ifdef _MS_WINDOWS_NT
-      /psep := ';' 
+      /psep := ';'
    $else
-      /psep := ' ' 
+      /psep := ' '
    $endif
    $endif
 
@@ -742,19 +742,19 @@ $ifdef _UNIX
    psep := ":"
 $else
 $ifdef _MS_WINDOWS_NT
-   psep := ";" 
+   psep := ";"
 $else
    psep := " "
 $endif
 $endif
-   
+
    path := getenv("FPATH") | "."
-   if match("Binaries at ", sfeat := &features) then {
+   if match("Binaries at ", sfeat := &config) then {
        path || " " || sfeat[13:0]
    }
-# ^ Binaries at can be patched by: 
+# ^ Binaries at can be patched by:
 # patchstr iconx newpath
-   found := pathfind(fname, path, " ") # pathfind prepends "." 
+   found := pathfind(fname, path, " ") # pathfind prepends "."
 
    if /found then
       stop ("cannot find \"", fname, "\" on path \". ", path, "\"")
@@ -810,7 +810,7 @@ procedure suffix(s,separator)		#: find suffix of file name
    return [s[1:i],s[(*s >= i) + 1:0] | &null]
 end
 
-procedure tail(s,separator)		#: find tail of file name 
+procedure tail(s,separator)		#: find tail of file name
    local i
    /separator := "/"
    i := 0
@@ -836,7 +836,7 @@ procedure tempname(			#: get temporary file name
 
    /prefix := ""
    /suffix := ""
-   exists(\path) | 
+   exists(\path) |
        (path :=  getenv("TEMP") | (if exists("/tmp") then "/tmp") | ".")
 
    if find("MS-DOS"|"MS Windows NT", &features) then
diff --git a/ipl/procs/paths.icn b/ipl/procs/paths.icn
index 7e4276e71..9ec3b7db4 100644
--- a/ipl/procs/paths.icn
+++ b/ipl/procs/paths.icn
@@ -29,9 +29,9 @@ procedure ulibprefix()
    static prefix
    local path, f, c, i
    initial  {
-      if path := (&features ? (="Libraries at " & tab(upto(';') | 0))) then
+      if path := (&config ? (="Libraries at " & tab(upto(';') | 0))) then
          prefix := path || "/"
-      else if (path := (&features ? (="Binaries at " & tab(0)))) |
+      else if (path := (&config ? (="Binaries at " & tab(0)))) |
 	  ((f := open((path := getpaths()) || ("uniconx" | "iconx" |
 					       "uniconx.exe" |"iconx.exe" |
 					       "wuniconx.exe" | "wiconx.exe"))))
diff --git a/src/h/kdefs.h b/src/h/kdefs.h
index e3e8bed43..9e240b6d5 100644
--- a/src/h/kdefs.h
+++ b/src/h/kdefs.h
@@ -10,10 +10,12 @@
 
 KDef(allocated,K_ALLOCATED)
 KDef(ascii,K_ASCII)
+KDef(child,K_CHILD)
 KDef(clock,K_CLOCK)
 KDef(col,K_COL)
 KDef(collections,K_COLLECTIONS)
 KDef(column,K_COLUMN)
+KDef(config,K_CONFIG)
 KDef(control,K_CONTROL)
 KDef(cset,K_CSET)
 KDef(current,K_CURRENT)
@@ -52,10 +54,12 @@ KDef(mrelease,K_MRELEASE)
 KDef(now,K_NOW)
 KDef(null,K_NULL)
 KDef(output,K_OUTPUT)
+KDef(parent,K_PARENT)
 KDef(phi,K_PHI)
 KDef(pi,K_PI)
 KDef(pick,K_PICK)
 KDef(pos,K_POS)
+KDef(proc,K_PROC)
 KDef(progname,K_PROGNAME)
 KDef(random,K_RANDOM)
 KDef(rdrag,K_RDRAG)
diff --git a/src/icont/keyword.h b/src/icont/keyword.h
index 95db983bd..b3e441c85 100644
--- a/src/icont/keyword.h
+++ b/src/icont/keyword.h
@@ -10,68 +10,72 @@
 
 #define K_ALLOCATED    1
 #define K_ASCII        2
-#define K_CLOCK        3
-#define K_COL          4
-#define K_COLLECTIONS  5
-#define K_COLUMN       6
-#define K_CONTROL      7
-#define K_CSET         8
-#define K_CURRENT      9
-#define K_DATE        10
-#define K_DATELINE    11
-#define K_DIGITS      12
-#define K_DUMP        13
-#define K_E           14
-#define K_ERRNO       15
-#define K_ERROR       16
-#define K_ERRORNUMBER 17
-#define K_ERRORTEXT   18
-#define K_ERRORVALUE  19
-#define K_ERROUT      20
-#define K_EVENTCODE   21
-#define K_EVENTSOURCE 22
-#define K_EVENTVALUE  23
-#define K_FAIL        24
-#define K_FEATURES    25
-#define K_FILE        26
-#define K_HOST        27
-#define K_INPUT       28
-#define K_INTERVAL    29
-#define K_LCASE       30
-#define K_LDRAG       31
-#define K_LETTERS     32
-#define K_LEVEL       33
-#define K_LINE        34
-#define K_LPRESS      35
-#define K_LRELEASE    36
-#define K_MAIN        37
-#define K_MDRAG       38
-#define K_META        39
-#define K_MPRESS      40
-#define K_MRELEASE    41
-#define K_NOW         42
-#define K_NULL        43
-#define K_OUTPUT      44
-#define K_PHI         45
-#define K_PI          46
-#define K_PICK        47
-#define K_POS         48
-#define K_PROGNAME    49
-#define K_RANDOM      50
-#define K_RDRAG       51
-#define K_REGIONS     52
-#define K_RESIZE      53
-#define K_ROW         54
-#define K_RPRESS      55
-#define K_RRELEASE    56
-#define K_SHIFT       57
-#define K_SOURCE      58
-#define K_STORAGE     59
-#define K_SUBJECT     60
-#define K_TIME        61
-#define K_TRACE       62
-#define K_UCASE       63
-#define K_VERSION     64
-#define K_WINDOW      65
-#define K_X           66
-#define K_Y           67
+#define K_CHILD        3
+#define K_CLOCK        4
+#define K_COL          5
+#define K_COLLECTIONS  6
+#define K_COLUMN       7
+#define K_CONFIG       8
+#define K_CONTROL      9
+#define K_CSET        10
+#define K_CURRENT     11
+#define K_DATE        12
+#define K_DATELINE    13
+#define K_DIGITS      14
+#define K_DUMP        15
+#define K_E           16
+#define K_ERRNO       17
+#define K_ERROR       18
+#define K_ERRORNUMBER 19
+#define K_ERRORTEXT   20
+#define K_ERRORVALUE  21
+#define K_ERROUT      22
+#define K_EVENTCODE   23
+#define K_EVENTSOURCE 24
+#define K_EVENTVALUE  25
+#define K_FAIL        26
+#define K_FEATURES    27
+#define K_FILE        28
+#define K_HOST        29
+#define K_INPUT       30
+#define K_INTERVAL    31
+#define K_LCASE       32
+#define K_LDRAG       33
+#define K_LETTERS     34
+#define K_LEVEL       35
+#define K_LINE        36
+#define K_LPRESS      37
+#define K_LRELEASE    38
+#define K_MAIN        39
+#define K_MDRAG       40
+#define K_META        41
+#define K_MPRESS      42
+#define K_MRELEASE    43
+#define K_NOW         44
+#define K_NULL        45
+#define K_OUTPUT      46
+#define K_PARENT      47
+#define K_PHI         48
+#define K_PI          49
+#define K_PICK        50
+#define K_POS         51
+#define K_PROC        52
+#define K_PROGNAME    53
+#define K_RANDOM      54
+#define K_RDRAG       55
+#define K_REGIONS     56
+#define K_RESIZE      57
+#define K_ROW         58
+#define K_RPRESS      59
+#define K_RRELEASE    60
+#define K_SHIFT       61
+#define K_SOURCE      62
+#define K_STORAGE     63
+#define K_SUBJECT     64
+#define K_TIME        65
+#define K_TRACE       66
+#define K_UCASE       67
+#define K_VERSION     68
+#define K_WINDOW      69
+#define K_X           70
+#define K_Y           71
diff --git a/src/runtime/keyword.r b/src/runtime/keyword.r
index 3b85bfff2..2c9f803c0 100644
--- a/src/runtime/keyword.r
+++ b/src/runtime/keyword.r
@@ -389,7 +389,7 @@ keyword{0,1} eventvalue
 end
 
 
-"&features - generate strings identifying features in this version of Icon"
+"&features - generate strings identifying runtime features in this version of Unicon"
 keyword{1,*} features
    abstract {
       return string
@@ -430,6 +430,7 @@ keyword{1,*} features
          if (findonpath(UNICONX, patchpath+18, MaxPath)) {
             refpath = patchpath+18;
             patchpath[strlen(patchpath)-strlen(UNICONX)] = '\0';
+            fprintf(stderr,"&features: patchpath %s\n", patchpath);
             }
          else {
             int c;
@@ -461,93 +462,6 @@ keyword{1,*} features
 
 #include "../h/feature.h"
 
-{
-    char *s = alcstr(NULL, 33);
-    if (get_CCompiler(s))
-       suspend C_string s;
-}
-
-{
-        char *s = alcstr(NULL, 44);
-#if NT
-        unsigned long long int l = physicalmemorysize();
-#else                                           /* NT */
-        unsigned long l = physicalmemorysize();
-#endif                                          /* NT */
-        if (l > 0) {
-#if NT
-           sprintf(s, "Physical memory: %llu bytes", l);
-#else                                          /* NT */
-           sprintf(s, "Physical memory: %lu bytes", l);
-#endif                                         /* NT */
-           suspend C_string s;
-           }
-}
-
-#ifdef REPO_REVISION
-{
-         char *s = alcstr(NULL, strlen(REPO_REVISION) + strlen("Revision ") + 1);
-         sprintf(s, "Revision %s", REPO_REVISION);
-         suspend C_string s;
-}
-#endif                                  /* REPO_REVISION */
-
-{
-void get_arch(char *);
-         char *s = alcstr(NULL, 20);
-         get_arch(s);
-         suspend C_string s;
-}
-
-{
-         char *s = alcstr(NULL, 20);
-         if (num_cpu_cores > 0) {
-            sprintf(s, "CPU cores %d", num_cpu_cores );
-            suspend C_string s;
-            }
-}
-
-#if defined(MSWindows) && defined(SM_DIGITIZER)
-      {
-      int value = GetSystemMetrics(SM_DIGITIZER);
-      if (value & NID_READY){ /* stack ready */
-         if (value  & NID_MULTI_INPUT){ /* digitizer is multitouch */
-            suspend C_string "Multitouch input";
-            }
-         else if (value & (NID_INTEGRATED_TOUCH|NID_EXTERNAL_TOUCH)){
-            suspend C_string "Touch input";
-            }
-         else if (value & (NID_INTEGRATED_PEN|NID_EXTERNAL_PEN)){
-            suspend C_string "Pen input";
-            }
-         }
-}
-#endif                                  /* MSWindows && SM_DIGITIZER */
-
-      if (refpath && strlen(refpath) > 0) {
-         char *s;
-         if (!strcmp(refpath+strlen(refpath)-strlen(UNICONX_EXE), UNICONX_EXE)) {
-            refpath[strlen(refpath)-strlen(UNICONX_EXE)] = '\0';
-            /*
-             * Trim prefix letters in front of iconx, if any
-             */
-            while ((strlen(refpath)>0) && isalpha(refpath[strlen(refpath)-1]))
-               refpath[strlen(refpath)-1] = '\0';
-            }
-
-         s = alcstr(NULL, strlen(refpath) + strlen("Binaries at ") + 1);
-         strcpy(s, "Binaries at ");
-         strcat(s, refpath);
-         suspend C_string s;
-         }
-
-      if ((int)strlen(uniroot) > 18) {
-         char *s;
-         s = alcstr(NULL, strlen(uniroot+18) + strlen("Libraries at ") + 1);
-         strcpy(s, "Libraries at ");
-         strcat(s, uniroot+18);
-         suspend C_string s;
-         }
 
       fail;
       }
@@ -1177,3 +1091,197 @@ constant '\
 \340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\
 \360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'
 end
+
+"&proc - the function reference to proc()."
+keyword{1} proc
+   abstract {
+      return proc
+      }
+   body {
+      struct b_proc *prc;
+      struct descrip x;
+
+      StrLen(x) = 4;
+      StrLoc(x) = "proc";
+      prc = bi_strprc(&x, 0);
+      return proc(prc);
+      }
+end
+
+
+"&config - generate strings identifying configuration features in this version of Unicon"
+keyword{1,*} config
+   abstract {
+      return string
+      }
+   body {
+#ifdef RefPath
+      char *refpath = RefPath;
+#else                                   /* RefPath */
+      char *refpath = "";
+#endif                                  /* RefPath */
+
+      CURTSTATVAR();
+
+      if ((int)strlen(patchpath) > 18) refpath = patchpath+18;
+      else if (strlen(refpath)==0) {
+         struct stat buffer;
+         char *iconx;
+         int xnamelen;
+
+         iconx = relfile(StrLoc(kywd_prog), "/../" UNICONX_EXE);
+         xnamelen = strlen(UNICONX_EXE); /* "iconx.exe" */
+
+         // check if we have iconx on a path relative to us
+         if ((stat(iconx,&buffer)) == 0) {
+            refpath = patchpath+18;
+            strcpy(refpath, iconx);
+            patchpath[strlen(patchpath)-xnamelen] = '\0';
+            }
+         }
+      else {
+#if MSDOS
+         if (pathFind(UNICONX_EXE, patchpath+18, MaxPath)) {
+            refpath = patchpath+18;
+            patchpath[strlen(patchpath)-strlen(UNICONX_EXE)] = '\0';
+            }
+#endif                                  /* MSDOS */
+#if UNIX
+         if (findonpath(UNICONX, patchpath+18, MaxPath)) {
+            refpath = patchpath+18;
+            patchpath[strlen(patchpath)-strlen(UNICONX)] = '\0';
+            }
+         else {
+            int c;
+            FILE *f = fopen(StrLoc(kywd_prog), "r");
+            if (f != NULL) {
+               /*
+                * look for iconx in our icode file (could also try the dir
+                * containing &progname). Should fix to look rather at argv[0]
+                * or save iconx path from icode when icode is loaded.
+                */
+               while ((c = getc(f)) && (c != EOF) && (c != '\n'));
+               refpath = patchpath+18;
+               if (fscanf(f, "IXBIN=%s\n", refpath) != 1) refpath = "";
+               fclose(f);
+               }
+            else {
+               fprintf(stderr,"&config: can't open '%s' to look for iconx\n",
+                       StrLoc(kywd_prog));
+               }
+            }
+#endif                                  /* UNIX */
+         }
+
+{
+    char *s = alcstr(NULL, 33);
+    if (get_CCompiler(s))
+       suspend C_string s;
+}
+
+{
+        char *s = alcstr(NULL, 44);
+#if NT
+        unsigned long long int l = physicalmemorysize();
+#else                                           /* NT */
+        unsigned long l = physicalmemorysize();
+#endif                                          /* NT */
+        if (l > 0) {
+#if NT
+           sprintf(s, "Physical memory: %llu bytes", l);
+#else                                          /* NT */
+           sprintf(s, "Physical memory: %lu bytes", l);
+#endif                                         /* NT */
+           suspend C_string s;
+           }
+}
+
+#ifdef REPO_REVISION
+{
+         char *s = alcstr(NULL, strlen(REPO_REVISION) + strlen("Revision ") + 1);
+         sprintf(s, "Revision %s", REPO_REVISION);
+         suspend C_string s;
+}
+#endif                                  /* REPO_REVISION */
+
+{
+void get_arch(char *);
+         char *s = alcstr(NULL, 20);
+         get_arch(s);
+         suspend C_string s;
+}
+
+{
+         char *s = alcstr(NULL, 20);
+         if (num_cpu_cores > 0) {
+            sprintf(s, "CPU cores %d", num_cpu_cores );
+            suspend C_string s;
+            }
+}
+
+#if defined(MSWindows) && defined(SM_DIGITIZER)
+      {
+      int value = GetSystemMetrics(SM_DIGITIZER);
+      if (value & NID_READY){ /* stack ready */
+         if (value  & NID_MULTI_INPUT){ /* digitizer is multitouch */
+            suspend C_string "Multitouch input";
+            }
+         else if (value & (NID_INTEGRATED_TOUCH|NID_EXTERNAL_TOUCH)){
+            suspend C_string "Touch input";
+            }
+         else if (value & (NID_INTEGRATED_PEN|NID_EXTERNAL_PEN)){
+            suspend C_string "Pen input";
+            }
+         }
+}
+#endif                                  /* MSWindows && SM_DIGITIZER */
+
+      if (refpath && strlen(refpath) > 0) {
+         char *s;
+         if (!strcmp(refpath+strlen(refpath)-strlen(UNICONX_EXE), UNICONX_EXE)) {
+            refpath[strlen(refpath)-strlen(UNICONX_EXE)] = '\0';
+            /*
+             * Trim prefix letters in front of iconx, if any
+             */
+            while ((strlen(refpath)>0) && isalpha(refpath[strlen(refpath)-1]))
+               refpath[strlen(refpath)-1] = '\0';
+            }
+
+         s = alcstr(NULL, strlen(refpath) + strlen("Binaries at ") + 1);
+         strcpy(s, "Binaries at ");
+         strcat(s, refpath);
+         suspend C_string s;
+         }
+
+      if ((int)strlen(uniroot) > 18) {
+         char *s;
+         s = alcstr(NULL, strlen(uniroot+18) + strlen("Libraries at ") + 1);
+         strcpy(s, "Libraries at ");
+         strcat(s, uniroot+18);
+         suspend C_string s;
+         }
+
+      fail;
+      }
+end
+
+
+"&child - returns all threads created by the current thread - just fail at this time"
+keyword{0} child
+   abstract {
+      return empty_type
+      }
+   inline {
+      fail;
+      }
+end
+
+"&parent - return the parent of the current thread - just fail at this time"
+keyword{0} parent
+   abstract {
+      return empty_type
+      }
+   inline {
+      fail;
+      }
+end
diff --git a/uni/ide/ui.icn b/uni/ide/ui.icn
index 5aca67d2e..b4a5d09a4 100644
--- a/uni/ide/ui.icn
+++ b/uni/ide/ui.icn
@@ -106,7 +106,7 @@ class UIDE : Dialog(
    # Set Doc Path Proc:
    #
    method set_docpath()
-      match("Binaries at ", docpath := &features) |
+      match("Binaries at ", docpath := &config) |
       Notice("What, no binaries?" ||
              "Have you added Unicon's bin directory to your path?")
       docpath ?:= (="Binaries at " & tab(0))
@@ -516,7 +516,7 @@ end
 #Accel|null|Event Handlers|list|0|Class Variable|integer|1|Parent Compo
 #nent|1|Children|list|1|class|CanvasTabItem|28|Parent Canvas|1|Name|str
 #ing|tab_item_2|Class Name|string|TabItem|Import Name|string|gui|X Fix|
-#null|Y Fix|null|W Fix|null|H Fix|null|W Default|null|H Default|null|X 
+#null|Y Fix|null|W Fix|null|H Fix|null|W Default|null|H Default|null|X
 #Spec|integer|0|Y Spec|integer|0|W Spec|string|100%|H Spec|string|100%|
 #X Align|string|l|Y Align|string|t|Is shaded|null|Is Button Subclass|nu
 #ll|Draw Border|null|Attribs|list|0|Tooltip|null|Accel|null|Event Handl
@@ -546,7 +546,7 @@ end
 #Children|list|1|class|CanvasTree|29|Parent Canvas|1|Name|string|FileBr
 #owser|Class Name|string|ClassBrowser|Import Name|string|gui|X Fix|null
 #|Y Fix|null|W Fix|null|H Fix|null|W Default|null|H Default|null|X Spec
-#|string|2|Y Spec|string|2|W Spec|string|100%-4|H Spec|string|100%-4|X 
+#|string|2|Y Spec|string|2|W Spec|string|100%-4|H Spec|string|100%-4|X
 #Align|string|l|Y Align|string|t|Is shaded|null|Is Button Subclass|null
 #|Draw Border|integer|1|Attribs|list|1|string|bg=white|Tooltip|null|Acc
 #el|null|Event Handlers|list|0|Class Variable|integer|1|Parent Componen
diff --git a/uni/udb/srcfile.icn b/uni/udb/srcfile.icn
index f7da6cf9d..2f5feb58e 100644
--- a/uni/udb/srcfile.icn
+++ b/uni/udb/srcfile.icn
@@ -1,8 +1,8 @@
-#  
+#
 #  srcfile.icn: Handles the collected Source Files from the Icode
 #  Author:      Ziad Al-Sharif, zsharif@gmail.com
 #  Contributor: Gigi Young
-# 
+#
 
 $include "defaults.icn"
 
@@ -13,14 +13,14 @@ link basename
 
 #
 # It is used to index the loaded source files in the srcText list
-# 
+#
 record fileIndex(
    fbegin, # where the source file index starts in srcText
    fend    # where the source file index ends in srcText
    )
 
 #
-# Contains all of the source files issues such as found files and so  
+# Contains all of the source files issues such as found files and so
 #
 class SourceFile(
    procMainFile, # The Source File that has the procedure main
@@ -32,7 +32,7 @@ class SourceFile(
    libFiles,     # a set of the loaded library files
    incFiles,     # a set of the loaded included files
    foundFiles,   # Set with all file names that were found - loaded
-   missingFiles, # Set with all file names that were not found - not loaded 
+   missingFiles, # Set with all file names that were not found - not loaded
 
    fileNames,    # List with all source file names that are in the binary
    fileText,      # Table mapping filenames to lists of their contents by lineno
@@ -83,7 +83,7 @@ method loadSourceFiles(fname, src)
 end
 
 #
-# Reads the contents of filename to fileText (table mapping filename to a 
+# Reads the contents of filename to fileText (table mapping filename to a
 # list of strings)
 #
 method storeFileText(filename)
@@ -110,7 +110,7 @@ end
 method findDirectory(filename)
    local path, s, file
 
-   # source 
+   # source
    srcPath ? {
       while path := tab(find(";") | 0) do {
          s := path||PS||filename
@@ -118,15 +118,15 @@ method findDirectory(filename)
          if st := stat(s) then {
             #debug("\tfound '",s,"'")
             insert(userFiles,filename)
-            if p := getAbsDirectory(path) then 
+            if p := getAbsDirectory(path) then
                path := p
             return path
             }
          tab(many(';')) | break
          }
-      } 
+      }
 
-   # library files 
+   # library files
    libPath ? {
       while path := tab(find(";") | 0) do {
          s := path||PS||filename
@@ -134,15 +134,15 @@ method findDirectory(filename)
          if st := stat(s) then {
             #debug("\tfound '",s,"'")
             insert(libFiles,filename)
-            if p := getAbsDirectory(path) then 
-               path := p 
-            return path 
+            if p := getAbsDirectory(path) then
+               path := p
+            return path
             }
          tab(many(';')) | break
          }
-      } 
+      }
 
-   # includes 
+   # includes
    incPath ? {
       while path := tab(find(";") | 0) do {
          s := path||PS||filename
@@ -150,7 +150,7 @@ method findDirectory(filename)
          if st := stat(s) then {
             #debug("\tfound '",s,"'")
             insert(incFiles,filename)
-            if p := getAbsDirectory(path) then 
+            if p := getAbsDirectory(path) then
                path := p
             return path
             }
@@ -171,14 +171,14 @@ method getAbsDirectory(dir)
       }
 end
 
-# 
+#
 # Updates (curr_symtab) to reflect the execution of the given program
 # This includes changes made by commands 'up', 'down', and 'coexp'
 #
-method updateCurrSymtab(coState) 
+method updateCurrSymtab(coState)
    local filename, line
 
-   # normal program execution 
+   # normal program execution
    if coState.curr.val === coState.target.val then {
       filename := keyword("file",coState.curr.val,coState.curr.curr_frame)
       line := keyword("line",coState.curr.val,coState.curr.curr_frame)
@@ -191,7 +191,7 @@ method updateCurrSymtab(coState)
 
    # lookup symbol table scope with file/line
    if symt := symtab.lookup_fileline(filename, line) then {
-      curr_symtab := symt 
+      curr_symtab := symt
       #debug("current symbol table: ",curr_symtab.tag," ",curr_symtab.label)
       return
       }
@@ -210,7 +210,7 @@ end
 #
 method findProc(pname)
    if symt := symtab.lookup_name(pname) then {
-      if symt.tag == "proc" then 
+      if symt.tag == "proc" then
          return [symt.filename, symt.start_line, symt.end_line]
       }
 end
@@ -224,7 +224,7 @@ method findProcMethod(name)
    if type(x := curr_symtab.lookup_scope_name(name)) == "Symtab__state" &
       x.tag == ("proc"|"method") then {
       #debug(image(name),": ",x.tag," ",x.label)
-      return [x.filename, x.start_line, x.end_line] 
+      return [x.filename, x.start_line, x.end_line]
       }
 end
 
@@ -236,9 +236,9 @@ method findClassMethod(cls, mthd)
    local symt
    if symt := symtab.lookup_name(cls) then {
       if symt.tag == "class" & (symt := symt.lookup_name(mthd)) then {
-         if symt.tag == "method" then 
+         if symt.tag == "method" then
             return [symt.filename, symt.start_line, symt.end_line]
-         } 
+         }
       }
 end
 
@@ -254,7 +254,7 @@ method findPkgProc(pkg, pname)
          }
       }
 end
- 
+
 #
 # Looks for a class method (mthd) within package (pkg)
 #
@@ -285,9 +285,9 @@ method isProcedure(pname, pkg)
    local symt := symtab
    if \pkg then {
       if /(symt := symtab.pkgtab[pkg]) then fail
-      } 
+      }
    if \(x := symt.nametab[pname]) & type(x) == "Symtab__state" then {
-      if x.tag == "proc" & x.label == pname then return pname 
+      if x.tag == "proc" & x.label == pname then return pname
       }
 end
 
@@ -299,18 +299,18 @@ method isClass(cls, pkg)
    local symt := symtab
    if \pkg then {
       if /(symt := symtab.pkgtab[pkg]) then fail
-      } 
+      }
    if \(x := symt.nametab[cls]) & type(x) == "Symtab__state" then {
       if x.tag == "class" & x.label == cls then return cls
       }
 end
 
 #
-# Checks if var is global. If (pkg) is given, checks if var is global in (pkg). 
+# Checks if var is global. If (pkg) is given, checks if var is global in (pkg).
 #
 method isGlobal(var, pkg)
    local x, symt := symtab
-  
+
    if \pkg then {
       if /(symt := symtab.pkgtab[pkg]) then fail
       }
@@ -346,14 +346,14 @@ end
 # returns a list of all built-in functions used in the loaded program
 #
 method getFunctions()
-   local f, names := [] 
+   local f, names := []
 
    if *functions > 0 then{
       every f := !functions do
          push(names, f)
       return sortf(names)
       }
-   else 
+   else
       fail
 end
 
@@ -363,7 +363,7 @@ end
 #
 method isFunction(name)
 
-   if member(functions, name) then 
+   if member(functions, name) then
       return
    fail
 end
@@ -385,7 +385,7 @@ end
 #
 method isLocal(var)
    local x
-   if curr_symtab.tag ~== "global" & 
+   if curr_symtab.tag ~== "global" &
       \(x := curr_symtab.nametab[var]) & type(x) == "string" then {
       if x == "local" then return var
       }
@@ -395,7 +395,7 @@ end
 # Checks whether var is static in the current scope
 #
 method isStatic(var)
-   local x 
+   local x
    if \(x := curr_symtab.nametab[var]) & type(x) == "string" then {
       if x == "static" then return var
       }
@@ -418,7 +418,7 @@ end
 method getCurrGlobals()
    local globals := [], symt
 
-   symt := curr_symtab 
+   symt := curr_symtab
    while symt := \symt.parent do {
       if symt.tag == "package" then {
          #debug("found package ",symt.label)
@@ -457,7 +457,7 @@ method getCurrParams()
 end
 
 #
-# If pkg is null, returns all global variables outside of packages. 
+# If pkg is null, returns all global variables outside of packages.
 # If a package is specified, returns global variables from pkg.
 #
 method getGlobals(pkg)
@@ -465,9 +465,9 @@ method getGlobals(pkg)
 
    if /pkg then globals |||:= symtab.locals
    else {
-      if \(symt := symtab.pkgtab[pkg]) then 
+      if \(symt := symtab.pkgtab[pkg]) then
          every x := !symt.locals do put(globals, pkg||"__"||x)
-      } 
+      }
    return globals
 end
 
@@ -477,12 +477,12 @@ end
 #
 method getPackages(pkg)
    local globnames := [], prefix := ""
-   if /pkg then 
+   if /pkg then
       globnames |||:= symtab.packages
    else {
       if \(symt := symtab.pkgtab[pkg]) then {
             prefix := pkg||"__"
-         every x := !symt.globals do put(globnames, prefix||x) 
+         every x := !symt.globals do put(globnames, prefix||x)
          every x := !symt.procs do put(globnames,"procedure "||prefix||x)
          every x := !symt.records do put(globnames,"record "||prefix||x)
          every x := !symt.classes do put(globnames,"class "||prefix||x)
@@ -492,37 +492,37 @@ method getPackages(pkg)
 end
 
 #
-# If pkg is null, returns all procedures outside of packages. 
+# If pkg is null, returns all procedures outside of packages.
 # If a package is specified, returns procedures from pkg.
 #
 method getProcedures(pkg)
    local procs := [], symt
-   
+
    if /pkg then procs |||:= symtab.procs
    else {
-      if \(symt := symtab.pkgtab[pkg]) then 
+      if \(symt := symtab.pkgtab[pkg]) then
          every x := !symt.procs do put(procs, pkg||"__"||x)
       }
    return procs
 end
 
 #
-# If pkg is null, returns all records outside of packages. 
+# If pkg is null, returns all records outside of packages.
 # If a package is specified, returns records from pkg.
 #
 method getRecords(pkg)
    local records := [], symt
-   
+
    if /pkg then records |||:= symtab.records
    else {
-      if \(symt := symtab.pkgtab[pkg]) then 
-         every x := !symt.records do put(records, pkg||"__"||x) 
+      if \(symt := symtab.pkgtab[pkg]) then
+         every x := !symt.records do put(records, pkg||"__"||x)
       }
    return records
 end
 
 #
-# If pkg is null, returns all classes outside of packages. If a package is 
+# If pkg is null, returns all classes outside of packages. If a package is
 # specified, returns classes from pkg.
 # If cls is specified, then returns all members and methods from that class
 # if it exists (from pkg if specified, or from global scope if not).
@@ -546,11 +546,11 @@ method getClasses(pkg, cls)
       # get class fields
       if \(symt := symt.nametab[cls]) then {
          if type(symt) == "Symtab__state" & symt.tag == "class" then {
-            every x := !symt.locals do put(names,x) 
+            every x := !symt.locals do put(names,x)
             every x := !symt.methods do put(names,"method "||x)
-            return names  
-            } 
-         } 
+            return names
+            }
+         }
       else {
          write("\n   Could not find class",prefix,cls,". Please try again.")
          fail
@@ -560,8 +560,8 @@ method getClasses(pkg, cls)
    else if /pkg then classes |||:= symtab.classes
    # returns all classes from package [pkg] - /cls & \pkg
    else {
-      if \(symt := symtab.pkgtab[pkg]) then 
-         every x := !symt.classes do put(classes, pkg||"__"||x) 
+      if \(symt := symtab.pkgtab[pkg]) then
+         every x := !symt.classes do put(classes, pkg||"__"||x)
       }
    return classes
 end
@@ -576,7 +576,7 @@ end
 method isSrcFile(fname)
 
   if \fname then{
-     if not find(".icn", fname) then fname ||:= ".icn" 
+     if not find(".icn", fname) then fname ||:= ".icn"
      if member(foundFiles, fname) | member(missingFiles, fname) then
         return
      }
@@ -608,7 +608,7 @@ method getSourceFileSize(f)
   fstat := stat(f) | fail
   fsize := fstat.size
 
-  return fsize 
+  return fsize
 end
 
 #
@@ -649,14 +649,14 @@ method getSrcCode(fname)
    if not member(fileText, fname) then fail
 
    if \(text := fileText[fname]) then {
-      every line := 1 to *text do 
+      every line := 1 to *text do
          put(code, line||"\t"||text[line])
       return code
       }
 end
 
 #
-# returns a sorted list of all opend src file names 
+# returns a sorted list of all opend src file names
 #
 method getFoundFiles()
    local L
@@ -666,7 +666,7 @@ method getFoundFiles()
       return L
       }
    else
-      fail  
+      fail
 end
 
 #
@@ -695,7 +695,7 @@ end
 method getMissingFiles()
    local L
 
-   if *missingFiles > 0 then{ 
+   if *missingFiles > 0 then{
       L := sortf(missingFiles)
       return L
       }
@@ -708,7 +708,7 @@ end
 #
 method getSourceFiles()
    local L
-   
+
    if *fileNames > 0 then{
       L := sortf(fileNames)
       return L
@@ -722,7 +722,7 @@ end
 #
 method getUserFiles()
    local L
-   
+
    if *userFiles > 0 then{
       L := sortf(userFiles)
       return L
@@ -736,7 +736,7 @@ end
 #
 method getLibFiles()
    local L
-   
+
    if *libFiles > 0 then{
       L := sortf(libFiles)
       return L
@@ -751,7 +751,7 @@ end
 method getBinPath()
    local f
 
-   if (binPath := (&features ? (="Binaries at " & tab(0)))) |
+   if (binPath := (&config ? (="Binaries at " & tab(0)))) |
       ((f := open((binPath:=getpaths()) ||
                   ("iconx"|"iconx.exe"|"wiconx.exe")))) then
       close(\f)
@@ -763,10 +763,10 @@ end
 #
 method getSrcPath()
    local path
-   comp_dir := chdir(".")  
+   comp_dir := chdir(".")
    path := ". " || comp_dir
 
-   return path 
+   return path
 end
 
 #
@@ -817,7 +817,7 @@ end
 #
 # NOTE: need to add cmd to show dirs.. gdb: show directories | dir
 #
-method cmdShowDir(cmd) 
+method cmdShowDir(cmd)
    if *cmd = 2 then {
       write("Source directories: ",srcPath)
       return
@@ -826,7 +826,7 @@ method cmdShowDir(cmd)
       Message := "\n   Undefined Command: \""||DState.cmdHistory[1]||"\""||
                  "\n   Try \"help\" for assistance."
       write(Message)
-      } 
+      }
 end
 
 method reinit()
diff --git a/uni/unicon/unicon.icn b/uni/unicon/unicon.icn
index b49518b8d..8ca127497 100644
--- a/uni/unicon/unicon.icn
+++ b/uni/unicon/unicon.icn
@@ -1045,7 +1045,7 @@ local cmd, dash_s
       # try for binaries directory via &progname.  Won't be very
       # successful
       #
-      cmd := ((&features ? (="Binaries at " & tab(0))) |
+      cmd := ((&config ? (="Binaries at " & tab(0))) |
               (&progname ? tab(find("unicon"))) | "")
 
       if &features=="MS Windows NT" then {
diff --git a/uni/unicon/unigram.icn b/uni/unicon/unigram.icn
index 05a04a264..3e6f88ebd 100644
--- a/uni/unicon/unigram.icn
+++ b/uni/unicon/unigram.icn
@@ -18,7 +18,7 @@ procedure Keyword(x1,x2)
                        "errno","window","col","row","x","y","interval",
                        "control","shift","meta","lpress","mpress","rpress",
                        "lrelease","mrelease","rrelease","ldrag","mdrag",
-                       "rdrag","resize","ascii","cset"])
+                       "rdrag","resize","ascii","cset","proc","config","child","parent"])
       }
 
    # verify that x2 is a valid keyword
@@ -287,7 +287,7 @@ $define SNDBK 386
 $define RCV 387
 $define RCVBK 388
 $define YYERRCODE 256
-procedure init() 
+procedure init()
   yylhs := [                                        -1,
     0,    1,    1,    2,    2,    2,    2,    2,    2,    2,
     2,   11,   11,   11,   16,   16,   10,   17,   20,   20,
@@ -2635,8 +2635,8 @@ procedure init_stacks()
   local i
   statestk := []
   valstk := []
-  yyval  := 0 
-  yylval := 0 
+  yyval  := 0
+  yylval := 0
   action := list(1000, action_null)  # remove hard coded 1000 later
   every i := 1 to 1000 do action[i] := proc("action_" || i)
 end
@@ -3328,16 +3328,16 @@ procedure yyparse()
   local doaction   # set to 1 if there need to execute action
   local token      # current token
 
-  if /yytable then init() 
-  init_stacks() 
-  yynerrs   := 0 
-  yyerrflag := 0 
+  if /yytable then init()
+  init_stacks()
+  yynerrs   := 0
+  yyerrflag := 0
   yychar    := -1           # impossible char forces a read
   yystate   := 0            # initial state
   push(statestk, yystate)   # save it
 
   repeat { # until parsing is done, either correctly, or w/error
-    doaction := 1 
+    doaction := 1
 
     ##### NEXT ACTION (from reduction table)
    yyn := yydefred[yystate+1]
@@ -3349,15 +3349,15 @@ procedure yyparse()
         ##### ERROR CHECK ####
         if yychar < 0 then { # it it didn't work/error
           yychar := 0        # change it to default string (no -1!)
-          if \yydebug = 1 then yylexdebug(yystate, yychar) 
+          if \yydebug = 1 then yylexdebug(yystate, yychar)
           }
         } # yychar < 0
-     
+
       yyn := yysindex[yystate+1]  # get amount to shift by (shift index)
 
-      if (yyn ~= 0)           & ((yyn +:= yychar) >= 0) & 
+      if (yyn ~= 0)           & ((yyn +:= yychar) >= 0) &
          (yyn <= YYTABLESIZE) & (yycheck[yyn+1] = yychar) then {
-           
+
         ##### NEXT STATE ####
         yystate := yytable[yyn+1] # we are in a new state
         push(statestk, yystate)   # save it
@@ -3374,38 +3374,38 @@ procedure yyparse()
     if (yyn ~= 0)           & ((yyn +:= yychar) >= 0) &
        (yyn <= YYTABLESIZE) & (yycheck[yyn+1] = yychar) then {
       # e reduced!
-      yyn      := yytable[yyn+1] 
+      yyn      := yytable[yyn+1]
       doaction := 1  # get ready to execute
       break          # drop down to actions
       }
     else { #ERROR RECOVERY
       if yyerrflag == 0 then {
-        (\yyerror | write)("syntax error") 
-        yynerrs +:= 1 
+        (\yyerror | write)("syntax error")
+        yynerrs +:= 1
       }
       if yyerrflag < 3 then {     # low error count?
-        yyerrflag := 3 
+        yyerrflag := 3
         repeat { #do until break
           if *statestk < 1 then {  # check for under & overflow here
             (\yyerror | write)("stack underflow. aborting...")   # note lower case 's'
-            return 1 
+            return 1
           }
-          yyn := yysindex[statestk[1]] 
+          yyn := yysindex[statestk[1]]
           if ((yyn ~= 0) & (yyn +:= YYERRCODE) >= 0 &
                     yyn <= YYTABLESIZE & yycheck[yyn+1] == YYERRCODE) then {
-            yystate := yytable[yyn+1] 
-            push(statestk, yystate) 
-            push(valstk, yylval) 
-            doaction := 0 
-            break 
+            yystate := yytable[yyn+1]
+            push(statestk, yystate)
+            push(valstk, yylval)
+            doaction := 0
+            break
           }
           else {
             if *statestk = 0 then { # check for under & overflow here
               write("Stack underflow. aborting...") # capital 'S'
-              return 1 
+              return 1
             }
-            pop(statestk) 
-            pop(valstk) 
+            pop(statestk)
+            pop(valstk)
             }
           }
         }
@@ -3413,16 +3413,16 @@ procedure yyparse()
         {
         if yychar = 0 then return 1  # yyabort
         if \yydebug = 1 then {
-          yys := &null 
-          if yychar <= YYMAXTOKEN then yys := yyname[yychar+1] 
-          if integer(yys) & yys = 0 then yys := "illegal-symbol" 
+          yys := &null
+          if yychar <= YYMAXTOKEN then yys := yyname[yychar+1]
+          if integer(yys) & yys = 0 then yys := "illegal-symbol"
           write("state ",  yystate, ", error recovery discards token ",
-                yychar, " (", yys, ")") 
+                yychar, " (", yys, ")")
           }
         yychar := -1       # read another
         }
       } # end error recovery
-      yyn := yydefred[yystate+1] 
+      yyn := yydefred[yystate+1]
     }# yyn = 0 loop
 
     if doaction = 0 then   # any reason not to proceed?
@@ -3478,12 +3478,12 @@ end
 
 procedure action_1()
 #line 311 "unigram.y"
- Progend(valstk[2]) 
+ Progend(valstk[2])
 end
 
 procedure action_2()
 #line 313 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_3()
@@ -3491,12 +3491,12 @@ procedure action_3()
 
              if /parsingErrors | *parsingErrors = 0 then iwrites(&errout,".")
              yyval := node("decls", valstk[2], valstk[1])
-             
+
 end
 
 procedure action_12()
 #line 329 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_13()
@@ -3506,7 +3506,7 @@ procedure action_13()
            yyval.locals := valstk[3]
            yyval.initl := valstk[2]
            yyval.procbody := valstk[1]
-        
+
 end
 
 procedure action_14()
@@ -3516,19 +3516,19 @@ procedure action_14()
            yyval.locals := valstk[3]
            yyval.initl := valstk[2]
            yyval.procbody := valstk[1]
-        
+
 end
 
 procedure action_15()
 #line 344 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_17()
 #line 347 "unigram.y"
 
     yyval := class_from_parts(valstk[7], valstk[5], valstk[4], valstk[2])
-   
+
 end
 
 procedure action_18()
@@ -3550,67 +3550,67 @@ procedure action_18()
    yyval.fields := valstk[2]
    yyval.lptoken := valstk[3]
    yyval.rptoken := valstk[1]
-   
+
 end
 
 procedure action_19()
 #line 370 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_20()
 #line 371 "unigram.y"
- yyval := node("supers", valstk[3], valstk[2], valstk[1]) 
+ yyval := node("supers", valstk[3], valstk[2], valstk[1])
 end
 
 procedure action_21()
 #line 372 "unigram.y"
- yyval := node("supers", valstk[3], valstk[2], valstk[1]) 
+ yyval := node("supers", valstk[3], valstk[2], valstk[1])
 end
 
 procedure action_22()
 #line 375 "unigram.y"
- yyval := node("packageref", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("packageref", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_23()
 #line 376 "unigram.y"
- yyval := node("packageref", valstk[2],valstk[1]) 
+ yyval := node("packageref", valstk[2],valstk[1])
 end
 
 procedure action_24()
 #line 379 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_25()
 #line 380 "unigram.y"
- yyval := node("methods", valstk[2],valstk[1]) 
+ yyval := node("methods", valstk[2],valstk[1])
 end
 
 procedure action_26()
 #line 381 "unigram.y"
- yyval := node("methods", valstk[2],valstk[1]) 
+ yyval := node("methods", valstk[2],valstk[1])
 end
 
 procedure action_27()
 #line 382 "unigram.y"
- yyval := node("methods", valstk[2],valstk[1]) 
+ yyval := node("methods", valstk[2],valstk[1])
 end
 
 procedure action_28()
 #line 385 "unigram.y"
- yyval := node("invocable", valstk[2], valstk[1]) 
+ yyval := node("invocable", valstk[2], valstk[1])
 end
 
 procedure action_30()
 #line 388 "unigram.y"
- yyval := node("invoclist", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("invoclist", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_33()
 #line 392 "unigram.y"
-yyval := node("invocop3", valstk[3],valstk[2],valstk[1]) 
+yyval := node("invocop3", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_34()
@@ -3633,7 +3633,7 @@ procedure action_34()
       thePackage.insertfname(yyfilename)
       thePackage.add_imported()
       }
-   
+
 end
 
 procedure action_35()
@@ -3641,27 +3641,27 @@ procedure action_35()
 
    yyval := node("import", valstk[2],valstk[1]," ")
    import_class(valstk[1])
-   
+
 end
 
 procedure action_36()
 #line 419 "unigram.y"
- yyval := node("link", valstk[2],valstk[1]," ") 
+ yyval := node("link", valstk[2],valstk[1]," ")
 end
 
 procedure action_38()
 #line 422 "unigram.y"
- yyval := node("lnklist", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("lnklist", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_40()
 #line 425 "unigram.y"
- yyval := node("implist", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("implist", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_43()
 #line 430 "unigram.y"
- yyval := node("global", valstk[2],valstk[1]) 
+ yyval := node("global", valstk[2],valstk[1])
 end
 
 procedure action_44()
@@ -3670,12 +3670,12 @@ procedure action_44()
                 yyval := declaration(valstk[4],valstk[2],valstk[5],valstk[3],valstk[1])
                 if \iconc then
                    ca_add_proc(yyfilename, valstk[4].s)
-                
+
 end
 
 procedure action_45()
 #line 438 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_47()
@@ -3684,7 +3684,7 @@ procedure action_47()
 #               body_scopeck(valstk[2])
                 valstk[4] := AppendListCompTemps(valstk[4], valstk[2])
                 yyval := node("proc", valstk[6],";",valstk[4],valstk[3],valstk[2],valstk[1])
-                
+
 end
 
 procedure action_48()
@@ -3694,7 +3694,7 @@ procedure action_48()
                 yyval.locals := valstk[4]
                 yyval.initl := valstk[3]
                 yyval.procbody := valstk[2]
-                
+
 end
 
 procedure action_49()
@@ -3702,7 +3702,7 @@ procedure action_49()
 
                 yyval := valstk[1]
                 yyval.abstract_flag := 1
-                
+
 end
 
 procedure action_50()
@@ -3711,49 +3711,49 @@ procedure action_50()
                 yyval := declaration(valstk[4], valstk[2], valstk[5], valstk[3], valstk[1])
                 if \iconc then
                    ca_add_proc(yyfilename, valstk[4].s)
-                
+
 end
 
 procedure action_51()
 #line 464 "unigram.y"
 
                 yyval := Method( , , , , , valstk[5], valstk[4].s, valstk[2], valstk[5].s, valstk[3], valstk[1])
-                
+
 end
 
 procedure action_52()
 #line 469 "unigram.y"
- yyval := argList( , , &null) 
+ yyval := argList( , , &null)
 end
 
 procedure action_53()
 #line 470 "unigram.y"
- yyval := argList( , , valstk[1]) 
+ yyval := argList( , , valstk[1])
 end
 
 procedure action_54()
 #line 471 "unigram.y"
- yyval := argList("[]" , , valstk[3]) 
+ yyval := argList("[]" , , valstk[3])
 end
 
 procedure action_55()
 #line 473 "unigram.y"
- yyval := argList( , , &null) 
+ yyval := argList( , , &null)
 end
 
 procedure action_56()
 #line 474 "unigram.y"
- yyval := argList( , , valstk[1]) 
+ yyval := argList( , , valstk[1])
 end
 
 procedure action_57()
 #line 475 "unigram.y"
- yyval := argList("[]" , , valstk[3]) 
+ yyval := argList("[]" , , valstk[3])
 end
 
 procedure action_59()
 #line 479 "unigram.y"
- yyval := node("idlist", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("idlist", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_61()
@@ -3788,22 +3788,22 @@ end
 
 procedure action_69()
 #line 492 "unigram.y"
- yyval := node("parmlist", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("parmlist", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_71()
 #line 495 "unigram.y"
- yyval := node("parmlist", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("parmlist", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_73()
 #line 498 "unigram.y"
- yyval := node("arg2", valstk[3], valstk[2], valstk[1]) 
+ yyval := node("arg2", valstk[3], valstk[2], valstk[1])
 end
 
 procedure action_74()
 #line 499 "unigram.y"
- yyval := node("arg3", valstk[3], valstk[2], valstk[1]) 
+ yyval := node("arg3", valstk[3], valstk[2], valstk[1])
 end
 
 procedure action_75()
@@ -3813,661 +3813,661 @@ end
 
 procedure action_76()
 #line 501 "unigram.y"
- yyval := node("arg5", valstk[4], valstk[3], Keyword(valstk[2], valstk[1])) 
+ yyval := node("arg5", valstk[4], valstk[3], Keyword(valstk[2], valstk[1]))
 end
 
 procedure action_77()
 #line 502 "unigram.y"
- yyval := node("arg6", valstk[6], valstk[5], valstk[4], valstk[3], Keyword(valstk[2], valstk[1])) 
+ yyval := node("arg6", valstk[6], valstk[5], valstk[4], valstk[3], Keyword(valstk[2], valstk[1]))
 end
 
 procedure action_78()
 #line 503 "unigram.y"
- yyval := node("arg7", valstk[4], valstk[3], "[]") 
+ yyval := node("arg7", valstk[4], valstk[3], "[]")
 end
 
 procedure action_79()
 #line 504 "unigram.y"
- yyval := node("arg8", valstk[6], valstk[5], valstk[4], valstk[3], "[]") 
+ yyval := node("arg8", valstk[6], valstk[5], valstk[4], valstk[3], "[]")
 end
 
 procedure action_80()
 #line 507 "unigram.y"
- yyval := valstk[1] 
+ yyval := valstk[1]
 end
 
 procedure action_81()
 #line 509 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_84()
 #line 513 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_85()
 #line 514 "unigram.y"
- yyval := node("locals2", valstk[4],valstk[3],valstk[2],";") 
+ yyval := node("locals2", valstk[4],valstk[3],valstk[2],";")
 end
 
 procedure action_86()
 #line 516 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_87()
 #line 517 "unigram.y"
- yyval := node("locals2", valstk[4],valstk[3],valstk[2],";") 
+ yyval := node("locals2", valstk[4],valstk[3],valstk[2],";")
 end
 
 procedure action_88()
 #line 518 "unigram.y"
- yyval := node("locals3", valstk[4],valstk[3],valstk[2],";") 
+ yyval := node("locals3", valstk[4],valstk[3],valstk[2],";")
 end
 
 procedure action_89()
 #line 520 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_90()
 #line 521 "unigram.y"
 
            yyval := node("initial", valstk[3], valstk[2],";")
-              
+
 end
 
 procedure action_91()
 #line 525 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_92()
 #line 526 "unigram.y"
- yyval := node("procbody", valstk[3],";",valstk[1]) 
+ yyval := node("procbody", valstk[3],";",valstk[1])
 end
 
 procedure action_93()
 #line 528 "unigram.y"
- yyval := &null 
+ yyval := &null
 end
 
 procedure action_96()
 #line 532 "unigram.y"
- yyval := node("and", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("and", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_98()
 #line 535 "unigram.y"
- yyval := node("binques", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("binques", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_100()
 #line 538 "unigram.y"
- yyval := node("swap", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("swap", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_101()
 #line 539 "unigram.y"
 
           yyval := parenthesize_assign(node("assign",valstk[3],valstk[2],valstk[1]))
-          
+
 end
 
 procedure action_102()
 #line 542 "unigram.y"
- yyval := node("revswap", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("revswap", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_103()
 #line 543 "unigram.y"
- yyval := node("revasgn", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("revasgn", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_104()
 #line 544 "unigram.y"
- yyval := node("augcat", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("augcat", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_105()
 #line 545 "unigram.y"
- yyval := node("auglcat", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("auglcat", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_106()
 #line 546 "unigram.y"
- yyval := node("Bdiffa", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bdiffa", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_107()
 #line 547 "unigram.y"
- yyval := node("Buniona", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Buniona", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_108()
 #line 548 "unigram.y"
- yyval := node("Bplusa", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bplusa", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_109()
 #line 549 "unigram.y"
- yyval := node("Bminusa", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bminusa", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_110()
 #line 550 "unigram.y"
- yyval := node("Bstara", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bstara", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_111()
 #line 551 "unigram.y"
- yyval := node("Bintera", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bintera", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_112()
 #line 552 "unigram.y"
- yyval := node("Bslasha", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bslasha", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_113()
 #line 553 "unigram.y"
- yyval := node("Bmoda", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bmoda", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_114()
 #line 554 "unigram.y"
- yyval := node("Bcareta", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bcareta", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_115()
 #line 555 "unigram.y"
- yyval := node("Baugeq", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugeq", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_116()
 #line 556 "unigram.y"
- yyval := node("Baugeqv", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugeqv", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_117()
 #line 557 "unigram.y"
- yyval := node("Baugge", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugge", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_118()
 #line 558 "unigram.y"
- yyval := node("Bauggt", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bauggt", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_119()
 #line 559 "unigram.y"
- yyval := node("Baugle", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugle", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_120()
 #line 560 "unigram.y"
- yyval := node("Bauglt", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bauglt", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_121()
 #line 561 "unigram.y"
- yyval := node("Baugne", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugne", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_122()
 #line 562 "unigram.y"
- yyval := node("Baugneqv", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugneqv", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_123()
 #line 563 "unigram.y"
- yyval := node("Baugseq", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugseq", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_124()
 #line 564 "unigram.y"
- yyval := node("Baugsge", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugsge", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_125()
 #line 565 "unigram.y"
- yyval := node("Baugsgt", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugsgt", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_126()
 #line 566 "unigram.y"
- yyval := node("Baugsle", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugsle", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_127()
 #line 567 "unigram.y"
- yyval := node("Baugslt", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugslt", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_128()
 #line 568 "unigram.y"
- yyval := node("Baugsne", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugsne", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_129()
 #line 569 "unigram.y"
- yyval := node("Baugques", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugques", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_130()
 #line 570 "unigram.y"
- yyval := node("Baugamper", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugamper", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_131()
 #line 571 "unigram.y"
- yyval := node("Baugact", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Baugact", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_133()
 #line 574 "unigram.y"
- yyval := node("BPmatch", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("BPmatch", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_135()
 #line 577 "unigram.y"
- yyval := node("to", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("to", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_136()
 #line 578 "unigram.y"
- yyval := node("toby", valstk[5],valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("toby", valstk[5],valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_137()
 #line 579 "unigram.y"
- yyval := node("BPor", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("BPor", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_139()
 #line 582 "unigram.y"
- yyval := node("BPand", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("BPand", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_140()
 #line 583 "unigram.y"
- yyval := node(BAR, valstk[3],valstk[2],valstk[1]) 
+ yyval := node(BAR, valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_142()
 #line 586 "unigram.y"
- yyval := node("Bseq", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bseq", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_143()
 #line 587 "unigram.y"
- yyval := node("Bsge", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bsge", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_144()
 #line 588 "unigram.y"
- yyval := node("Bsgt", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bsgt", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_145()
 #line 589 "unigram.y"
- yyval := node("Bsle", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bsle", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_146()
 #line 590 "unigram.y"
- yyval := node("Bslt", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bslt", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_147()
 #line 591 "unigram.y"
- yyval := node("Bsne", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bsne", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_148()
 #line 592 "unigram.y"
- yyval := node("Beq", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Beq", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_149()
 #line 593 "unigram.y"
- yyval := node("Bge", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bge", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_150()
 #line 594 "unigram.y"
- yyval := node("Bgt", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bgt", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_151()
 #line 595 "unigram.y"
- yyval := node("Ble", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Ble", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_152()
 #line 596 "unigram.y"
- yyval := node("Blt", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Blt", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_153()
 #line 597 "unigram.y"
- yyval := node("Bne", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bne", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_154()
 #line 598 "unigram.y"
- yyval := node("Beqv", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Beqv", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_155()
 #line 599 "unigram.y"
- yyval := node("Bneqv", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bneqv", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_157()
 #line 602 "unigram.y"
- yyval := node("Bcat", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bcat", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_158()
 #line 603 "unigram.y"
- yyval := node("Blcat", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Blcat", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_160()
 #line 606 "unigram.y"
- yyval := node("BPiam", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("BPiam", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_161()
 #line 607 "unigram.y"
- yyval := node("BPaom", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("BPaom", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_162()
 #line 608 "unigram.y"
- yyval := node("Bplus", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bplus", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_163()
 #line 609 "unigram.y"
- yyval := node("Bdiff", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bdiff", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_164()
 #line 610 "unigram.y"
- yyval := node("Bunion", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bunion", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_165()
 #line 611 "unigram.y"
- yyval := node("Bminus", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bminus", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_167()
 #line 614 "unigram.y"
- yyval := node("Bstar", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bstar", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_168()
 #line 615 "unigram.y"
- yyval := node("Binter", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Binter", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_169()
 #line 616 "unigram.y"
- yyval := node("Bslash", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bslash", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_170()
 #line 617 "unigram.y"
- yyval := node("Bmod", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bmod", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_173()
 #line 621 "unigram.y"
- yyval := node("Bcaret", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bcaret", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_174()
 #line 624 "unigram.y"
- yyval := node("Bsnd", valstk[2],valstk[1],&null) 
+ yyval := node("Bsnd", valstk[2],valstk[1],&null)
 end
 
 procedure action_175()
 #line 625 "unigram.y"
- yyval := node("Bsndbk", valstk[2],valstk[1],&null) 
+ yyval := node("Bsndbk", valstk[2],valstk[1],&null)
 end
 
 procedure action_176()
 #line 626 "unigram.y"
- yyval := node("Brcv", valstk[2],valstk[1],&null) 
+ yyval := node("Brcv", valstk[2],valstk[1],&null)
 end
 
 procedure action_177()
 #line 627 "unigram.y"
- yyval := node("Brcvbk", valstk[2],valstk[1],&null) 
+ yyval := node("Brcvbk", valstk[2],valstk[1],&null)
 end
 
 procedure action_179()
 #line 630 "unigram.y"
- yyval := node("limit", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("limit", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_180()
 #line 631 "unigram.y"
- yyval := node("at", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("at", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_181()
 #line 632 "unigram.y"
- yyval := node("Bsnd", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bsnd", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_182()
 #line 633 "unigram.y"
- yyval := node("Bsndbk", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Bsndbk", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_183()
 #line 634 "unigram.y"
- yyval := node("Brcv", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Brcv", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_184()
 #line 635 "unigram.y"
- yyval := node("Brcvbk", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Brcvbk", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_185()
 #line 636 "unigram.y"
- yyval := node("apply", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("apply", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_187()
 #line 639 "unigram.y"
- yyval := node("uat", valstk[2],valstk[1]) 
+ yyval := node("uat", valstk[2],valstk[1])
 end
 
 procedure action_188()
 #line 640 "unigram.y"
- yyval := node("Bsnd", &null,valstk[2],valstk[1]) 
+ yyval := node("Bsnd", &null,valstk[2],valstk[1])
 end
 
 procedure action_189()
 #line 641 "unigram.y"
- yyval := node("Bsndbk", &null,valstk[2],valstk[1]) 
+ yyval := node("Bsndbk", &null,valstk[2],valstk[1])
 end
 
 procedure action_190()
 #line 642 "unigram.y"
- yyval := node("Brcv", &null,valstk[2],valstk[1]) 
+ yyval := node("Brcv", &null,valstk[2],valstk[1])
 end
 
 procedure action_191()
 #line 643 "unigram.y"
- yyval := node("Brcvbk", &null,valstk[2],valstk[1]) 
+ yyval := node("Brcvbk", &null,valstk[2],valstk[1])
 end
 
 procedure action_192()
 #line 644 "unigram.y"
- yyval := node("unot", valstk[2],valstk[1]) 
+ yyval := node("unot", valstk[2],valstk[1])
 end
 
 procedure action_193()
 #line 645 "unigram.y"
- yyval := node("ubar", valstk[2],valstk[1]) 
+ yyval := node("ubar", valstk[2],valstk[1])
 end
 
 procedure action_194()
 #line 646 "unigram.y"
- yyval := node("uconcat", valstk[2],valstk[1]) 
+ yyval := node("uconcat", valstk[2],valstk[1])
 end
 
 procedure action_195()
 #line 647 "unigram.y"
- yyval := node("ulconcat", valstk[2],valstk[1]) 
+ yyval := node("ulconcat", valstk[2],valstk[1])
 end
 
 procedure action_196()
 #line 648 "unigram.y"
- yyval := node("udot", valstk[2],valstk[1]) 
+ yyval := node("udot", valstk[2],valstk[1])
 end
 
 procedure action_197()
 #line 649 "unigram.y"
- yyval := node("ubang", valstk[2],valstk[1]) 
+ yyval := node("ubang", valstk[2],valstk[1])
 end
 
 procedure action_198()
 #line 650 "unigram.y"
- yyval := node("udiff", valstk[2],valstk[1]) 
+ yyval := node("udiff", valstk[2],valstk[1])
 end
 
 procedure action_199()
 #line 651 "unigram.y"
- yyval := node("uplus", valstk[2],valstk[1]) 
+ yyval := node("uplus", valstk[2],valstk[1])
 end
 
 procedure action_200()
 #line 652 "unigram.y"
- yyval := node("ustar", valstk[2],valstk[1]) 
+ yyval := node("ustar", valstk[2],valstk[1])
 end
 
 procedure action_201()
 #line 653 "unigram.y"
- yyval := node("uslash", valstk[2],valstk[1]) 
+ yyval := node("uslash", valstk[2],valstk[1])
 end
 
 procedure action_202()
 #line 654 "unigram.y"
- yyval := node("ucaret", valstk[2],valstk[1]) 
+ yyval := node("ucaret", valstk[2],valstk[1])
 end
 
 procedure action_203()
 #line 655 "unigram.y"
- yyval := node("uinter", valstk[2],valstk[1]) 
+ yyval := node("uinter", valstk[2],valstk[1])
 end
 
 procedure action_204()
 #line 656 "unigram.y"
- yyval := node("utilde", valstk[2],valstk[1]) 
+ yyval := node("utilde", valstk[2],valstk[1])
 end
 
 procedure action_205()
 #line 657 "unigram.y"
- yyval := node("uminus", valstk[2],valstk[1]) 
+ yyval := node("uminus", valstk[2],valstk[1])
 end
 
 procedure action_206()
 #line 658 "unigram.y"
- yyval := node("unumeq", valstk[2],valstk[1]) 
+ yyval := node("unumeq", valstk[2],valstk[1])
 end
 
 procedure action_207()
 #line 659 "unigram.y"
- yyval := node("unumne", valstk[2],valstk[1]) 
+ yyval := node("unumne", valstk[2],valstk[1])
 end
 
 procedure action_208()
 #line 660 "unigram.y"
- yyval := node("ulexeq", valstk[2],valstk[1]) 
+ yyval := node("ulexeq", valstk[2],valstk[1])
 end
 
 procedure action_209()
 #line 661 "unigram.y"
- yyval := node("ulexne", valstk[2],valstk[1]) 
+ yyval := node("ulexne", valstk[2],valstk[1])
 end
 
 procedure action_210()
 #line 662 "unigram.y"
- yyval := node("uequiv", valstk[2],valstk[1]) 
+ yyval := node("uequiv", valstk[2],valstk[1])
 end
 
 procedure action_211()
 #line 663 "unigram.y"
- yyval := node("uunion", valstk[2],valstk[1]) 
+ yyval := node("uunion", valstk[2],valstk[1])
 end
 
 procedure action_212()
 #line 664 "unigram.y"
- yyval := node("uqmark", valstk[2],valstk[1]) 
+ yyval := node("uqmark", valstk[2],valstk[1])
 end
 
 procedure action_213()
 #line 665 "unigram.y"
- yyval := node("unotequiv", valstk[2],valstk[1]) 
+ yyval := node("unotequiv", valstk[2],valstk[1])
 end
 
 procedure action_214()
 #line 666 "unigram.y"
- yyval := node("ubackslash", valstk[2],valstk[1]) 
+ yyval := node("ubackslash", valstk[2],valstk[1])
 end
 
 procedure action_215()
 #line 667 "unigram.y"
- yyval := node("upsetcur", valstk[2],valstk[1]) 
+ yyval := node("upsetcur", valstk[2],valstk[1])
 end
 
 procedure action_217()
 #line 670 "unigram.y"
- next_gt_is_ender := 1 
+ next_gt_is_ender := 1
 end
 
 procedure action_218()
 #line 670 "unigram.y"
- yyval := node("regex", valstk[2]) 
+ yyval := node("regex", valstk[2])
 end
 
 procedure action_227()
 #line 679 "unigram.y"
- yyval := node("Bsnd", &null,valstk[1],&null) 
+ yyval := node("Bsnd", &null,valstk[1],&null)
 end
 
 procedure action_228()
 #line 680 "unigram.y"
- yyval := node("Bsndbk", &null,valstk[1],&null) 
+ yyval := node("Bsndbk", &null,valstk[1],&null)
 end
 
 procedure action_229()
 #line 681 "unigram.y"
- yyval := node("Brcv", &null,valstk[1],&null) 
+ yyval := node("Brcv", &null,valstk[1],&null)
 end
 
 procedure action_230()
 #line 682 "unigram.y"
- yyval := node("Brcvbk", &null,valstk[1],&null) 
+ yyval := node("Brcvbk", &null,valstk[1],&null)
 end
 
 procedure action_231()
 #line 683 "unigram.y"
- yyval := node("BPuneval", valstk[1]) 
+ yyval := node("BPuneval", valstk[1])
 end
 
 procedure action_232()
 #line 684 "unigram.y"
- yyval := node("create", valstk[2],valstk[1]) 
+ yyval := node("create", valstk[2],valstk[1])
 end
 
 procedure action_233()
@@ -4489,126 +4489,126 @@ procedure action_233()
               yyval := SimpleInvocation(fakeThreadIdent,fakeLParen,
                                      node("create", fakeCreate, valstk[1]),
                                      fakeRParen)
-              
+
 end
 
 procedure action_234()
 #line 703 "unigram.y"
- yyval := node("critical", valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("critical", valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_236()
 #line 705 "unigram.y"
- yyval := node("Next", valstk[1]) 
+ yyval := node("Next", valstk[1])
 end
 
 procedure action_237()
 #line 706 "unigram.y"
- yyval := node("Break", valstk[2],valstk[1]) 
+ yyval := node("Break", valstk[2],valstk[1])
 end
 
 procedure action_238()
 #line 707 "unigram.y"
- yyval := node("Paren", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Paren", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_239()
 #line 708 "unigram.y"
- yyval := node("Brace", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Brace", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_240()
 #line 709 "unigram.y"
- yyval := tablelit(valstk[3],valstk[2],valstk[1]) 
+ yyval := tablelit(valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_241()
 #line 710 "unigram.y"
- yyval := node("Brack", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Brack", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_242()
 #line 711 "unigram.y"
- yyval := ListComp(valstk[3]) 
+ yyval := ListComp(valstk[3])
 end
 
 procedure action_243()
 #line 712 "unigram.y"
- yyval := node("Subscript", valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Subscript", valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_244()
 #line 713 "unigram.y"
- yyval := node("Pdco0", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Pdco0", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_245()
 #line 714 "unigram.y"
- yyval := node("Pdco1", valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Pdco1", valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_246()
 #line 715 "unigram.y"
 
            yyval := SimpleInvocation(valstk[4],valstk[3],valstk[2],valstk[1])
-      
+
 end
 
 procedure action_247()
 #line 718 "unigram.y"
 
            yyval := InvocationNode(valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1])
-           
+
 end
 
 procedure action_248()
 #line 721 "unigram.y"
 
            yyval := InvocationNode(valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1])
-           
+
 end
 
 procedure action_249()
 #line 724 "unigram.y"
 
            yyval := InvocationNode(valstk[8],valstk[7],valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1])
-           
+
 end
 
 procedure action_250()
 #line 727 "unigram.y"
 
            yyval := InvocationNode(valstk[8],valstk[7],valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1])
-           
+
 end
 
 procedure action_251()
 #line 730 "unigram.y"
 
            yyval := FieldRef(valstk[3],valstk[2],valstk[1])
-      
+
 end
 
 procedure action_253()
 #line 734 "unigram.y"
- yyval := Field(valstk[3],valstk[2],valstk[1]) 
+ yyval := Field(valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_254()
 #line 735 "unigram.y"
- yyval := node("keyword",valstk[2],valstk[1]) 
+ yyval := node("keyword",valstk[2],valstk[1])
 end
 
 procedure action_255()
 #line 736 "unigram.y"
- yyval := Keyword(valstk[2],valstk[1]) 
+ yyval := Keyword(valstk[2],valstk[1])
 end
 
 procedure action_256()
 #line 738 "unigram.y"
 
             yyval := node("While0", valstk[2],valstk[1])
-            
+
 end
 
 procedure action_257()
@@ -4632,32 +4632,32 @@ procedure action_257()
                         )
                }
             yyval := node("While1", valstk[4],valstk[3],valstk[2],valstk[1])
-            
+
 end
 
 procedure action_258()
 #line 762 "unigram.y"
- yyval := node("until", valstk[2],valstk[1]) 
+ yyval := node("until", valstk[2],valstk[1])
 end
 
 procedure action_259()
 #line 763 "unigram.y"
- yyval := node("until1", valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("until1", valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_260()
 #line 765 "unigram.y"
- yyval := node("every", valstk[2],valstk[1]) 
+ yyval := node("every", valstk[2],valstk[1])
 end
 
 procedure action_261()
 #line 766 "unigram.y"
- yyval := node("every1", valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("every1", valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_262()
 #line 768 "unigram.y"
- yyval := node("repeat", valstk[2],valstk[1]) 
+ yyval := node("repeat", valstk[2],valstk[1])
 end
 
 procedure action_263()
@@ -4667,47 +4667,47 @@ end
 
 procedure action_264()
 #line 771 "unigram.y"
- yyval := node("return", valstk[2], valstk[1]) 
+ yyval := node("return", valstk[2], valstk[1])
 end
 
 procedure action_265()
 #line 772 "unigram.y"
- yyval := node("Suspend0", valstk[2],valstk[1]) 
+ yyval := node("Suspend0", valstk[2],valstk[1])
 end
 
 procedure action_266()
 #line 773 "unigram.y"
- yyval := node("Suspend1", valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Suspend1", valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_267()
 #line 775 "unigram.y"
- yyval := node("If0", valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("If0", valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_268()
 #line 776 "unigram.y"
- yyval := node("If1", valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("If1", valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_269()
 #line 778 "unigram.y"
- yyval := node("Case", valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Case", valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_271()
 #line 781 "unigram.y"
- yyval := node("Caselist", valstk[3],";",valstk[1]) 
+ yyval := node("Caselist", valstk[3],";",valstk[1])
 end
 
 procedure action_272()
 #line 783 "unigram.y"
- yyval := node("cclause0", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("cclause0", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_273()
 #line 784 "unigram.y"
- yyval := node("cclause1", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("cclause1", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_275()
@@ -4719,52 +4719,52 @@ procedure action_275()
               }
            else
               yyval := node("elst1", valstk[3],valstk[2],valstk[1])
-           
+
 end
 
 procedure action_276()
 #line 796 "unigram.y"
- yyval := node("pdcolist0", valstk[1]) 
+ yyval := node("pdcolist0", valstk[1])
 end
 
 procedure action_277()
 #line 797 "unigram.y"
- yyval := node("pdcolist1", valstk[3],valstk[2],valstk[1]) 
+ yyval := node("pdcolist1", valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_282()
 #line 804 "unigram.y"
- yyval := regexp(valstk[1]) 
+ yyval := regexp(valstk[1])
 end
 
 procedure action_283()
 #line 805 "unigram.y"
- yyval := "emptyregex" 
+ yyval := "emptyregex"
 end
 
 procedure action_285()
 #line 810 "unigram.y"
- yyval := node("regexbar", valstk[3], valstk[2], valstk[1]) 
+ yyval := node("regexbar", valstk[3], valstk[2], valstk[1])
 end
 
 procedure action_287()
 #line 814 "unigram.y"
- yyval := node("regexconcat", valstk[2], valstk[1]) 
+ yyval := node("regexconcat", valstk[2], valstk[1])
 end
 
 procedure action_289()
 #line 818 "unigram.y"
- yyval := node("kleene", valstk[2], valstk[1]) 
+ yyval := node("kleene", valstk[2], valstk[1])
 end
 
 procedure action_290()
 #line 819 "unigram.y"
- yyval := node("oneormore", valstk[2], valstk[1]) 
+ yyval := node("oneormore", valstk[2], valstk[1])
 end
 
 procedure action_291()
 #line 820 "unigram.y"
- yyval := node("optional", valstk[2], valstk[1]) 
+ yyval := node("optional", valstk[2], valstk[1])
 end
 
 procedure action_292()
@@ -4785,27 +4785,27 @@ procedure action_292()
                  yyval := node("regexconcat", yyval, valstk[4])
                  }
               }
-           
+
 end
 
 procedure action_294()
 #line 841 "unigram.y"
- yyval := valstk[1]; yyval.tok := IDENT 
+ yyval := valstk[1]; yyval.tok := IDENT
 end
 
 procedure action_295()
 #line 842 "unigram.y"
- yyval := valstk[1]; yyval.tok := IDENT 
+ yyval := valstk[1]; yyval.tok := IDENT
 end
 
 procedure action_296()
 #line 843 "unigram.y"
- yyval := valstk[1]; yyval.tok := IDENT 
+ yyval := valstk[1]; yyval.tok := IDENT
 end
 
 procedure action_302()
 #line 849 "unigram.y"
- yyval := node("Paren",valstk[3],valstk[2],valstk[1]) 
+ yyval := node("Paren",valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_303()
@@ -4820,22 +4820,22 @@ procedure action_303()
                     }
                  }
                  # else write("[ followed by ", type(valstk[2]), " so not checking for space")
-              
+
 end
 
 procedure action_304()
 #line 861 "unigram.y"
- yyval := node("notany", valstk[4], valstk[3], valstk[2], valstk[1]) 
+ yyval := node("notany", valstk[4], valstk[3], valstk[2], valstk[1])
 end
 
 procedure action_305()
 #line 862 "unigram.y"
- yyval := node("escape", valstk[2], valstk[1]) 
+ yyval := node("escape", valstk[2], valstk[1])
 end
 
 procedure action_307()
 #line 866 "unigram.y"
- yyval := node("brackchars", valstk[3], valstk[2], valstk[1]) 
+ yyval := node("brackchars", valstk[3], valstk[2], valstk[1])
 end
 
 procedure action_308()
@@ -4855,7 +4855,7 @@ procedure action_308()
 
            if type(valstk[1]) == "treenode" then yyval.s ||:= c2
            else yyval.s ||:= valstk[1].s
-           
+
 end
 
 procedure action_313()
@@ -4867,7 +4867,7 @@ procedure action_313()
               "b"|"d"|"e"|"f"|"l"|"n"|"r"|"t"|"v": yyval.s[1] := "\\" || yyval.s[1]
               default: stop("unrecognized escape char \\", yyval.s[1])
               }
-        
+
 end
 
 procedure action_314()
@@ -4879,27 +4879,27 @@ procedure action_314()
               "0"|"1"|"2"|"3"|"4"|"5"|"6"|"7": yyval.s[1] := "\\" || yyval.s[1]
               default: stop("non-octal numeric escape char \\", yyval.s[1])
               }
-           
+
 end
 
 procedure action_315()
 #line 904 "unigram.y"
- yyval := node("section", valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1]) 
+ yyval := node("section", valstk[6],valstk[5],valstk[4],valstk[3],valstk[2],valstk[1])
 end
 
 procedure action_320()
 #line 911 "unigram.y"
- yyval := node("compound", valstk[3],";",valstk[1]) 
+ yyval := node("compound", valstk[3],";",valstk[1])
 end
 
 procedure action_322()
 #line 914 "unigram.y"
- yyval := node("error", valstk[4],valstk[2],valstk[1]) 
+ yyval := node("error", valstk[4],valstk[2],valstk[1])
 end
 
 procedure action_323()
 #line 915 "unigram.y"
- yyval := node("error") 
+ yyval := node("error")
 end
 
 #line 4909 "unigram.icn"
diff --git a/uni/unicon/unigram.u b/uni/unicon/unigram.u
index 360d755f1..5fee34846 100644
--- a/uni/unicon/unigram.u
+++ b/uni/unicon/unigram.u
@@ -1,5 +1,5 @@
 version	U12.1.00
-uid	unigram.u1-1742838625-0
+uid	unigram.u1-1759508815-0
 record	ParseError,2
 	0,lineNumber
 	1,errorMessage
@@ -402,13 +402,17 @@ proc Keyword
 	con	64,010000,6,162,145,163,151,172,145
 	con	65,010000,5,141,163,143,151,151
 	con	66,010000,4,143,163,145,164
-	con	67,010000,1,046
-	con	68,010000,24,040,151,163,040,156,157,164,040,141,040,166,141,154,151,144,040,153,145,171,167,157,162,144,041
-	con	69,010000,7,153,145,171,167,157,162,144
+	con	67,010000,4,160,162,157,143
+	con	68,010000,6,143,157,156,146,151,147
+	con	69,010000,5,143,150,151,154,144
+	con	70,010000,6,160,141,162,145,156,164
+	con	71,010000,1,046
+	con	72,010000,24,040,151,163,040,156,157,164,040,141,040,166,141,154,151,144,040,153,145,171,167,157,162,144,041
+	con	73,010000,7,153,145,171,167,157,162,144
 	declend
 	filen	unigram.y
 	line	153
-	colm	11
+	colm	12
 	synt	any
 lab L1
 	init	L3
@@ -484,10 +488,14 @@ lab L1
 	str	64
 	str	65
 	str	66
+	str	67
+	str	68
+	str	69
+	str	70
 	line	156
 	colm	23
 	synt	any
-	llist	67
+	llist	71
 	line	156
 	colm	22
 	synt	any
@@ -526,7 +534,7 @@ lab L5
 	var	5
 	pnull
 	pnull
-	str	67
+	str	71
 	pnull
 	var	1
 	line	172
@@ -537,7 +545,7 @@ lab L5
 	colm	19
 	synt	any
 	cat
-	str	68
+	str	72
 	line	172
 	colm	27
 	synt	any
@@ -554,7 +562,7 @@ lab L4
 	mark	L6
 	mark	L7
 	var	6
-	str	69
+	str	73
 	var	0
 	var	1
 	line	174
@@ -592,7 +600,7 @@ proc Field
 	con	2,010000,5,146,151,145,154,144
 	declend
 	line	178
-	colm	11
+	colm	12
 	synt	any
 lab L1
 	init	L3
@@ -706,7 +714,7 @@ proc Clone1stToken
 	con	1,010000,8,164,162,145,145,156,157,144,145
 	declend
 	line	191
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	192
@@ -859,7 +867,7 @@ proc Progend
 	con	17,010000,1,051
 	declend
 	line	203
-	colm	11
+	colm	12
 	synt	any
 lab L1
 	init	L3
@@ -3088,7 +3096,7 @@ proc init
 	declend
 	filen	unigram.icn
 	line	290
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -34127,7 +34135,7 @@ proc init_stacks
 	con	3,010000,7,141,143,164,151,157,156,137
 	declend
 	line	2634
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -34268,7 +34276,7 @@ proc parenthesize_assign
 	declend
 	filen	unigram.y
 	line	925
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	928
@@ -34486,7 +34494,7 @@ lab L16
 lab L15
 	pnull
 	line	940
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -34512,7 +34520,7 @@ proc FieldRef
 	con	10,010000,1,056
 	declend
 	line	942
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	943
@@ -34714,7 +34722,7 @@ proc InvocationNode
 	con	20,002000,1,8
 	declend
 	line	956
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -35357,7 +35365,7 @@ proc SimpleInvocation
 	con	15,002000,1,3
 	declend
 	line	996
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	997
@@ -35736,7 +35744,7 @@ proc SuperMethodInvok
 	con	20,002000,1,8
 	declend
 	line	1031
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -36196,7 +36204,7 @@ proc isloco
 	con	3,002000,3,257
 	declend
 	line	1060
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	1061
@@ -36357,7 +36365,7 @@ proc buildtab_from_cclause
 	con	9,002000,1,1
 	declend
 	line	1071
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	1072
@@ -36675,7 +36683,7 @@ proc ListComp
 	con	8,010000,1,175
 	declend
 	line	1095
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -36801,7 +36809,7 @@ proc AppendListCompTemps
 	con	12,010000,27,144,157,156,047,164,040,153,156,157,167,040,167,150,141,164,040,164,157,040,144,157,040,167,151,164,150,040
 	declend
 	line	1111
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	1113
@@ -37094,7 +37102,7 @@ proc ListCompTemps
 	con	4,002000,1,1
 	declend
 	line	1138
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	1140
@@ -37371,7 +37379,7 @@ proc tablelit
 	con	11,010000,6,151,156,166,157,153,145
 	declend
 	line	1155
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -39211,7 +39219,7 @@ lab L46
 lab L45
 	pnull
 	line	1320
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -39222,7 +39230,7 @@ proc findNodeIndex
 	con	0,002000,1,1
 	declend
 	line	1322
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	1324
@@ -39827,7 +39835,7 @@ lab L43
 lab L42
 	pnull
 	line	1373
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -40038,7 +40046,7 @@ lab L11
 lab L10
 	pnull
 	line	1395
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -40055,7 +40063,7 @@ proc mkBrace
 	con	5,002000,1,5
 	declend
 	line	1400
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	mark	L2
@@ -40159,7 +40167,7 @@ proc mkUnlock
 	con	8,010000,8,143,157,155,160,157,165,156,144
 	declend
 	line	1409
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -40377,7 +40385,7 @@ proc mkUnlockFallibleExpr
 	con	23,010000,1,174
 	declend
 	line	1431
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	1434
@@ -41136,7 +41144,7 @@ proc mkUnlockExpr
 	con	11,010000,1,061
 	declend
 	line	1483
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -41426,7 +41434,7 @@ proc mkLockUnlock
 	con	9,010000,1,073
 	declend
 	line	1507
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	1515
@@ -41612,7 +41620,7 @@ proc mkUnlockSusp
 	con	12,010000,8,143,157,155,160,157,165,156,144
 	declend
 	line	1532
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -41941,7 +41949,7 @@ proc mkUnlockSuspDo
 	con	10,010000,8,143,157,155,160,157,165,156,144
 	declend
 	line	1552
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -42234,7 +42242,7 @@ proc mkUnlockBreak
 	con	0,002000,1,1
 	declend
 	line	1574
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	mark	L2
@@ -42285,7 +42293,7 @@ proc mkUnlockBreakExpr
 	con	2,002000,1,1
 	declend
 	line	1581
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -42432,7 +42440,7 @@ lab L9
 lab L8
 	pnull
 	line	1590
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -42490,7 +42498,7 @@ proc yyparse
 	declend
 	filen	unigram.icn
 	line	3327
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	3335
@@ -44029,14 +44037,14 @@ lab L93
 lab L92
 	pnull
 	line	3473
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
 proc action_null
 	declend
 	line	3479
-	colm	11
+	colm	12
 	synt	any
 	line	3481
 	colm	1
@@ -44049,7 +44057,7 @@ proc action_1
 	con	0,002000,1,2
 	declend
 	line	3483
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	var	0
@@ -44077,7 +44085,7 @@ proc action_2
 	local	0,000000,yyval
 	declend
 	line	315
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -44094,7 +44102,7 @@ proc action_2
 lab L1
 	pnull
 	line	315
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -44111,7 +44119,7 @@ proc action_3
 	con	4,002000,1,1
 	declend
 	line	317
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	316
@@ -44199,7 +44207,7 @@ proc action_12
 	local	0,000000,yyval
 	declend
 	line	321
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -44216,7 +44224,7 @@ proc action_12
 lab L1
 	pnull
 	line	331
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -44234,7 +44242,7 @@ proc action_13
 	con	7,002000,1,1
 	declend
 	line	333
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -44354,7 +44362,7 @@ proc action_14
 	con	8,002000,1,1
 	declend
 	line	339
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -44466,22 +44474,24 @@ proc action_15
 	local	0,000000,yyval
 	declend
 	line	345
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
 	var	0
+	line	345
+	colm	31
 	synt	any
 	keywd	null
 	line	345
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
 lab L1
 	pnull
 	line	346
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -44495,7 +44505,7 @@ proc action_17
 	con	3,002000,1,2
 	declend
 	line	348
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -44567,18 +44577,18 @@ proc action_18
 	con	9,002000,1,1
 	declend
 	line	353
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
 	var	0
 	var	1
 	line	353
-	colm	18
+	colm	36
 	synt	any
 	invoke	0
 	line	353
-	colm	10
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -44876,7 +44886,7 @@ proc action_19
 	local	0,000000,yyval
 	declend
 	line	372
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -44893,7 +44903,7 @@ proc action_19
 lab L1
 	pnull
 	line	372
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -44907,7 +44917,7 @@ proc action_20
 	con	3,002000,1,1
 	declend
 	line	374
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -44961,7 +44971,7 @@ proc action_21
 	con	3,002000,1,1
 	declend
 	line	375
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45015,7 +45025,7 @@ proc action_22
 	con	3,002000,1,1
 	declend
 	line	376
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45026,29 +45036,29 @@ proc action_22
 	var	2
 	int	1
 	line	376
-	colm	36
+	colm	55
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	376
-	colm	46
+	colm	65
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	376
-	colm	56
+	colm	75
 	synt	any
 	subsc
 	line	376
-	colm	15
+	colm	35
 	synt	any
 	invoke	4
 	line	376
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -45068,7 +45078,7 @@ proc action_23
 	con	2,002000,1,1
 	declend
 	line	379
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45109,22 +45119,24 @@ proc action_24
 	local	0,000000,yyval
 	declend
 	line	380
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
 	var	0
+	line	380
+	colm	31
 	synt	any
 	keywd	null
 	line	380
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
 lab L1
 	pnull
 	line	381
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -45137,7 +45149,7 @@ proc action_25
 	con	2,002000,1,1
 	declend
 	line	383
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45183,7 +45195,7 @@ proc action_26
 	con	2,002000,1,1
 	declend
 	line	384
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45229,7 +45241,7 @@ proc action_27
 	con	2,002000,1,1
 	declend
 	line	385
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45275,7 +45287,7 @@ proc action_28
 	con	2,002000,1,1
 	declend
 	line	386
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45286,22 +45298,22 @@ proc action_28
 	var	2
 	int	1
 	line	386
-	colm	35
+	colm	54
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	386
-	colm	46
+	colm	64
 	synt	any
 	subsc
 	line	386
-	colm	15
+	colm	35
 	synt	any
 	invoke	3
 	line	386
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -45322,7 +45334,7 @@ proc action_30
 	con	3,002000,1,1
 	declend
 	line	389
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45333,29 +45345,29 @@ proc action_30
 	var	2
 	int	1
 	line	389
-	colm	35
+	colm	54
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	389
-	colm	45
+	colm	64
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	389
-	colm	55
+	colm	74
 	synt	any
 	subsc
 	line	389
-	colm	15
+	colm	35
 	synt	any
 	invoke	4
 	line	389
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -45376,7 +45388,7 @@ proc action_33
 	con	3,002000,1,1
 	declend
 	line	392
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45435,17 +45447,17 @@ proc action_34
 	con	4,002000,1,2
 	declend
 	line	396
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	396
-	colm	4
+	colm	24
 	synt	ifelse
 	mark	L2
 	pnull
 	var	0
 	line	396
-	colm	7
+	colm	26
 	synt	any
 	nonnull
 	unmark
@@ -45654,7 +45666,7 @@ lab L11
 	invoke	0
 lab L3
 	line	396
-	colm	4
+	colm	24
 	synt	endifelse
 	unmark
 lab L1
@@ -45675,7 +45687,7 @@ proc action_35
 	con	3,010000,1,040
 	declend
 	line	416
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45686,23 +45698,23 @@ proc action_35
 	var	2
 	int	1
 	line	416
-	colm	34
+	colm	51
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	416
-	colm	44
+	colm	61
 	synt	any
 	subsc
 	str	3
 	line	416
-	colm	17
+	colm	35
 	synt	any
 	invoke	4
 	line	416
-	colm	10
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -45738,7 +45750,7 @@ proc action_36
 	con	3,010000,1,040
 	declend
 	line	421
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45786,7 +45798,7 @@ proc action_38
 	con	3,002000,1,1
 	declend
 	line	423
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45797,29 +45809,29 @@ proc action_38
 	var	2
 	int	1
 	line	423
-	colm	33
+	colm	52
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	423
-	colm	43
+	colm	62
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	423
-	colm	53
+	colm	72
 	synt	any
 	subsc
 	line	423
-	colm	15
+	colm	35
 	synt	any
 	invoke	4
 	line	423
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -45840,7 +45852,7 @@ proc action_40
 	con	3,002000,1,1
 	declend
 	line	426
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45851,29 +45863,29 @@ proc action_40
 	var	2
 	int	1
 	line	426
-	colm	33
+	colm	52
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	426
-	colm	43
+	colm	62
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	426
-	colm	53
+	colm	72
 	synt	any
 	subsc
 	line	426
-	colm	15
+	colm	35
 	synt	any
 	invoke	4
 	line	426
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -45893,7 +45905,7 @@ proc action_43
 	con	2,002000,1,1
 	declend
 	line	429
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45944,7 +45956,7 @@ proc action_44
 	con	4,002000,1,1
 	declend
 	line	434
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -45954,43 +45966,43 @@ proc action_44
 	var	2
 	int	0
 	line	434
-	colm	44
+	colm	49
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	1
 	line	434
-	colm	54
+	colm	59
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	434
-	colm	64
+	colm	69
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	434
-	colm	74
+	colm	79
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	4
 	line	434
-	colm	84
+	colm	89
 	synt	any
 	subsc
 	line	434
-	colm	37
+	colm	42
 	synt	any
 	invoke	5
 	line	434
-	colm	23
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -46040,7 +46052,7 @@ proc action_45
 	local	0,000000,yyval
 	declend
 	line	440
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46057,7 +46069,7 @@ proc action_45
 lab L1
 	pnull
 	line	440
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -46075,7 +46087,7 @@ proc action_47
 	con	6,002000,1,1
 	declend
 	line	442
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46177,7 +46189,7 @@ proc action_48
 	con	3,002000,1,2
 	declend
 	line	449
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46186,11 +46198,11 @@ proc action_48
 	var	1
 	int	0
 	line	449
-	colm	32
+	colm	37
 	synt	any
 	subsc
 	line	449
-	colm	23
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -46270,7 +46282,7 @@ proc action_49
 	con	0,002000,1,1
 	declend
 	line	456
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46305,7 +46317,7 @@ lab L1
 lab L2
 	pnull
 	line	458
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -46323,7 +46335,7 @@ proc action_50
 	con	4,002000,1,1
 	declend
 	line	460
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46333,43 +46345,43 @@ proc action_50
 	var	2
 	int	0
 	line	460
-	colm	44
+	colm	49
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	1
 	line	460
-	colm	55
+	colm	59
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	460
-	colm	66
+	colm	69
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	460
-	colm	77
+	colm	79
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	4
 	line	460
-	colm	88
+	colm	89
 	synt	any
 	subsc
 	line	460
-	colm	37
+	colm	42
 	synt	any
 	invoke	5
 	line	460
-	colm	23
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -46426,7 +46438,7 @@ proc action_51
 	con	4,002000,1,1
 	declend
 	line	466
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46441,7 +46453,7 @@ proc action_51
 	var	2
 	int	0
 	line	466
-	colm	50
+	colm	51
 	synt	any
 	subsc
 	pnull
@@ -46449,18 +46461,18 @@ proc action_51
 	var	2
 	int	1
 	line	466
-	colm	61
+	colm	62
 	synt	any
 	subsc
 	line	466
-	colm	64
+	colm	65
 	synt	any
 	field	s
 	pnull
 	var	2
 	int	2
 	line	466
-	colm	74
+	colm	75
 	synt	any
 	subsc
 	pnull
@@ -46468,33 +46480,33 @@ proc action_51
 	var	2
 	int	0
 	line	466
-	colm	85
+	colm	86
 	synt	any
 	subsc
 	line	466
-	colm	88
+	colm	89
 	synt	any
 	field	s
 	pnull
 	var	2
 	int	3
 	line	466
-	colm	98
+	colm	99
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	4
 	line	466
-	colm	109
+	colm	110
 	synt	any
 	subsc
 	line	466
-	colm	32
+	colm	37
 	synt	any
 	invoke	11
 	line	466
-	colm	23
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -46510,7 +46522,7 @@ proc action_52
 	local	1,000000,argList
 	declend
 	line	470
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46519,15 +46531,15 @@ proc action_52
 	pnull
 	pnull
 	line	470
-	colm	24
+	colm	41
 	synt	any
 	keywd	null
 	line	470
-	colm	18
+	colm	38
 	synt	any
 	invoke	3
 	line	470
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -46545,7 +46557,7 @@ proc action_53
 	con	0,002000,1,1
 	declend
 	line	473
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46584,7 +46596,7 @@ proc action_54
 	con	1,002000,1,3
 	declend
 	line	474
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46620,7 +46632,7 @@ proc action_55
 	local	1,000000,argList
 	declend
 	line	475
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46655,7 +46667,7 @@ proc action_56
 	con	0,002000,1,1
 	declend
 	line	477
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46694,7 +46706,7 @@ proc action_57
 	con	1,002000,1,3
 	declend
 	line	478
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46735,7 +46747,7 @@ proc action_59
 	con	3,002000,1,1
 	declend
 	line	479
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46789,7 +46801,7 @@ proc action_61
 	con	3,002000,1,1
 	declend
 	line	483
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46800,29 +46812,29 @@ proc action_61
 	var	2
 	int	1
 	line	483
-	colm	34
+	colm	53
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	483
-	colm	45
+	colm	63
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	483
-	colm	56
+	colm	73
 	synt	any
 	subsc
 	line	483
-	colm	15
+	colm	35
 	synt	any
 	invoke	4
 	line	483
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -46843,7 +46855,7 @@ proc action_62
 	con	3,002000,1,1
 	declend
 	line	486
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46899,7 +46911,7 @@ proc action_63
 	con	5,002000,1,1
 	declend
 	line	487
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46967,7 +46979,7 @@ proc action_65
 	con	3,002000,1,1
 	declend
 	line	488
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -46978,29 +46990,29 @@ proc action_65
 	var	2
 	int	1
 	line	488
-	colm	34
+	colm	53
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	488
-	colm	45
+	colm	63
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	488
-	colm	56
+	colm	73
 	synt	any
 	subsc
 	line	488
-	colm	15
+	colm	35
 	synt	any
 	invoke	4
 	line	488
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -47021,7 +47033,7 @@ proc action_66
 	con	3,002000,1,1
 	declend
 	line	491
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47077,7 +47089,7 @@ proc action_67
 	con	5,002000,1,1
 	declend
 	line	492
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47145,7 +47157,7 @@ proc action_69
 	con	3,002000,1,1
 	declend
 	line	493
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47156,29 +47168,29 @@ proc action_69
 	var	2
 	int	1
 	line	493
-	colm	34
+	colm	53
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	493
-	colm	44
+	colm	63
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	493
-	colm	54
+	colm	73
 	synt	any
 	subsc
 	line	493
-	colm	15
+	colm	35
 	synt	any
 	invoke	4
 	line	493
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -47199,7 +47211,7 @@ proc action_71
 	con	3,002000,1,1
 	declend
 	line	496
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47210,29 +47222,29 @@ proc action_71
 	var	2
 	int	1
 	line	496
-	colm	34
+	colm	53
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	496
-	colm	44
+	colm	63
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	496
-	colm	54
+	colm	73
 	synt	any
 	subsc
 	line	496
-	colm	15
+	colm	35
 	synt	any
 	invoke	4
 	line	496
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -47253,7 +47265,7 @@ proc action_73
 	con	3,002000,1,1
 	declend
 	line	499
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47264,29 +47276,29 @@ proc action_73
 	var	2
 	int	1
 	line	499
-	colm	30
+	colm	49
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	499
-	colm	41
+	colm	59
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	499
-	colm	52
+	colm	69
 	synt	any
 	subsc
 	line	499
-	colm	15
+	colm	35
 	synt	any
 	invoke	4
 	line	499
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -47307,7 +47319,7 @@ proc action_74
 	con	3,002000,1,1
 	declend
 	line	502
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47363,7 +47375,7 @@ proc action_75
 	con	5,002000,1,1
 	declend
 	line	503
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47433,7 +47445,7 @@ proc action_76
 	con	4,002000,1,1
 	declend
 	line	504
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47503,7 +47515,7 @@ proc action_77
 	con	6,002000,1,1
 	declend
 	line	505
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47583,7 +47595,7 @@ proc action_78
 	con	3,010000,2,133,135
 	declend
 	line	506
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47633,7 +47645,7 @@ proc action_79
 	con	5,010000,2,133,135
 	declend
 	line	507
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47691,7 +47703,7 @@ proc action_80
 	con	0,002000,1,1
 	declend
 	line	508
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47700,11 +47712,11 @@ proc action_80
 	var	1
 	int	0
 	line	508
-	colm	17
+	colm	37
 	synt	any
 	subsc
 	line	508
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -47719,7 +47731,7 @@ proc action_81
 	local	0,000000,yyval
 	declend
 	line	511
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47736,7 +47748,7 @@ proc action_81
 lab L1
 	pnull
 	line	511
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -47744,7 +47756,7 @@ proc action_84
 	local	0,000000,yyval
 	declend
 	line	513
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47761,7 +47773,7 @@ proc action_84
 lab L1
 	pnull
 	line	515
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -47776,7 +47788,7 @@ proc action_85
 	con	4,010000,1,073
 	declend
 	line	517
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47825,7 +47837,7 @@ proc action_86
 	local	0,000000,yyval
 	declend
 	line	518
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47842,7 +47854,7 @@ proc action_86
 lab L1
 	pnull
 	line	518
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -47857,7 +47869,7 @@ proc action_87
 	con	4,010000,1,073
 	declend
 	line	520
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47913,7 +47925,7 @@ proc action_88
 	con	4,010000,1,073
 	declend
 	line	521
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47962,7 +47974,7 @@ proc action_89
 	local	0,000000,yyval
 	declend
 	line	522
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -47979,7 +47991,7 @@ proc action_89
 lab L1
 	pnull
 	line	522
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -47993,7 +48005,7 @@ proc action_90
 	con	3,010000,1,073
 	declend
 	line	524
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48035,7 +48047,7 @@ proc action_91
 	local	0,000000,yyval
 	declend
 	line	527
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48052,7 +48064,7 @@ proc action_91
 lab L1
 	pnull
 	line	527
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -48066,7 +48078,7 @@ proc action_92
 	con	3,002000,1,1
 	declend
 	line	529
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48108,7 +48120,7 @@ proc action_93
 	local	0,000000,yyval
 	declend
 	line	530
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48125,7 +48137,7 @@ proc action_93
 lab L1
 	pnull
 	line	530
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -48139,7 +48151,7 @@ proc action_96
 	con	3,002000,1,1
 	declend
 	line	532
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48193,7 +48205,7 @@ proc action_98
 	con	3,002000,1,1
 	declend
 	line	536
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48204,29 +48216,29 @@ proc action_98
 	var	2
 	int	1
 	line	536
-	colm	33
+	colm	52
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	536
-	colm	43
+	colm	62
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	536
-	colm	53
+	colm	72
 	synt	any
 	subsc
 	line	536
-	colm	15
+	colm	35
 	synt	any
 	invoke	4
 	line	536
-	colm	8
+	colm	29
 	synt	any
 	asgn
 	unmark
@@ -48247,7 +48259,7 @@ proc action_100
 	con	3,002000,1,1
 	declend
 	line	539
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48258,29 +48270,29 @@ proc action_100
 	var	2
 	int	1
 	line	539
-	colm	30
+	colm	50
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	539
-	colm	40
+	colm	60
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	539
-	colm	50
+	colm	70
 	synt	any
 	subsc
 	line	539
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	539
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -48302,7 +48314,7 @@ proc action_101
 	con	3,002000,1,1
 	declend
 	line	542
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48361,7 +48373,7 @@ proc action_102
 	con	3,002000,1,1
 	declend
 	line	545
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48415,7 +48427,7 @@ proc action_103
 	con	3,002000,1,1
 	declend
 	line	546
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48469,7 +48481,7 @@ proc action_104
 	con	3,002000,1,1
 	declend
 	line	547
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48523,7 +48535,7 @@ proc action_105
 	con	3,002000,1,1
 	declend
 	line	548
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48577,7 +48589,7 @@ proc action_106
 	con	3,002000,1,1
 	declend
 	line	549
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48631,7 +48643,7 @@ proc action_107
 	con	3,002000,1,1
 	declend
 	line	550
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48685,7 +48697,7 @@ proc action_108
 	con	3,002000,1,1
 	declend
 	line	551
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48739,7 +48751,7 @@ proc action_109
 	con	3,002000,1,1
 	declend
 	line	552
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48793,7 +48805,7 @@ proc action_110
 	con	3,002000,1,1
 	declend
 	line	553
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48847,7 +48859,7 @@ proc action_111
 	con	3,002000,1,1
 	declend
 	line	554
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48901,7 +48913,7 @@ proc action_112
 	con	3,002000,1,1
 	declend
 	line	555
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -48955,7 +48967,7 @@ proc action_113
 	con	3,002000,1,1
 	declend
 	line	556
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49009,7 +49021,7 @@ proc action_114
 	con	3,002000,1,1
 	declend
 	line	557
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49063,7 +49075,7 @@ proc action_115
 	con	3,002000,1,1
 	declend
 	line	558
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49117,7 +49129,7 @@ proc action_116
 	con	3,002000,1,1
 	declend
 	line	559
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49171,7 +49183,7 @@ proc action_117
 	con	3,002000,1,1
 	declend
 	line	560
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49225,7 +49237,7 @@ proc action_118
 	con	3,002000,1,1
 	declend
 	line	561
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49279,7 +49291,7 @@ proc action_119
 	con	3,002000,1,1
 	declend
 	line	562
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49333,7 +49345,7 @@ proc action_120
 	con	3,002000,1,1
 	declend
 	line	563
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49387,7 +49399,7 @@ proc action_121
 	con	3,002000,1,1
 	declend
 	line	564
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49441,7 +49453,7 @@ proc action_122
 	con	3,002000,1,1
 	declend
 	line	565
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49495,7 +49507,7 @@ proc action_123
 	con	3,002000,1,1
 	declend
 	line	566
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49549,7 +49561,7 @@ proc action_124
 	con	3,002000,1,1
 	declend
 	line	567
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49603,7 +49615,7 @@ proc action_125
 	con	3,002000,1,1
 	declend
 	line	568
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49657,7 +49669,7 @@ proc action_126
 	con	3,002000,1,1
 	declend
 	line	569
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49711,7 +49723,7 @@ proc action_127
 	con	3,002000,1,1
 	declend
 	line	570
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49765,7 +49777,7 @@ proc action_128
 	con	3,002000,1,1
 	declend
 	line	571
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49819,7 +49831,7 @@ proc action_129
 	con	3,002000,1,1
 	declend
 	line	572
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49873,7 +49885,7 @@ proc action_130
 	con	3,002000,1,1
 	declend
 	line	573
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49927,7 +49939,7 @@ proc action_131
 	con	3,002000,1,1
 	declend
 	line	574
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49981,7 +49993,7 @@ proc action_133
 	con	3,002000,1,1
 	declend
 	line	575
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -49992,29 +50004,29 @@ proc action_133
 	var	2
 	int	1
 	line	575
-	colm	33
+	colm	53
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	575
-	colm	43
+	colm	63
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	575
-	colm	53
+	colm	73
 	synt	any
 	subsc
 	line	575
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	575
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -50035,7 +50047,7 @@ proc action_135
 	con	3,002000,1,1
 	declend
 	line	578
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50046,29 +50058,29 @@ proc action_135
 	var	2
 	int	1
 	line	578
-	colm	28
+	colm	48
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	578
-	colm	38
+	colm	58
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	578
-	colm	48
+	colm	68
 	synt	any
 	subsc
 	line	578
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	578
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -50091,7 +50103,7 @@ proc action_136
 	con	5,002000,1,1
 	declend
 	line	581
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50159,7 +50171,7 @@ proc action_137
 	con	3,002000,1,1
 	declend
 	line	582
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50213,7 +50225,7 @@ proc action_139
 	con	3,002000,1,1
 	declend
 	line	583
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50224,29 +50236,29 @@ proc action_139
 	var	2
 	int	1
 	line	583
-	colm	31
+	colm	51
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	583
-	colm	41
+	colm	61
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	583
-	colm	51
+	colm	71
 	synt	any
 	subsc
 	line	583
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	583
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -50267,7 +50279,7 @@ proc action_140
 	con	3,002000,1,1
 	declend
 	line	586
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50321,7 +50333,7 @@ proc action_142
 	con	3,002000,1,1
 	declend
 	line	587
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50332,29 +50344,29 @@ proc action_142
 	var	2
 	int	1
 	line	587
-	colm	30
+	colm	50
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	587
-	colm	40
+	colm	60
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	587
-	colm	50
+	colm	70
 	synt	any
 	subsc
 	line	587
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	587
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -50375,7 +50387,7 @@ proc action_143
 	con	3,002000,1,1
 	declend
 	line	590
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50429,7 +50441,7 @@ proc action_144
 	con	3,002000,1,1
 	declend
 	line	591
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50483,7 +50495,7 @@ proc action_145
 	con	3,002000,1,1
 	declend
 	line	592
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50537,7 +50549,7 @@ proc action_146
 	con	3,002000,1,1
 	declend
 	line	593
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50591,7 +50603,7 @@ proc action_147
 	con	3,002000,1,1
 	declend
 	line	594
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50645,7 +50657,7 @@ proc action_148
 	con	3,002000,1,1
 	declend
 	line	595
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50699,7 +50711,7 @@ proc action_149
 	con	3,002000,1,1
 	declend
 	line	596
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50753,7 +50765,7 @@ proc action_150
 	con	3,002000,1,1
 	declend
 	line	597
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50807,7 +50819,7 @@ proc action_151
 	con	3,002000,1,1
 	declend
 	line	598
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50861,7 +50873,7 @@ proc action_152
 	con	3,002000,1,1
 	declend
 	line	599
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50915,7 +50927,7 @@ proc action_153
 	con	3,002000,1,1
 	declend
 	line	600
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -50969,7 +50981,7 @@ proc action_154
 	con	3,002000,1,1
 	declend
 	line	601
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51023,7 +51035,7 @@ proc action_155
 	con	3,002000,1,1
 	declend
 	line	602
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51077,7 +51089,7 @@ proc action_157
 	con	3,002000,1,1
 	declend
 	line	603
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51088,29 +51100,29 @@ proc action_157
 	var	2
 	int	1
 	line	603
-	colm	30
+	colm	50
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	603
-	colm	40
+	colm	60
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	603
-	colm	50
+	colm	70
 	synt	any
 	subsc
 	line	603
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	603
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -51131,7 +51143,7 @@ proc action_158
 	con	3,002000,1,1
 	declend
 	line	606
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51185,7 +51197,7 @@ proc action_160
 	con	3,002000,1,1
 	declend
 	line	607
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51196,29 +51208,29 @@ proc action_160
 	var	2
 	int	1
 	line	607
-	colm	31
+	colm	51
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	607
-	colm	41
+	colm	61
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	607
-	colm	51
+	colm	71
 	synt	any
 	subsc
 	line	607
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	607
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -51239,7 +51251,7 @@ proc action_161
 	con	3,002000,1,1
 	declend
 	line	610
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51293,7 +51305,7 @@ proc action_162
 	con	3,002000,1,1
 	declend
 	line	611
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51347,7 +51359,7 @@ proc action_163
 	con	3,002000,1,1
 	declend
 	line	612
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51401,7 +51413,7 @@ proc action_164
 	con	3,002000,1,1
 	declend
 	line	613
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51455,7 +51467,7 @@ proc action_165
 	con	3,002000,1,1
 	declend
 	line	614
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51509,7 +51521,7 @@ proc action_167
 	con	3,002000,1,1
 	declend
 	line	615
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51520,29 +51532,29 @@ proc action_167
 	var	2
 	int	1
 	line	615
-	colm	31
+	colm	51
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	615
-	colm	41
+	colm	61
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	615
-	colm	51
+	colm	71
 	synt	any
 	subsc
 	line	615
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	615
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -51563,7 +51575,7 @@ proc action_168
 	con	3,002000,1,1
 	declend
 	line	618
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51617,7 +51629,7 @@ proc action_169
 	con	3,002000,1,1
 	declend
 	line	619
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51671,7 +51683,7 @@ proc action_170
 	con	3,002000,1,1
 	declend
 	line	620
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51725,7 +51737,7 @@ proc action_173
 	con	3,002000,1,1
 	declend
 	line	621
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51778,7 +51790,7 @@ proc action_174
 	con	2,002000,1,1
 	declend
 	line	625
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51789,26 +51801,26 @@ proc action_174
 	var	2
 	int	1
 	line	625
-	colm	30
+	colm	50
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	625
-	colm	40
+	colm	60
 	synt	any
 	subsc
 	line	625
-	colm	44
+	colm	64
 	synt	any
 	keywd	null
 	line	625
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	625
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -51828,7 +51840,7 @@ proc action_175
 	con	2,002000,1,1
 	declend
 	line	628
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51878,7 +51890,7 @@ proc action_176
 	con	2,002000,1,1
 	declend
 	line	629
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51928,7 +51940,7 @@ proc action_177
 	con	2,002000,1,1
 	declend
 	line	630
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51979,7 +51991,7 @@ proc action_179
 	con	3,002000,1,1
 	declend
 	line	631
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -51990,29 +52002,29 @@ proc action_179
 	var	2
 	int	1
 	line	631
-	colm	31
+	colm	51
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	631
-	colm	41
+	colm	61
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	631
-	colm	51
+	colm	71
 	synt	any
 	subsc
 	line	631
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	631
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -52033,7 +52045,7 @@ proc action_180
 	con	3,002000,1,1
 	declend
 	line	634
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52087,7 +52099,7 @@ proc action_181
 	con	3,002000,1,1
 	declend
 	line	635
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52141,7 +52153,7 @@ proc action_182
 	con	3,002000,1,1
 	declend
 	line	636
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52195,7 +52207,7 @@ proc action_183
 	con	3,002000,1,1
 	declend
 	line	637
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52249,7 +52261,7 @@ proc action_184
 	con	3,002000,1,1
 	declend
 	line	638
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52303,7 +52315,7 @@ proc action_185
 	con	3,002000,1,1
 	declend
 	line	639
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52356,7 +52368,7 @@ proc action_187
 	con	2,002000,1,1
 	declend
 	line	640
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52367,22 +52379,22 @@ proc action_187
 	var	2
 	int	1
 	line	640
-	colm	29
+	colm	49
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	640
-	colm	39
+	colm	59
 	synt	any
 	subsc
 	line	640
-	colm	15
+	colm	36
 	synt	any
 	invoke	3
 	line	640
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -52402,7 +52414,7 @@ proc action_188
 	con	2,002000,1,1
 	declend
 	line	643
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52452,7 +52464,7 @@ proc action_189
 	con	2,002000,1,1
 	declend
 	line	644
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52502,7 +52514,7 @@ proc action_190
 	con	2,002000,1,1
 	declend
 	line	645
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52552,7 +52564,7 @@ proc action_191
 	con	2,002000,1,1
 	declend
 	line	646
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52602,7 +52614,7 @@ proc action_192
 	con	2,002000,1,1
 	declend
 	line	647
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52648,7 +52660,7 @@ proc action_193
 	con	2,002000,1,1
 	declend
 	line	648
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52694,7 +52706,7 @@ proc action_194
 	con	2,002000,1,1
 	declend
 	line	649
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52740,7 +52752,7 @@ proc action_195
 	con	2,002000,1,1
 	declend
 	line	650
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52786,7 +52798,7 @@ proc action_196
 	con	2,002000,1,1
 	declend
 	line	651
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52832,7 +52844,7 @@ proc action_197
 	con	2,002000,1,1
 	declend
 	line	652
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52878,7 +52890,7 @@ proc action_198
 	con	2,002000,1,1
 	declend
 	line	653
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52924,7 +52936,7 @@ proc action_199
 	con	2,002000,1,1
 	declend
 	line	654
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -52970,7 +52982,7 @@ proc action_200
 	con	2,002000,1,1
 	declend
 	line	655
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53016,7 +53028,7 @@ proc action_201
 	con	2,002000,1,1
 	declend
 	line	656
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53062,7 +53074,7 @@ proc action_202
 	con	2,002000,1,1
 	declend
 	line	657
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53108,7 +53120,7 @@ proc action_203
 	con	2,002000,1,1
 	declend
 	line	658
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53154,7 +53166,7 @@ proc action_204
 	con	2,002000,1,1
 	declend
 	line	659
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53200,7 +53212,7 @@ proc action_205
 	con	2,002000,1,1
 	declend
 	line	660
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53246,7 +53258,7 @@ proc action_206
 	con	2,002000,1,1
 	declend
 	line	661
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53292,7 +53304,7 @@ proc action_207
 	con	2,002000,1,1
 	declend
 	line	662
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53338,7 +53350,7 @@ proc action_208
 	con	2,002000,1,1
 	declend
 	line	663
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53384,7 +53396,7 @@ proc action_209
 	con	2,002000,1,1
 	declend
 	line	664
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53430,7 +53442,7 @@ proc action_210
 	con	2,002000,1,1
 	declend
 	line	665
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53476,7 +53488,7 @@ proc action_211
 	con	2,002000,1,1
 	declend
 	line	666
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53522,7 +53534,7 @@ proc action_212
 	con	2,002000,1,1
 	declend
 	line	667
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53568,7 +53580,7 @@ proc action_213
 	con	2,002000,1,1
 	declend
 	line	668
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53614,7 +53626,7 @@ proc action_214
 	con	2,002000,1,1
 	declend
 	line	669
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53660,7 +53672,7 @@ proc action_215
 	con	2,002000,1,1
 	declend
 	line	670
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53702,21 +53714,21 @@ proc action_217
 	con	0,002000,1,1
 	declend
 	line	671
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
 	var	0
 	int	0
 	line	671
-	colm	19
+	colm	41
 	synt	any
 	asgn
 	unmark
 lab L1
 	pnull
 	line	672
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -53728,7 +53740,7 @@ proc action_218
 	con	1,002000,1,2
 	declend
 	line	674
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53766,7 +53778,7 @@ proc action_227
 	con	1,002000,1,1
 	declend
 	line	674
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53812,7 +53824,7 @@ proc action_228
 	con	1,002000,1,1
 	declend
 	line	683
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53858,7 +53870,7 @@ proc action_229
 	con	1,002000,1,1
 	declend
 	line	684
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53904,7 +53916,7 @@ proc action_230
 	con	1,002000,1,1
 	declend
 	line	685
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53950,7 +53962,7 @@ proc action_231
 	con	1,002000,1,1
 	declend
 	line	686
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -53989,7 +54001,7 @@ proc action_232
 	con	2,002000,1,1
 	declend
 	line	687
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54048,7 +54060,7 @@ proc action_233
 	con	9,002000,1,1
 	declend
 	line	688
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54302,7 +54314,7 @@ proc action_234
 	con	4,002000,1,1
 	declend
 	line	706
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54361,7 +54373,7 @@ proc action_236
 	con	1,002000,1,1
 	declend
 	line	707
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54400,7 +54412,7 @@ proc action_237
 	con	2,002000,1,1
 	declend
 	line	709
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54447,7 +54459,7 @@ proc action_238
 	con	3,002000,1,1
 	declend
 	line	710
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54501,7 +54513,7 @@ proc action_239
 	con	3,002000,1,1
 	declend
 	line	711
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54554,7 +54566,7 @@ proc action_240
 	con	2,002000,1,1
 	declend
 	line	712
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54607,7 +54619,7 @@ proc action_241
 	con	3,002000,1,1
 	declend
 	line	713
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54658,7 +54670,7 @@ proc action_242
 	con	0,002000,1,3
 	declend
 	line	714
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54698,7 +54710,7 @@ proc action_243
 	con	4,002000,1,1
 	declend
 	line	715
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54759,7 +54771,7 @@ proc action_244
 	con	3,002000,1,1
 	declend
 	line	716
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54814,7 +54826,7 @@ proc action_245
 	con	4,002000,1,1
 	declend
 	line	717
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54875,7 +54887,7 @@ proc action_246
 	con	3,002000,1,1
 	declend
 	line	718
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -54937,7 +54949,7 @@ proc action_247
 	con	5,002000,1,1
 	declend
 	line	721
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -55013,7 +55025,7 @@ proc action_248
 	con	5,002000,1,1
 	declend
 	line	724
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -55091,7 +55103,7 @@ proc action_249
 	con	7,002000,1,1
 	declend
 	line	727
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -55183,7 +55195,7 @@ proc action_250
 	con	7,002000,1,1
 	declend
 	line	730
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -55270,7 +55282,7 @@ proc action_251
 	con	2,002000,1,1
 	declend
 	line	733
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -55322,7 +55334,7 @@ proc action_253
 	con	2,002000,1,1
 	declend
 	line	736
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -55374,7 +55386,7 @@ proc action_254
 	con	2,002000,1,1
 	declend
 	line	738
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -55419,7 +55431,7 @@ proc action_255
 	con	1,002000,1,1
 	declend
 	line	739
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -55464,7 +55476,7 @@ proc action_256
 	con	2,002000,1,1
 	declend
 	line	740
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -55475,22 +55487,22 @@ proc action_256
 	var	2
 	int	1
 	line	740
-	colm	43
+	colm	52
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	740
-	colm	53
+	colm	62
 	synt	any
 	subsc
 	line	740
-	colm	26
+	colm	36
 	synt	any
 	invoke	3
 	line	740
-	colm	19
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -55520,7 +55532,7 @@ proc action_257
 	con	10,002000,1,2
 	declend
 	line	744
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	747
@@ -56023,7 +56035,7 @@ proc action_258
 	con	2,002000,1,1
 	declend
 	line	764
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56071,7 +56083,7 @@ proc action_259
 	con	4,002000,1,1
 	declend
 	line	766
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56131,7 +56143,7 @@ proc action_260
 	con	2,002000,1,1
 	declend
 	line	767
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56179,7 +56191,7 @@ proc action_261
 	con	4,002000,1,1
 	declend
 	line	769
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56239,7 +56251,7 @@ proc action_262
 	con	2,002000,1,1
 	declend
 	line	770
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56282,7 +56294,7 @@ proc action_263
 	con	0,002000,1,1
 	declend
 	line	772
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56315,7 +56327,7 @@ proc action_264
 	con	2,002000,1,1
 	declend
 	line	774
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56361,7 +56373,7 @@ proc action_265
 	con	2,002000,1,1
 	declend
 	line	775
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56409,7 +56421,7 @@ proc action_266
 	con	4,002000,1,1
 	declend
 	line	776
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56471,7 +56483,7 @@ proc action_267
 	con	4,002000,1,1
 	declend
 	line	777
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56535,7 +56547,7 @@ proc action_268
 	con	6,002000,1,1
 	declend
 	line	779
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56613,7 +56625,7 @@ proc action_269
 	con	6,002000,1,1
 	declend
 	line	780
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56688,7 +56700,7 @@ proc action_271
 	con	3,002000,1,1
 	declend
 	line	782
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56699,7 +56711,7 @@ proc action_271
 	var	2
 	int	1
 	line	782
-	colm	34
+	colm	54
 	synt	any
 	subsc
 	str	2
@@ -56707,15 +56719,15 @@ proc action_271
 	var	2
 	int	3
 	line	782
-	colm	48
+	colm	68
 	synt	any
 	subsc
 	line	782
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	782
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -56736,7 +56748,7 @@ proc action_272
 	con	3,002000,1,1
 	declend
 	line	785
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56790,7 +56802,7 @@ proc action_273
 	con	3,002000,1,1
 	declend
 	line	787
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -56847,7 +56859,7 @@ proc action_275
 	con	4,002000,1,1
 	declend
 	line	788
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	789
@@ -57041,7 +57053,7 @@ proc action_276
 	con	1,002000,1,1
 	declend
 	line	798
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57081,7 +57093,7 @@ proc action_277
 	con	3,002000,1,1
 	declend
 	line	800
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57132,7 +57144,7 @@ proc action_282
 	con	0,002000,1,1
 	declend
 	line	801
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57166,7 +57178,7 @@ proc action_283
 	con	0,010000,10,145,155,160,164,171,162,145,147,145,170
 	declend
 	line	808
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57194,7 +57206,7 @@ proc action_285
 	con	3,002000,1,1
 	declend
 	line	809
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57247,7 +57259,7 @@ proc action_287
 	con	2,002000,1,1
 	declend
 	line	814
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57293,7 +57305,7 @@ proc action_289
 	con	2,002000,1,1
 	declend
 	line	818
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57339,7 +57351,7 @@ proc action_290
 	con	2,002000,1,1
 	declend
 	line	822
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57385,7 +57397,7 @@ proc action_291
 	con	2,002000,1,1
 	declend
 	line	823
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57438,7 +57450,7 @@ proc action_292
 	con	7,010000,11,162,145,147,145,170,143,157,156,143,141,164
 	declend
 	line	824
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	823
@@ -57672,7 +57684,7 @@ proc action_294
 	con	1,002000,3,257
 	declend
 	line	841
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57707,7 +57719,7 @@ lab L1
 lab L2
 	pnull
 	line	843
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -57718,7 +57730,7 @@ proc action_295
 	con	1,002000,3,257
 	declend
 	line	845
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57753,7 +57765,7 @@ lab L1
 lab L2
 	pnull
 	line	844
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -57764,7 +57776,7 @@ proc action_296
 	con	1,002000,3,257
 	declend
 	line	846
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57799,7 +57811,7 @@ lab L1
 lab L2
 	pnull
 	line	845
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -57813,7 +57825,7 @@ proc action_302
 	con	3,002000,1,1
 	declend
 	line	847
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -57870,7 +57882,7 @@ proc action_303
 	con	5,010000,1,040
 	declend
 	line	853
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -58067,7 +58079,7 @@ proc action_304
 	con	4,002000,1,1
 	declend
 	line	864
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -58127,7 +58139,7 @@ proc action_305
 	con	2,002000,1,1
 	declend
 	line	865
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -58174,7 +58186,7 @@ proc action_307
 	con	3,002000,1,1
 	declend
 	line	866
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -58235,7 +58247,7 @@ proc action_308
 	con	4,010000,11,162,145,147,145,170,040,164,171,160,145,040
 	declend
 	line	870
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	line	869
@@ -58527,7 +58539,7 @@ lab L12
 lab L10
 	pnull
 	line	884
-	colm	1
+	colm	2
 	synt	any
 	pfail
 	end
@@ -58550,7 +58562,7 @@ proc action_313
 	con	12,010000,26,165,156,162,145,143,157,147,156,151,172,145,144,040,145,163,143,141,160,145,040,143,150,141,162,040,134
 	declend
 	line	886
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -58779,7 +58791,7 @@ proc action_314
 	con	11,010000,31,156,157,156,055,157,143,164,141,154,040,156,165,155,145,162,151,143,040,145,163,143,141,160,145,040,143,150,141,162,040,134
 	declend
 	line	897
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -58994,7 +59006,7 @@ proc action_315
 	con	6,002000,1,1
 	declend
 	line	905
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -59005,50 +59017,50 @@ proc action_315
 	var	2
 	int	1
 	line	905
-	colm	33
+	colm	53
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	905
-	colm	43
+	colm	63
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	905
-	colm	53
+	colm	73
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	4
 	line	905
-	colm	63
+	colm	83
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	5
 	line	905
-	colm	73
+	colm	93
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	6
 	line	905
-	colm	83
+	colm	103
 	synt	any
 	subsc
 	line	905
-	colm	15
+	colm	36
 	synt	any
 	invoke	7
 	line	905
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -59069,7 +59081,7 @@ proc action_320
 	con	3,002000,1,1
 	declend
 	line	908
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -59117,7 +59129,7 @@ proc action_322
 	con	3,002000,1,1
 	declend
 	line	915
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
@@ -59128,29 +59140,29 @@ proc action_322
 	var	2
 	int	1
 	line	915
-	colm	31
+	colm	51
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	2
 	line	915
-	colm	41
+	colm	61
 	synt	any
 	subsc
 	pnull
 	var	2
 	int	3
 	line	915
-	colm	51
+	colm	71
 	synt	any
 	subsc
 	line	915
-	colm	15
+	colm	36
 	synt	any
 	invoke	4
 	line	915
-	colm	8
+	colm	30
 	synt	any
 	asgn
 	unmark
@@ -59167,7 +59179,7 @@ proc action_323
 	con	0,010000,5,145,162,162,157,162
 	declend
 	line	918
-	colm	11
+	colm	12
 	synt	any
 	mark	L1
 	pnull
diff --git a/uni/unicon/unigram.y b/uni/unicon/unigram.y
index 139bcdb31..6e86cc118 100644
--- a/uni/unicon/unigram.y
+++ b/uni/unicon/unigram.y
@@ -164,7 +164,7 @@ procedure Keyword(x1,x2)
                        "errno","window","col","row","x","y","interval",
                        "control","shift","meta","lpress","mpress","rpress",
                        "lrelease","mrelease","rrelease","ldrag","mdrag",
-                       "rdrag","resize","ascii","cset"])
+                       "rdrag","resize","ascii","cset","proc","config","child","parent"])
       }
 
    # verify that x2 is a valid keyword