[Buildroot] [PATCH] vim : bump to 7.3

Chih-Min Chao cmchao at gmail.com
Mon Sep 20 16:54:12 UTC 2010


Signed-off-by: Chih-Min Chao <cmchao at gmail.com>
---
 package/vim/configure.patch |19257 +------------------------------------------
 package/vim/patches         |  297 +-
 package/vim/vim.mk          |   13 +-
 3 files changed, 33 insertions(+), 19534 deletions(-)

diff --git a/package/vim/configure.patch b/package/vim/configure.patch
index f884095..9c060af 100644
--- a/package/vim/configure.patch
+++ b/package/vim/configure.patch
@@ -1,19247 +1,34 @@
---- vim71/src/auto/configure.orig	2009-04-29 14:01:00.000000000 -0600
-+++ vim71/src/auto/configure	2009-04-29 14:00:11.000000000 -0600
-@@ -1,25 +1,54 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.61.
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
+diff --git a/configure b/configure
+index d09ee92..ecbb0a8 100755
+--- a/src/auto/configure
++++ b/src/auto/configure
+@@ -11641,10 +11641,7 @@ _ACEOF
  
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
- fi
--DUALCASE=1; export DUALCASE # for MKS sh
- 
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@
- 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.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -44,18 +108,19 @@
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
--    $as_unset $as_var
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
- 
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
-@@ -63,157 +128,388 @@
- 
- 
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
-+# CDPATH.
-+$as_unset CDPATH
- 
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
-+if test "x$CONFIG_SHELL" = x; then
-+  if (eval ":") 2>/dev/null; then
-+  as_have_required=yes
-+else
-+  as_have_required=no
-+fi
-+
-+  if test $as_have_required = yes && 	 (eval ":
-+(as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
- fi
- 
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
- 
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
- 
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+  as_lineno_1=\$LINENO
-+  as_lineno_2=\$LINENO
-+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+  :
-+else
-+  as_candidate_shells=
-     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
-+  case $as_dir in
- 	 /*)
--	   if ("$as_dir/$as_base" -c '
-+	   for as_base in sh bash ksh sh5; do
-+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+	   done;;
-+       esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+      for as_shell in $as_candidate_shells $SHELL; do
-+	 # Try only shells that exist, to save several forks.
-+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+_ASEOF
-+}; then
-+  CONFIG_SHELL=$as_shell
-+	       as_have_required=yes
-+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+:
-+(as_func_return () {
-+  (exit $1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+  break
-+fi
-+
-+fi
-+
-+      done
-+
-+      if test "x$CONFIG_SHELL" != x; then
-+  for as_var in BASH_ENV ENV
-+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+        done
-+        export CONFIG_SHELL
-+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+    if test $as_have_required = no; then
-+  echo This script requires a shell more modern than all the
-+      echo shells that I found on your system.  Please install a
-+      echo modern shell, or manually run the script under such a
-+      echo shell if you do have one.
-+      { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+  echo No shell found that supports shell functions.
-+  echo Please tell autoconf at gnu.org about your system,
-+  echo including any error possibly output before this
-+  echo message
-+}
-+
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- 
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-     sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-       N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
-+      s/-\n.*//
-     ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
-+  chmod +x "$as_me.lineno" ||
-     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- 
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
- esac
- 
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
- else
-   as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
- 
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
-@@ -222,7 +518,28 @@
-   as_mkdir_p=false
- fi
- 
--as_executable_p="test -f"
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+        test -d "$1/.";
-+      else
-+	case $1 in
-+        -*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
-+fi
-+as_executable_p=$as_test_x
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,39 +548,27 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
--
--# CDPATH.
--$as_unset CDPATH
- 
-+exec 7<&0 </dev/null 6>&1
- 
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete.  It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
- # Identity of this package.
- PACKAGE_NAME=
- PACKAGE_TARNAME=
-@@ -275,42 +580,183 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- #  include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- #  include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--#  include <stdint.h>
--# endif
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK STRIP CPP_MM OS_EXTRA_SRC OS_EXTRA_OBJ VIMNAME EXNAME VIEWNAME line_break dovimdiff dogvimdiff compiledby vi_cv_path_mzscheme MZSCHEME_SRC MZSCHEME_OBJ MZSCHEME_PRO MZSCHEME_LIBS MZSCHEME_CFLAGS vi_cv_path_perl vi_cv_perllib shrpenv PERL_SRC PERL_OBJ PERL_PRO PERL_CFLAGS PERL_LIBS vi_cv_path_python PYTHON_CONFDIR PYTHON_LIBS PYTHON_GETPATH_CFLAGS PYTHON_CFLAGS PYTHON_SRC PYTHON_OBJ vi_cv_path_tcl TCL_SRC TCL_OBJ TCL_PRO TCL_CFLAGS TCL_LIBS vi_cv_path_ruby RUBY_SRC RUBY_OBJ RUBY_PRO RUBY_CFLAGS RUBY_LIBS WORKSHOP_SRC WORKSHOP_OBJ NETBEANS_SRC NETBEANS_OBJ SNIFF_SRC 
 SNIFF_OBJ xmkmfpath X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_LIB GTK_CONFIG GTK12_CONFIG PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_LIBNAME GNOME_LIBS GNOME_LIBDIR GNOME_INCLUDEDIR GNOME_CONFIG MOTIF_LIBNAME NARROW_PROTO GUI_INC_LOC GUI_LIB_LOC GUITYPE GUI_X_LIBS HANGULIN_SRC HANGULIN_OBJ TAGPRG INSTALL_LANGS INSTALL_TOOL_LANGS MSGFMT MAKEMO DEPEND_CFLAGS_FILTER LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+SET_MAKE
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+CPP
-+GREP
-+EGREP
-+AWK
-+STRIP
-+CPP_MM
-+OS_EXTRA_SRC
-+OS_EXTRA_OBJ
-+VIMNAME
-+EXNAME
-+VIEWNAME
-+line_break
-+dovimdiff
-+dogvimdiff
-+compiledby
-+vi_cv_path_mzscheme
-+MZSCHEME_SRC
-+MZSCHEME_OBJ
-+MZSCHEME_PRO
-+MZSCHEME_LIBS
-+MZSCHEME_CFLAGS
-+vi_cv_path_perl
-+vi_cv_perllib
-+shrpenv
-+PERL_SRC
-+PERL_OBJ
-+PERL_PRO
-+PERL_CFLAGS
-+PERL_LIBS
-+vi_cv_path_python
-+PYTHON_CONFDIR
-+PYTHON_LIBS
-+PYTHON_GETPATH_CFLAGS
-+PYTHON_CFLAGS
-+PYTHON_SRC
-+PYTHON_OBJ
-+vi_cv_path_tcl
-+TCL_SRC
-+TCL_OBJ
-+TCL_PRO
-+TCL_CFLAGS
-+TCL_LIBS
-+vi_cv_path_ruby
-+RUBY_SRC
-+RUBY_OBJ
-+RUBY_PRO
-+RUBY_CFLAGS
-+RUBY_LIBS
-+WORKSHOP_SRC
-+WORKSHOP_OBJ
-+NETBEANS_SRC
-+NETBEANS_OBJ
-+SNIFF_SRC
-+SNIFF_OBJ
-+xmkmfpath
-+XMKMF
-+X_CFLAGS
-+X_PRE_LIBS
-+X_LIBS
-+X_EXTRA_LIBS
-+X_LIB
-+GTK_CONFIG
-+GTK12_CONFIG
-+PKG_CONFIG
-+GTK_CFLAGS
-+GTK_LIBS
-+GTK_LIBNAME
-+GNOME_LIBS
-+GNOME_LIBDIR
-+GNOME_INCLUDEDIR
-+GNOME_CONFIG
-+MOTIF_LIBNAME
-+NARROW_PROTO
-+GUI_INC_LOC
-+GUI_LIB_LOC
-+GUITYPE
-+GUI_X_LIBS
-+HANGULIN_SRC
-+HANGULIN_OBJ
-+TAGPRG
-+INSTALL_LANGS
-+INSTALL_TOOL_LANGS
-+MSGFMT
-+MAKEMO
-+DEPEND_CFLAGS_FILTER
-+LIBOBJS
-+LTLIBOBJS'
- ac_subst_files=''
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP
-+XMKMF'
-+
- 
- # Initialize some variables set by options.
- ac_init_help=
-@@ -337,34 +783,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
- 
- ac_prev=
-+ac_dashdash=
- for ac_option
- do
-   # If the previous option needs an argument, assign it.
-   if test -n "$ac_prev"; then
--    eval "$ac_prev=\$ac_option"
-+    eval $ac_prev=\$ac_option
-     ac_prev=
-     continue
-   fi
- 
--  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
- 
--  case $ac_option in
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
- 
-   -bindir | --bindir | --bindi | --bind | --bin | --bi)
-     ac_prev=bindir ;;
-@@ -386,33 +846,45 @@
-   --config-cache | -C)
-     cache_file=config.cache ;;
- 
--  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+  -datadir | --datadir | --datadi | --datad)
-     ac_prev=datadir ;;
--  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
--  | --da=*)
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-     datadir=$ac_optarg ;;
- 
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-   -disable-* | --disable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    eval "enable_$ac_feature=no" ;;
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+    eval enable_$ac_feature=no ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
- 
-   -enable-* | --enable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
--      *) ac_optarg=yes ;;
--    esac
--    eval "enable_$ac_feature='$ac_optarg'" ;;
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+    eval enable_$ac_feature=\$ac_optarg ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +911,12 @@
-   -host=* | --host=* | --hos=* | --ho=*)
-     host_alias=$ac_optarg ;;
- 
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-   -includedir | --includedir | --includedi | --included | --include \
-   | --includ | --inclu | --incl | --inc)
-     ac_prev=includedir ;;
-@@ -463,13 +941,16 @@
-   | --libexe=* | --libex=* | --libe=*)
-     libexecdir=$ac_optarg ;;
- 
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-   -localstatedir | --localstatedir | --localstatedi | --localstated \
--  | --localstate | --localstat | --localsta | --localst \
--  | --locals | --local | --loca | --loc | --lo)
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-     ac_prev=localstatedir ;;
-   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
--  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
--  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-     localstatedir=$ac_optarg ;;
- 
-   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +1015,16 @@
-   | --progr-tra=* | --program-tr=* | --program-t=*)
-     program_transform_name=$ac_optarg ;;
- 
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil)
-     silent=yes ;;
-@@ -586,24 +1077,20 @@
-   -with-* | --with-*)
-     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package| sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
--      *) ac_optarg=yes ;;
--    esac
--    eval "with_$ac_package='$ac_optarg'" ;;
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+    eval with_$ac_package=\$ac_optarg ;;
- 
-   -without-* | --without-*)
-     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/-/_/g'`
--    eval "with_$ac_package=no" ;;
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+    eval with_$ac_package=no ;;
- 
-   --x)
-     # Obsolete; use --with-x.
-@@ -634,8 +1121,7 @@
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-    { (exit 1); exit 1; }; }
--    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
--    eval "$ac_envvar='$ac_optarg'"
-+    eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
- 
-   *)
-@@ -655,27 +1141,19 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
--  eval ac_val=$`echo $ac_var`
--  case $ac_val in
--    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
--  esac
--done
--
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--	      localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
- do
--  eval ac_val=$`echo $ac_var`
-+  eval ac_val=\$$ac_var
-   case $ac_val in
--    [\\/$]* | ?:[\\/]* ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    [\\/$]* | ?:[\\/]* )  continue;;
-+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
-+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+   { (exit 1); exit 1; }; }
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
-@@ -702,74 +1180,76 @@
- test "$silent" = yes && exec 6>/dev/null
- 
- 
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  { echo "$as_me: error: Working directory cannot be determined" >&2
-+   { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+   { (exit 1); exit 1; }; }
-+
-+
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
--  # Try the directory containing this script, then its parent.
--  ac_confdir=`(dirname "$0") 2>/dev/null ||
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$0" : 'X\(//\)[^/]' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-   srcdir=$ac_confdir
--  if test ! -r $srcdir/$ac_unique_file; then
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-     srcdir=..
-   fi
- else
-   ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
--  if test "$ac_srcdir_defaulted" = yes; then
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
--   { (exit 1); exit 1; }; }
--  else
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-    { (exit 1); exit 1; }; }
--  fi
- fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
--  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-    { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
- 
- #
- # Report the --help message.
-@@ -798,9 +1278,6 @@
-   -n, --no-create         do not create output files
-       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
- 
--_ACEOF
--
--  cat <<_ACEOF
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
- 			  [$ac_default_prefix]
-@@ -818,15 +1295,22 @@
-   --bindir=DIR           user executables [EPREFIX/bin]
-   --sbindir=DIR          system admin executables [EPREFIX/sbin]
-   --libexecdir=DIR       program executables [EPREFIX/libexec]
--  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-   --libdir=DIR           object code libraries [EPREFIX/lib]
-   --includedir=DIR       C header files [PREFIX/include]
-   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
--  --infodir=DIR          info documentation [PREFIX/info]
--  --mandir=DIR           man documentation [PREFIX/man]
-+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR          info documentation [DATAROOTDIR/info]
-+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR           man documentation [DATAROOTDIR/man]
-+  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-+  --htmldir=DIR          html documentation [DOCDIR]
-+  --dvidir=DIR           dvi documentation [DOCDIR]
-+  --pdfdir=DIR           pdf documentation [DOCDIR]
-+  --psdir=DIR            ps documentation [DOCDIR]
- _ACEOF
- 
-   cat <<\_ACEOF
-@@ -902,126 +1386,96 @@
-   CFLAGS      C compiler flags
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
--  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
--              headers in a nonstandard directory <include dir>
-+  LIBS        libraries to pass to the linker, e.g. -l<library>
-+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
-+  XMKMF       Path to xmkmf, Makefile generator for X Window System
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
- 
- _ACEOF
-+ac_status=$?
- fi
- 
- if test "$ac_init_help" = "recursive"; then
-   # If there are subdirs, report their specific --help.
--  ac_popdir=`pwd`
-   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
--    test -d $ac_dir || continue
-+    test -d "$ac_dir" || continue
-     ac_builddir=.
- 
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`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/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
- 
- case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
-+  .)  # We are building in place.
-     ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-     ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
--    cd $ac_dir
--    # Check for guested configure; otherwise get Cygnus style configure.
--    if test -f $ac_srcdir/configure.gnu; then
--      echo
--      $SHELL $ac_srcdir/configure.gnu  --help=recursive
--    elif test -f $ac_srcdir/configure; then
--      echo
--      $SHELL $ac_srcdir/configure  --help=recursive
--    elif test -f $ac_srcdir/configure.ac ||
--	   test -f $ac_srcdir/configure.in; then
--      echo
--      $ac_configure --help
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
--    fi
--    cd $ac_popdir
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-   done
- fi
- 
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
-   cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.61
- 
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
--  exit 0
-+  exit
- fi
--exec 5>auto/config.log
--cat >&5 <<_ACEOF
-+cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.61.  Invocation command line was
- 
-   $ $0 $@
- 
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1040,7 +1494,7 @@
- /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
- /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
- /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
- /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
- /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1054,6 +1508,7 @@
-   test -z "$as_dir" && as_dir=.
-   echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
- 
- } >&5
- 
-@@ -1075,7 +1530,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1086,7 +1540,7 @@
-     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-     | -silent | --silent | --silen | --sile | --sil)
-       continue ;;
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+    *\'*)
-       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     case $ac_pass in
-@@ -1108,9 +1562,7 @@
- 	  -* ) ac_must_keep_next=true ;;
- 	esac
-       fi
--      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
--      # Get rid of the leading space.
--      ac_sep=" "
-+      ac_configure_args="$ac_configure_args '$ac_arg'"
-       ;;
-     esac
-   done
-@@ -1121,8 +1573,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log.  We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# 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=$?
-   # Save into config.log some information that might help in debugging.
-   {
-@@ -1135,20 +1587,34 @@
- _ASBOX
-     echo
-     # The following way of writing the cache mishandles newlines in values,
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-   (set) 2>&1 |
--    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-       sed -n \
--	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
--      ;;
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-     *)
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--}
-+    esac |
-+    sort
-+)
-     echo
- 
-     cat <<\_ASBOX
-@@ -1159,22 +1625,28 @@
-     echo
-     for ac_var in $ac_subst_vars
-     do
--      eval ac_val=$`echo $ac_var`
--      echo "$ac_var='"'"'$ac_val'"'"'"
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      echo "$ac_var='\''$ac_val'\''"
-     done | sort
-     echo
- 
-     if test -n "$ac_subst_files"; then
-       cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
-       echo
-       for ac_var in $ac_subst_files
-       do
--	eval ac_val=$`echo $ac_var`
--	echo "$ac_var='"'"'$ac_val'"'"'"
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	echo "$ac_var='\''$ac_val'\''"
-       done | sort
-       echo
-     fi
-@@ -1186,26 +1658,24 @@
- ## ----------- ##
- _ASBOX
-       echo
--      sed "/^$/d" confdefs.h | sort
-+      cat confdefs.h
-       echo
-     fi
-     test "$ac_signal" != 0 &&
-       echo "$as_me: caught signal $ac_signal"
-     echo "$as_me: exit $exit_status"
-   } >&5
--  rm -f core *.core &&
--  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+  rm -f core *.core core.conftest.* &&
-+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-     exit $exit_status
--     ' 0
-+' 0
- for ac_signal in 1 2 13 15; do
-   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
- ac_signal=0
- 
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
- 
- # Predefined preprocessor variables.
- 
-@@ -1236,14 +1706,17 @@
- 
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
--  if test "x$prefix" != xNONE; then
--    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--  else
--    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--  fi
-+if test -n "$CONFIG_SITE"; then
-+  set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+  set x "$ac_default_prefix/share/config.site" \
-+	"$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+do
-   if test -r "$ac_site_file"; then
-     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1259,8 +1732,8 @@
-     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
--      [\\/]* | ?:[\\/]* ) . $cache_file;;
--      *)                      . ./$cache_file;;
-+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+      *)                      . "./$cache_file";;
-     esac
-   fi
- else
-@@ -1272,12 +1745,11 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
--	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+for ac_var in $ac_precious_vars; do
-   eval ac_old_set=\$ac_cv_env_${ac_var}_set
-   eval ac_new_set=\$ac_env_${ac_var}_set
--  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
--  eval ac_new_val="\$ac_env_${ac_var}_value"
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-   case $ac_old_set,$ac_new_set in
-     set,)
-       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1302,8 +1774,7 @@
-   # Pass precious variables to config.status.
-   if test "$ac_new_set" = set; then
-     case $ac_new_val in
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-     *) ac_arg=$ac_var=$ac_new_val ;;
-     esac
-     case " $ac_configure_args " in
-@@ -1320,12 +1791,6 @@
-    { (exit 1); exit 1; }; }
- 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
--
- 
- 
- 
-@@ -1342,41 +1807,47 @@
- 
- 
- 
-+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_config_headers="$ac_config_headers auto/config.h:config.h.in"
-+ac_config_headers="$ac_config_headers auto/config.h:config.h.in"
- 
- 
- cat >>confdefs.h <<\_ACEOF
- #define UNIX 1
- _ACEOF
- 
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
--	@echo 'ac_maketemp="$(MAKE)"'
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
--  eval ac_cv_prog_make_${ac_make}_set=yes
--else
--  eval ac_cv_prog_make_${ac_make}_set=no
--fi
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
- rm -f conftest.make
- fi
--if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   SET_MAKE=
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-@@ -1389,8 +1860,8 @@
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1403,32 +1874,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1441,36 +1914,51 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="gcc"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  CC=$ac_ct_CC
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
- else
-   CC="$ac_cv_prog_CC"
- fi
- 
- 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.
-+          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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1483,74 +1971,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
--  ac_ct_CC=$CC
--  # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&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
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  CC=$ac_ct_CC
--else
--  CC="$ac_cv_prog_CC"
--fi
- 
-+  fi
- 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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1564,7 +2012,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-@@ -1575,6 +2023,7 @@
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- if test $ac_prog_rejected = yes; then
-   # We found a bogon in the path, so make sure we never use it.
-@@ -1592,22 +2041,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$CC"; then
-   if test -n "$ac_tool_prefix"; then
--  for ac_prog in cl
-+  for ac_prog in cl.exe
-   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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1620,36 +2070,38 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     test -n "$CC" && break
-   done
- fi
- if test -z "$CC"; then
-   ac_ct_CC=$CC
--  for ac_prog in cl
-+  for ac_prog in cl.exe
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1662,29 +2114,45 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
-     echo "$as_me:$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
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$ac_ct_CC" && break
- done
- 
--  CC=$ac_ct_CC
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
- fi
- 
- fi
-@@ -1697,21 +2165,35 @@
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-@@ -1736,47 +2218,77 @@
- # 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.
--echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
--  (eval $ac_link_default) 2>&5
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort.  b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions.  Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+  esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link_default") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  # Find the output, starting from the most likely.  This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+  # 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,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
- do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
--	;;
--    conftest.$ac_ext )
--	# This is the source file.
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- 	;;
-     [ab].out )
- 	# We found the default executable, but exeext='' is most
- 	# certainly right.
- 	break;;
-     *.* )
--	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--	# FIXME: I believe we export ac_cv_exeext for Libtool,
--	# but it would be cool to find out if it's true.  Does anybody
--	# maintain Libtool? --akim.
--	export ac_cv_exeext
-+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+	then :; else
-+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	fi
-+	# We set ac_cv_exeext here because the later test for it is not
-+	# safe: cross compilers may not add the suffix if given an `-o'
-+	# argument, so we may need to know it at that point already.
-+	# Even if this section looks crufty: it has the advantage of
-+	# actually working.
- 	break;;
-     * )
- 	break;;
-   esac
- done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
- else
-+  ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-@@ -1788,19 +2300,21 @@
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
- 
--# Check the compiler produces executables we can run.  If not, either
-+# Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -1819,22 +2333,27 @@
-     fi
-   fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run.  If not, either
-+# Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
--
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-@@ -1845,9 +2364,8 @@
- for ac_file in conftest.exe conftest conftest.*; do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--	  export ac_cv_exeext
- 	  break;;
-     * ) break;;
-   esac
-@@ -1861,14 +2379,14 @@
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1888,14 +2406,20 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+  for ac_file in conftest.o conftest.obj conftest.*; do
-+  test -f "$ac_file" || continue;
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-        break;;
-   esac
-@@ -1913,12 +2437,12 @@
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1941,50 +2465,49 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_compiler_gnu=no
-+	ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
-+   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2000,38 +2523,118 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_prog_cc_g=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	CFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_prog_cc_g=no
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$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
-@@ -2047,12 +2650,12 @@
-     CFLAGS=
-   fi
- fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_prog_cc_stdc=no
-+  ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2086,12 +2689,17 @@
- /* 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 -std1 is added to get
-+   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 -std1.  */
-+   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);};
-@@ -2106,205 +2714,57 @@
-   return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX 10.20 and later	-Ae
--# HP-UX older versions	-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -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"
-   rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_prog_cc_stdc=$ac_arg
--break
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_prog_cc_c89=$ac_arg
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
- 
- fi
--
--case "x$ac_cv_prog_cc_stdc" in
--  x|xno)
--    echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+  xno)
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-   *)
--    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
--    CC="$CC $ac_cv_prog_cc_stdc" ;;
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
- 
--# Some people use a C++ compiler to compile C.  Since we use `exit',
--# in C++ we need to declare it.  In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
--  choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_declaration
--#include <stdlib.h>
--int
--main ()
--{
--exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_declaration
--int
--main ()
--{
--exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
--fi
--
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
--rm -f 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'
-@@ -2315,8 +2775,8 @@
- 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
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -2350,24 +2810,22 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -2376,9 +2834,10 @@
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2388,24 +2847,22 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # Broken: success on invalid input.
- continue
- else
-@@ -2416,6 +2873,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -2433,8 +2891,8 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -2457,24 +2915,22 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -2483,9 +2939,10 @@
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2495,24 +2952,22 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # Broken: success on invalid input.
- continue
- else
-@@ -2523,6 +2978,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -2545,19 +3001,166 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  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"
-+    { test -f "$ac_path_GREP" && $as_test_x "$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
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    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
-+    ac_count=`expr $ac_count + 1`
-+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_GREP="$ac_path_GREP"
-+      ac_path_GREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+    $ac_path_GREP_found && break 3
-+  done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_GREP=$GREP
-+fi
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+   then ac_cv_path_EGREP="$GREP -E"
-+   else
-+     # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
-+  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"
-+    { test -f "$ac_path_EGREP" && $as_test_x "$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
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    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
-+    ac_count=`expr $ac_count + 1`
-+    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
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+   fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
- 
- 
- cat >conftest.$ac_ext <<_ACEOF
-@@ -2568,18 +3171,13 @@
- /* end confdefs.h.  */
- 
- _ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "" >/dev/null 2>&1; then
--  :
--fi
- rm -f conftest*
-- echo "$as_me:$LINENO: checking for library containing strerror" >&5
--echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing strerror" >&5
-+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
- if test "${ac_cv_search_strerror+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_func_search_save_LIBS=$LIBS
--ac_cv_search_strerror=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -2587,123 +3185,81 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char strerror ();
- int
- main ()
- {
--strerror ();
-+return strerror ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+for ac_lib in '' cposix; 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
-+  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_search_strerror="none required"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_search_strerror=$ac_res
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_strerror" = no; then
--  for ac_lib in cposix; do
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char strerror ();
--int
--main ()
--{
--strerror ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_search_strerror="-l$ac_lib"
--break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext
-+  if test "${ac_cv_search_strerror+set}" = set; then
-+  break
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--  done
-+done
-+if test "${ac_cv_search_strerror+set}" = set; then
-+  :
-+else
-+  ac_cv_search_strerror=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
--echo "${ECHO_T}$ac_cv_search_strerror" >&6
--if test "$ac_cv_search_strerror" != no; then
--  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
-+ac_res=$ac_cv_search_strerror
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
- fi
- 	for ac_prog in gawk mawk nawk awk
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2716,32 +3272,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AWK="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+  { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$AWK" && break
- done
- 
- # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2754,29 +3312,31 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- 
- 
- 
-+
- if test -z "$CFLAGS"; then
-   CFLAGS="-O"
-   test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall"
-@@ -2797,13 +3357,12 @@
-   fi
- fi
- 
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot compile a simple program, check CC and CFLAGS
--  (cross compiling doesn't work)" >&5
--echo "$as_me: error: cannot compile a simple program, check CC and CFLAGS
--  (cross compiling doesn't work)" >&2;}
--   { (exit 1); exit 1; }; }
--fi
-+#dnl If configure thinks we are cross compiling, there is probably something
-+#dnl wrong with the CC or CFLAGS settings, give an understandable error message
-+#if test "$cross_compiling" = yes; then
-+#  AC_MSG_ERROR([cannot compile a simple program, check CC and CFLAGS
-+#  (cross compiling doesn't work)])
-+#fi
- 
- test "$GCC" = yes && CPP_MM=M;
- 
-@@ -2815,76 +3374,76 @@
- 
- OS_EXTRA_SRC=""; OS_EXTRA_OBJ=""
- 
--echo "$as_me:$LINENO: checking for BeOS" >&5
--echo $ECHO_N "checking for BeOS... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for BeOS" >&5
-+echo $ECHO_N "checking for BeOS... $ECHO_C" >&6; }
- case `uname` in
-     BeOS)	OS_EXTRA_SRC=os_beos.c; OS_EXTRA_OBJ=objects/os_beos.o
--		BEOS=yes; echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6;;
--    *)		BEOS=no; echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6;;
-+		BEOS=yes; { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; };;
-+    *)		BEOS=no; { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; };;
- esac
- 
--echo "$as_me:$LINENO: checking for QNX" >&5
--echo $ECHO_N "checking for QNX... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for QNX" >&5
-+echo $ECHO_N "checking for QNX... $ECHO_C" >&6; }
- case `uname` in
-     QNX)	OS_EXTRA_SRC=os_qnx.c; OS_EXTRA_OBJ=objects/os_qnx.o
- 		test -z "$with_x" && with_x=no
--		QNX=yes; echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6;;
--    *)		QNX=no; echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6;;
-+		QNX=yes; { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; };;
-+    *)		QNX=no; { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; };;
- esac
- 
--echo "$as_me:$LINENO: checking for Darwin (Mac OS X)" >&5
--echo $ECHO_N "checking for Darwin (Mac OS X)... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Darwin (Mac OS X)" >&5
-+echo $ECHO_N "checking for Darwin (Mac OS X)... $ECHO_C" >&6; }
- if test "`(uname) 2>/dev/null`" = Darwin; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
--  echo "$as_me:$LINENO: checking --disable-darwin argument" >&5
--echo $ECHO_N "checking --disable-darwin argument... $ECHO_C" >&6
--  # Check whether --enable-darwin or --disable-darwin was given.
-+  { echo "$as_me:$LINENO: checking --disable-darwin argument" >&5
-+echo $ECHO_N "checking --disable-darwin argument... $ECHO_C" >&6; }
-+  # Check whether --enable-darwin was given.
- if test "${enable_darwin+set}" = set; then
--  enableval="$enable_darwin"
--
-+  enableval=$enable_darwin;
- else
-   enable_darwin="yes"
--fi;
-+fi
-+
-   if test "$enable_darwin" = "yes"; then
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--    echo "$as_me:$LINENO: checking if Darwin files are there" >&5
--echo $ECHO_N "checking if Darwin files are there... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+    { echo "$as_me:$LINENO: checking if Darwin files are there" >&5
-+echo $ECHO_N "checking if Darwin files are there... $ECHO_C" >&6; }
-     if test -f os_macosx.c; then
--      echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+      { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-     else
--      echo "$as_me:$LINENO: result: no, Darwin support disabled" >&5
--echo "${ECHO_T}no, Darwin support disabled" >&6
-+      { echo "$as_me:$LINENO: result: no, Darwin support disabled" >&5
-+echo "${ECHO_T}no, Darwin support disabled" >&6; }
-       enable_darwin=no
-     fi
-   else
--    echo "$as_me:$LINENO: result: yes, Darwin support excluded" >&5
--echo "${ECHO_T}yes, Darwin support excluded" >&6
-+    { echo "$as_me:$LINENO: result: yes, Darwin support excluded" >&5
-+echo "${ECHO_T}yes, Darwin support excluded" >&6; }
-   fi
- 
--  echo "$as_me:$LINENO: checking --with-mac-arch argument" >&5
--echo $ECHO_N "checking --with-mac-arch argument... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking --with-mac-arch argument" >&5
-+echo $ECHO_N "checking --with-mac-arch argument... $ECHO_C" >&6; }
- 
--# Check whether --with-mac-arch or --without-mac-arch was given.
-+# Check whether --with-mac-arch was given.
- if test "${with_mac_arch+set}" = set; then
--  withval="$with_mac_arch"
--  MACARCH="$withval"; echo "$as_me:$LINENO: result: $MACARCH" >&5
--echo "${ECHO_T}$MACARCH" >&6
-+  withval=$with_mac_arch; MACARCH="$withval"; { echo "$as_me:$LINENO: result: $MACARCH" >&5
-+echo "${ECHO_T}$MACARCH" >&6; }
- else
--  MACARCH="current"; echo "$as_me:$LINENO: result: defaulting to $MACARCH" >&5
--echo "${ECHO_T}defaulting to $MACARCH" >&6
--fi;
-+  MACARCH="current"; { echo "$as_me:$LINENO: result: defaulting to $MACARCH" >&5
-+echo "${ECHO_T}defaulting to $MACARCH" >&6; }
-+fi
-+
- 
-   if test "x$MACARCH" = "xboth"; then
--    echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5
--echo $ECHO_N "checking for 10.4 universal SDK... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5
-+echo $ECHO_N "checking for 10.4 universal SDK... $ECHO_C" >&6; }
-                             save_cppflags="$CPPFLAGS"
-     save_cflags="$CFLAGS"
-     save_ldflags="$LDFLAGS"
-@@ -2905,38 +3464,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+	{ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 	CFLAGS="$save_cflags"
--	echo "$as_me:$LINENO: checking if Intel architecture is supported" >&5
--echo $ECHO_N "checking if Intel architecture is supported... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: checking if Intel architecture is supported" >&5
-+echo $ECHO_N "checking if Intel architecture is supported... $ECHO_C" >&6; }
- 	CPPFLAGS="$CPPFLAGS -arch i386"
- 	LDFLAGS="$save_ldflags -arch i386"
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -2955,43 +3510,41 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; MACARCH="intel"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; MACARCH="intel"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 		MACARCH="ppc"
- 		CPPFLAGS="$save_cppflags -arch ppc"
- 		LDFLAGS="$save_ldflags -arch ppc"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-   elif test "x$MACARCH" = "xintel"; then
-     CPPFLAGS="$CPPFLAGS -arch intel"
-@@ -3012,8 +3565,8 @@
-       CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon"
-     fi
- 
--                echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+                { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3037,35 +3590,31 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_header_stdc=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_header_stdc=no
-+	ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -3121,6 +3670,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* 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))
-@@ -3140,18 +3690,27 @@
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3164,12 +3723,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -3192,9 +3753,9 @@
- 		  inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -3208,38 +3769,35 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_Header=no"
-+	eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -3251,17 +3809,17 @@
- 
- 
- if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
--echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
-+echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
--echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
-+echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5
--echo $ECHO_N "checking Carbon/Carbon.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5
-+echo $ECHO_N "checking Carbon/Carbon.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -3272,41 +3830,37 @@
- #include <Carbon/Carbon.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking Carbon/Carbon.h presence" >&5
--echo $ECHO_N "checking Carbon/Carbon.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking Carbon/Carbon.h presence" >&5
-+echo $ECHO_N "checking Carbon/Carbon.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -3315,24 +3869,22 @@
- /* end confdefs.h.  */
- #include <Carbon/Carbon.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3340,9 +3892,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -3366,25 +3919,18 @@
- echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
--echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
-+echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_Carbon_Carbon_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
--echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
-+echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; }
- 
- fi
- if test $ac_cv_header_Carbon_Carbon_h = yes; then
-@@ -3404,8 +3950,8 @@
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- 
-@@ -3432,80 +3978,80 @@
-   fi
- fi
- 
--echo "$as_me:$LINENO: checking --with-vim-name argument" >&5
--echo $ECHO_N "checking --with-vim-name argument... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking --with-vim-name argument" >&5
-+echo $ECHO_N "checking --with-vim-name argument... $ECHO_C" >&6; }
- 
--# Check whether --with-vim-name or --without-vim-name was given.
-+# Check whether --with-vim-name was given.
- if test "${with_vim_name+set}" = set; then
--  withval="$with_vim_name"
--  VIMNAME="$withval"; echo "$as_me:$LINENO: result: $VIMNAME" >&5
--echo "${ECHO_T}$VIMNAME" >&6
-+  withval=$with_vim_name; VIMNAME="$withval"; { echo "$as_me:$LINENO: result: $VIMNAME" >&5
-+echo "${ECHO_T}$VIMNAME" >&6; }
- else
--  VIMNAME="vim"; echo "$as_me:$LINENO: result: Defaulting to $VIMNAME" >&5
--echo "${ECHO_T}Defaulting to $VIMNAME" >&6
--fi;
-+  VIMNAME="vim"; { echo "$as_me:$LINENO: result: Defaulting to $VIMNAME" >&5
-+echo "${ECHO_T}Defaulting to $VIMNAME" >&6; }
-+fi
-+
- 
--echo "$as_me:$LINENO: checking --with-ex-name argument" >&5
--echo $ECHO_N "checking --with-ex-name argument... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking --with-ex-name argument" >&5
-+echo $ECHO_N "checking --with-ex-name argument... $ECHO_C" >&6; }
- 
--# Check whether --with-ex-name or --without-ex-name was given.
-+# Check whether --with-ex-name was given.
- if test "${with_ex_name+set}" = set; then
--  withval="$with_ex_name"
--  EXNAME="$withval"; echo "$as_me:$LINENO: result: $EXNAME" >&5
--echo "${ECHO_T}$EXNAME" >&6
-+  withval=$with_ex_name; EXNAME="$withval"; { echo "$as_me:$LINENO: result: $EXNAME" >&5
-+echo "${ECHO_T}$EXNAME" >&6; }
- else
--  EXNAME="ex"; echo "$as_me:$LINENO: result: Defaulting to ex" >&5
--echo "${ECHO_T}Defaulting to ex" >&6
--fi;
-+  EXNAME="ex"; { echo "$as_me:$LINENO: result: Defaulting to ex" >&5
-+echo "${ECHO_T}Defaulting to ex" >&6; }
-+fi
- 
--echo "$as_me:$LINENO: checking --with-view-name argument" >&5
--echo $ECHO_N "checking --with-view-name argument... $ECHO_C" >&6
- 
--# Check whether --with-view-name or --without-view-name was given.
-+{ echo "$as_me:$LINENO: checking --with-view-name argument" >&5
-+echo $ECHO_N "checking --with-view-name argument... $ECHO_C" >&6; }
-+
-+# Check whether --with-view-name was given.
- if test "${with_view_name+set}" = set; then
--  withval="$with_view_name"
--  VIEWNAME="$withval"; echo "$as_me:$LINENO: result: $VIEWNAME" >&5
--echo "${ECHO_T}$VIEWNAME" >&6
-+  withval=$with_view_name; VIEWNAME="$withval"; { echo "$as_me:$LINENO: result: $VIEWNAME" >&5
-+echo "${ECHO_T}$VIEWNAME" >&6; }
- else
--  VIEWNAME="view"; echo "$as_me:$LINENO: result: Defaulting to view" >&5
--echo "${ECHO_T}Defaulting to view" >&6
--fi;
-+  VIEWNAME="view"; { echo "$as_me:$LINENO: result: Defaulting to view" >&5
-+echo "${ECHO_T}Defaulting to view" >&6; }
-+fi
-+
- 
- 
--echo "$as_me:$LINENO: checking --with-global-runtime argument" >&5
--echo $ECHO_N "checking --with-global-runtime argument... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking --with-global-runtime argument" >&5
-+echo $ECHO_N "checking --with-global-runtime argument... $ECHO_C" >&6; }
- 
--# Check whether --with-global-runtime or --without-global-runtime was given.
-+# Check whether --with-global-runtime was given.
- if test "${with_global_runtime+set}" = set; then
--  withval="$with_global_runtime"
--  echo "$as_me:$LINENO: result: $withval" >&5
--echo "${ECHO_T}$withval" >&6; cat >>confdefs.h <<_ACEOF
-+  withval=$with_global_runtime; { echo "$as_me:$LINENO: result: $withval" >&5
-+echo "${ECHO_T}$withval" >&6; }; cat >>confdefs.h <<_ACEOF
- #define RUNTIME_GLOBAL "$withval"
- _ACEOF
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi;
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
- 
--echo "$as_me:$LINENO: checking --with-modified-by argument" >&5
--echo $ECHO_N "checking --with-modified-by argument... $ECHO_C" >&6
- 
--# Check whether --with-modified-by or --without-modified-by was given.
-+{ echo "$as_me:$LINENO: checking --with-modified-by argument" >&5
-+echo $ECHO_N "checking --with-modified-by argument... $ECHO_C" >&6; }
-+
-+# Check whether --with-modified-by was given.
- if test "${with_modified_by+set}" = set; then
--  withval="$with_modified_by"
--  echo "$as_me:$LINENO: result: $withval" >&5
--echo "${ECHO_T}$withval" >&6; cat >>confdefs.h <<_ACEOF
-+  withval=$with_modified_by; { echo "$as_me:$LINENO: result: $withval" >&5
-+echo "${ECHO_T}$withval" >&6; }; cat >>confdefs.h <<_ACEOF
- #define MODIFIED_BY "$withval"
- _ACEOF
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi;
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
- 
--echo "$as_me:$LINENO: checking if character set is EBCDIC" >&5
--echo $ECHO_N "checking if character set is EBCDIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if character set is EBCDIC" >&5
-+echo $ECHO_N "checking if character set is EBCDIC... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -3528,41 +4074,37 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-    # TryCompile action if true
- cf_cv_ebcdic=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-- # TryCompile action if false
-+	 # TryCompile action if false
- cf_cv_ebcdic=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # end of TryCompile ])
- # end of CacheVal CvEbcdic
--echo "$as_me:$LINENO: result: $cf_cv_ebcdic" >&5
--echo "${ECHO_T}$cf_cv_ebcdic" >&6
-+{ echo "$as_me:$LINENO: result: $cf_cv_ebcdic" >&5
-+echo "${ECHO_T}$cf_cv_ebcdic" >&6; }
- case "$cf_cv_ebcdic" in  #(vi
-     yes)	cat >>confdefs.h <<\_ACEOF
- #define EBCDIC 1
-@@ -3575,8 +4117,8 @@
- 
- 
- if test "$cf_cv_ebcdic" = "yes"; then
--echo "$as_me:$LINENO: checking for OS/390 Unix" >&5
--echo $ECHO_N "checking for OS/390 Unix... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for OS/390 Unix" >&5
-+echo $ECHO_N "checking for OS/390 Unix... $ECHO_C" >&6; }
- case `uname` in
-     OS/390)	OS390Unix="yes";
- 										if test "$CC" = "cc"; then
-@@ -3741,109 +4283,109 @@
- _ACEOF
-  dovimdiff="installvimdiff";
- 			dogvimdiff="installgvimdiff" ;;
--  *)		echo "$as_me:$LINENO: result: Sorry, $features is not supported" >&5
--echo "${ECHO_T}Sorry, $features is not supported" >&6 ;;
-+  *)		{ echo "$as_me:$LINENO: result: Sorry, $features is not supported" >&5
-+echo "${ECHO_T}Sorry, $features is not supported" >&6; } ;;
- esac
- 
- 
- 
- 
--echo "$as_me:$LINENO: checking --with-compiledby argument" >&5
--echo $ECHO_N "checking --with-compiledby argument... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking --with-compiledby argument" >&5
-+echo $ECHO_N "checking --with-compiledby argument... $ECHO_C" >&6; }
- 
--# Check whether --with-compiledby or --without-compiledby was given.
-+# Check whether --with-compiledby was given.
- if test "${with_compiledby+set}" = set; then
--  withval="$with_compiledby"
--  compiledby="$withval"; echo "$as_me:$LINENO: result: $withval" >&5
--echo "${ECHO_T}$withval" >&6
-+  withval=$with_compiledby; compiledby="$withval"; { echo "$as_me:$LINENO: result: $withval" >&5
-+echo "${ECHO_T}$withval" >&6; }
- else
--  compiledby=""; echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi;
-+  compiledby=""; { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
- 
- 
--echo "$as_me:$LINENO: checking --disable-xsmp argument" >&5
--echo $ECHO_N "checking --disable-xsmp argument... $ECHO_C" >&6
--# Check whether --enable-xsmp or --disable-xsmp was given.
--if test "${enable_xsmp+set}" = set; then
--  enableval="$enable_xsmp"
- 
-+{ echo "$as_me:$LINENO: checking --disable-xsmp argument" >&5
-+echo $ECHO_N "checking --disable-xsmp argument... $ECHO_C" >&6; }
-+# Check whether --enable-xsmp was given.
-+if test "${enable_xsmp+set}" = set; then
-+  enableval=$enable_xsmp;
- else
-   enable_xsmp="yes"
--fi;
-+fi
-+
- 
- if test "$enable_xsmp" = "yes"; then
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--  echo "$as_me:$LINENO: checking --disable-xsmp-interact argument" >&5
--echo $ECHO_N "checking --disable-xsmp-interact argument... $ECHO_C" >&6
--  # Check whether --enable-xsmp-interact or --disable-xsmp-interact was given.
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+  { echo "$as_me:$LINENO: checking --disable-xsmp-interact argument" >&5
-+echo $ECHO_N "checking --disable-xsmp-interact argument... $ECHO_C" >&6; }
-+  # Check whether --enable-xsmp-interact was given.
- if test "${enable_xsmp_interact+set}" = set; then
--  enableval="$enable_xsmp_interact"
--
-+  enableval=$enable_xsmp_interact;
- else
-   enable_xsmp_interact="yes"
--fi;
-+fi
-+
-   if test "$enable_xsmp_interact" = "yes"; then
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-     cat >>confdefs.h <<\_ACEOF
- #define USE_XSMP_INTERACT 1
- _ACEOF
- 
-   else
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+    { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   fi
- else
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- fi
- 
--echo "$as_me:$LINENO: checking --enable-mzschemeinterp argument" >&5
--echo $ECHO_N "checking --enable-mzschemeinterp argument... $ECHO_C" >&6
--# Check whether --enable-mzschemeinterp or --disable-mzschemeinterp was given.
-+{ echo "$as_me:$LINENO: checking --enable-mzschemeinterp argument" >&5
-+echo $ECHO_N "checking --enable-mzschemeinterp argument... $ECHO_C" >&6; }
-+# Check whether --enable-mzschemeinterp was given.
- if test "${enable_mzschemeinterp+set}" = set; then
--  enableval="$enable_mzschemeinterp"
--
-+  enableval=$enable_mzschemeinterp;
- else
-   enable_mzschemeinterp="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_mzschemeinterp" >&5
--echo "${ECHO_T}$enable_mzschemeinterp" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $enable_mzschemeinterp" >&5
-+echo "${ECHO_T}$enable_mzschemeinterp" >&6; }
- 
- if test "$enable_mzschemeinterp" = "yes"; then
- 
- 
--  echo "$as_me:$LINENO: checking --with-plthome argument" >&5
--echo $ECHO_N "checking --with-plthome argument... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking --with-plthome argument" >&5
-+echo $ECHO_N "checking --with-plthome argument... $ECHO_C" >&6; }
- 
--# Check whether --with-plthome or --without-plthome was given.
-+# Check whether --with-plthome was given.
- if test "${with_plthome+set}" = set; then
--  withval="$with_plthome"
--  with_plthome="$withval"; echo "$as_me:$LINENO: result: $with_plthome" >&5
--echo "${ECHO_T}$with_plthome" >&6
-+  withval=$with_plthome; with_plthome="$withval"; { echo "$as_me:$LINENO: result: $with_plthome" >&5
-+echo "${ECHO_T}$with_plthome" >&6; }
- else
--  with_plthome="";echo "$as_me:$LINENO: result: \"no\"" >&5
--echo "${ECHO_T}\"no\"" >&6
--fi;
-+  with_plthome="";{ echo "$as_me:$LINENO: result: \"no\"" >&5
-+echo "${ECHO_T}\"no\"" >&6; }
-+fi
-+
- 
-   if test "X$with_plthome" != "X"; then
-        vi_cv_path_mzscheme_pfx="$with_plthome"
-   else
--    echo "$as_me:$LINENO: checking PLTHOME environment var" >&5
--echo $ECHO_N "checking PLTHOME environment var... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking PLTHOME environment var" >&5
-+echo $ECHO_N "checking PLTHOME environment var... $ECHO_C" >&6; }
-     if test "X$PLTHOME" != "X"; then
--	echo "$as_me:$LINENO: result: \"$PLTHOME\"" >&5
--echo "${ECHO_T}\"$PLTHOME\"" >&6
-+	{ echo "$as_me:$LINENO: result: \"$PLTHOME\"" >&5
-+echo "${ECHO_T}\"$PLTHOME\"" >&6; }
- 	vi_cv_path_mzscheme_pfx="$PLTHOME"
-     else
--	echo "$as_me:$LINENO: result: \"not set\"" >&5
--echo "${ECHO_T}\"not set\"" >&6
-+	{ echo "$as_me:$LINENO: result: \"not set\"" >&5
-+echo "${ECHO_T}\"not set\"" >&6; }
- 		# Extract the first word of "mzscheme", so it can be a program name with args.
- set dummy mzscheme; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_vi_cv_path_mzscheme+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3858,28 +4400,29 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_vi_cv_path_mzscheme="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- vi_cv_path_mzscheme=$ac_cv_path_vi_cv_path_mzscheme
--
- if test -n "$vi_cv_path_mzscheme"; then
--  echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme" >&5
--echo "${ECHO_T}$vi_cv_path_mzscheme" >&6
-+  { echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme" >&5
-+echo "${ECHO_T}$vi_cv_path_mzscheme" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- 
-+
- 			if test "X$vi_cv_path_mzscheme" != "X"; then
- 	  lsout=`ls -l $vi_cv_path_mzscheme`
- 	  if echo "$lsout" | grep -e '->' >/dev/null 2>/dev/null; then
-@@ -3888,8 +4431,8 @@
- 	fi
- 
- 	if test "X$vi_cv_path_mzscheme" != "X"; then
--	    	    echo "$as_me:$LINENO: checking MzScheme install prefix" >&5
--echo $ECHO_N "checking MzScheme install prefix... $ECHO_C" >&6
-+	    	    { echo "$as_me:$LINENO: checking MzScheme install prefix" >&5
-+echo $ECHO_N "checking MzScheme install prefix... $ECHO_C" >&6; }
- if test "${vi_cv_path_mzscheme_pfx+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3900,8 +4443,8 @@
- 		(lambda () (split-path (find-system-path (quote exec-file)))) \
- 		(lambda (base name must-be-dir?) base)) (quote up))))"`
- fi
--echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme_pfx" >&5
--echo "${ECHO_T}$vi_cv_path_mzscheme_pfx" >&6
-+{ echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme_pfx" >&5
-+echo "${ECHO_T}$vi_cv_path_mzscheme_pfx" >&6; }
- 	    	    vi_cv_path_mzscheme_pfx=`echo "$vi_cv_path_mzscheme_pfx" | sed 's+/$++'`
- 	fi
-     fi
-@@ -3909,23 +4452,23 @@
- 
-   SCHEME_INC=
-   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
--    echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5
--echo $ECHO_N "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5
-+echo $ECHO_N "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... $ECHO_C" >&6; }
-     if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then
--      echo "$as_me:$LINENO: result: \"yes\"" >&5
--echo "${ECHO_T}\"yes\"" >&6
-+      { echo "$as_me:$LINENO: result: \"yes\"" >&5
-+echo "${ECHO_T}\"yes\"" >&6; }
-     else
--      echo "$as_me:$LINENO: result: \"no\"" >&5
--echo "${ECHO_T}\"no\"" >&6
--      echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include" >&5
--echo $ECHO_N "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: result: \"no\"" >&5
-+echo "${ECHO_T}\"no\"" >&6; }
-+      { echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include" >&5
-+echo $ECHO_N "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include... $ECHO_C" >&6; }
-       if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then
--	echo "$as_me:$LINENO: result: \"yes\"" >&5
--echo "${ECHO_T}\"yes\"" >&6
-+	{ echo "$as_me:$LINENO: result: \"yes\"" >&5
-+echo "${ECHO_T}\"yes\"" >&6; }
- 	SCHEME_INC=/plt
-       else
--	echo "$as_me:$LINENO: result: \"no\"" >&5
--echo "${ECHO_T}\"no\"" >&6
-+	{ echo "$as_me:$LINENO: result: \"no\"" >&5
-+echo "${ECHO_T}\"no\"" >&6; }
- 	vi_cv_path_mzscheme_pfx=
-       fi
-     fi
-@@ -3966,23 +4509,23 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking --enable-perlinterp argument" >&5
--echo $ECHO_N "checking --enable-perlinterp argument... $ECHO_C" >&6
--# Check whether --enable-perlinterp or --disable-perlinterp was given.
-+{ echo "$as_me:$LINENO: checking --enable-perlinterp argument" >&5
-+echo $ECHO_N "checking --enable-perlinterp argument... $ECHO_C" >&6; }
-+# Check whether --enable-perlinterp was given.
- if test "${enable_perlinterp+set}" = set; then
--  enableval="$enable_perlinterp"
--
-+  enableval=$enable_perlinterp;
- else
-   enable_perlinterp="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_perlinterp" >&5
--echo "${ECHO_T}$enable_perlinterp" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $enable_perlinterp" >&5
-+echo "${ECHO_T}$enable_perlinterp" >&6; }
- if test "$enable_perlinterp" = "yes"; then
- 
-   # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_vi_cv_path_perl+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3997,30 +4540,31 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_vi_cv_path_perl="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- vi_cv_path_perl=$ac_cv_path_vi_cv_path_perl
--
- if test -n "$vi_cv_path_perl"; then
--  echo "$as_me:$LINENO: result: $vi_cv_path_perl" >&5
--echo "${ECHO_T}$vi_cv_path_perl" >&6
-+  { echo "$as_me:$LINENO: result: $vi_cv_path_perl" >&5
-+echo "${ECHO_T}$vi_cv_path_perl" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   if test "X$vi_cv_path_perl" != "X"; then
--    echo "$as_me:$LINENO: checking Perl version" >&5
--echo $ECHO_N "checking Perl version... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking Perl version" >&5
-+echo $ECHO_N "checking Perl version... $ECHO_C" >&6; }
-     if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then
-      eval `$vi_cv_path_perl -V:usethreads`
-      if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then
-@@ -4032,18 +4576,18 @@
- 	   badthreads=no
- 	 else
- 	   badthreads=yes
--	   echo "$as_me:$LINENO: result: >>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&5
--echo "${ECHO_T}>>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&6
-+	   { echo "$as_me:$LINENO: result: >>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&5
-+echo "${ECHO_T}>>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&6; }
- 	 fi
-        else
- 	 badthreads=yes
--	 echo "$as_me:$LINENO: result: >>> Perl 5.5 with threads cannot be used <<<" >&5
--echo "${ECHO_T}>>> Perl 5.5 with threads cannot be used <<<" >&6
-+	 { echo "$as_me:$LINENO: result: >>> Perl 5.5 with threads cannot be used <<<" >&5
-+echo "${ECHO_T}>>> Perl 5.5 with threads cannot be used <<<" >&6; }
-        fi
-      fi
-      if test $badthreads = no; then
--      echo "$as_me:$LINENO: result: OK" >&5
--echo "${ECHO_T}OK" >&6
-+      { echo "$as_me:$LINENO: result: OK" >&5
-+echo "${ECHO_T}OK" >&6; }
-       eval `$vi_cv_path_perl -V:shrpenv`
-       if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04
- 	shrpenv=""
-@@ -4058,8 +4602,8 @@
-                   perlldflags=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed \
- 		-e 'ccdlflags' | sed -e 's/-bE:perl.exp//'`
- 
--                  echo "$as_me:$LINENO: checking if compile and link flags for Perl are sane" >&5
--echo $ECHO_N "checking if compile and link flags for Perl are sane... $ECHO_C" >&6
-+                  { echo "$as_me:$LINENO: checking if compile and link flags for Perl are sane" >&5
-+echo $ECHO_N "checking if compile and link flags for Perl are sane... $ECHO_C" >&6; }
-       cflags_save=$CFLAGS
-       libs_save=$LIBS
-       ldflags_save=$LDFLAGS
-@@ -4082,37 +4626,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; perl_ok=yes
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; perl_ok=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no: PERL DISABLED" >&5
--echo "${ECHO_T}no: PERL DISABLED" >&6; perl_ok=no
-+	{ echo "$as_me:$LINENO: result: no: PERL DISABLED" >&5
-+echo "${ECHO_T}no: PERL DISABLED" >&6; }; perl_ok=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-       CFLAGS=$cflags_save
-       LIBS=$libs_save
-@@ -4135,8 +4676,8 @@
-       fi
-      fi
-     else
--      echo "$as_me:$LINENO: result: >>> too old; need Perl version 5.003_01 or later <<<" >&5
--echo "${ECHO_T}>>> too old; need Perl version 5.003_01 or later <<<" >&6
-+      { echo "$as_me:$LINENO: result: >>> too old; need Perl version 5.003_01 or later <<<" >&5
-+echo "${ECHO_T}>>> too old; need Perl version 5.003_01 or later <<<" >&6; }
-     fi
-   fi
- 
-@@ -4167,22 +4708,22 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking --enable-pythoninterp argument" >&5
--echo $ECHO_N "checking --enable-pythoninterp argument... $ECHO_C" >&6
--# Check whether --enable-pythoninterp or --disable-pythoninterp was given.
-+{ echo "$as_me:$LINENO: checking --enable-pythoninterp argument" >&5
-+echo $ECHO_N "checking --enable-pythoninterp argument... $ECHO_C" >&6; }
-+# Check whether --enable-pythoninterp was given.
- if test "${enable_pythoninterp+set}" = set; then
--  enableval="$enable_pythoninterp"
--
-+  enableval=$enable_pythoninterp;
- else
-   enable_pythoninterp="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_pythoninterp" >&5
--echo "${ECHO_T}$enable_pythoninterp" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $enable_pythoninterp" >&5
-+echo "${ECHO_T}$enable_pythoninterp" >&6; }
- if test "$enable_pythoninterp" = "yes"; then
-     # Extract the first word of "python", so it can be a program name with args.
- set dummy python; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_vi_cv_path_python+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4197,31 +4738,32 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_vi_cv_path_python="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- vi_cv_path_python=$ac_cv_path_vi_cv_path_python
--
- if test -n "$vi_cv_path_python"; then
--  echo "$as_me:$LINENO: result: $vi_cv_path_python" >&5
--echo "${ECHO_T}$vi_cv_path_python" >&6
-+  { echo "$as_me:$LINENO: result: $vi_cv_path_python" >&5
-+echo "${ECHO_T}$vi_cv_path_python" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   if test "X$vi_cv_path_python" != "X"; then
- 
--        echo "$as_me:$LINENO: checking Python version" >&5
--echo $ECHO_N "checking Python version... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: checking Python version" >&5
-+echo $ECHO_N "checking Python version... $ECHO_C" >&6; }
- if test "${vi_cv_var_python_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4229,19 +4771,19 @@
- 	    ${vi_cv_path_python} -c 'import sys; print sys.version[:3]'`
- 
- fi
--echo "$as_me:$LINENO: result: $vi_cv_var_python_version" >&5
--echo "${ECHO_T}$vi_cv_var_python_version" >&6
-+{ echo "$as_me:$LINENO: result: $vi_cv_var_python_version" >&5
-+echo "${ECHO_T}$vi_cv_var_python_version" >&6; }
- 
--        echo "$as_me:$LINENO: checking Python is 1.4 or better" >&5
--echo $ECHO_N "checking Python is 1.4 or better... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: checking Python is 1.4 or better" >&5
-+echo $ECHO_N "checking Python is 1.4 or better... $ECHO_C" >&6; }
-     if ${vi_cv_path_python} -c \
- 	"import sys; sys.exit(${vi_cv_var_python_version} < 1.4)"
-     then
--      echo "$as_me:$LINENO: result: yep" >&5
--echo "${ECHO_T}yep" >&6
-+      { echo "$as_me:$LINENO: result: yep" >&5
-+echo "${ECHO_T}yep" >&6; }
- 
--            echo "$as_me:$LINENO: checking Python's install prefix" >&5
--echo $ECHO_N "checking Python's install prefix... $ECHO_C" >&6
-+            { echo "$as_me:$LINENO: checking Python's install prefix" >&5
-+echo $ECHO_N "checking Python's install prefix... $ECHO_C" >&6; }
- if test "${vi_cv_path_python_pfx+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4249,11 +4791,11 @@
- 	    ${vi_cv_path_python} -c \
- 		"import sys; print sys.prefix"`
- fi
--echo "$as_me:$LINENO: result: $vi_cv_path_python_pfx" >&5
--echo "${ECHO_T}$vi_cv_path_python_pfx" >&6
-+{ echo "$as_me:$LINENO: result: $vi_cv_path_python_pfx" >&5
-+echo "${ECHO_T}$vi_cv_path_python_pfx" >&6; }
- 
--            echo "$as_me:$LINENO: checking Python's execution prefix" >&5
--echo $ECHO_N "checking Python's execution prefix... $ECHO_C" >&6
-+            { echo "$as_me:$LINENO: checking Python's execution prefix" >&5
-+echo $ECHO_N "checking Python's execution prefix... $ECHO_C" >&6; }
- if test "${vi_cv_path_python_epfx+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4261,8 +4803,8 @@
- 	    ${vi_cv_path_python} -c \
- 		"import sys; print sys.exec_prefix"`
- fi
--echo "$as_me:$LINENO: result: $vi_cv_path_python_epfx" >&5
--echo "${ECHO_T}$vi_cv_path_python_epfx" >&6
-+{ echo "$as_me:$LINENO: result: $vi_cv_path_python_epfx" >&5
-+echo "${ECHO_T}$vi_cv_path_python_epfx" >&6; }
- 
- 
-       if test "${vi_cv_path_pythonpath+set}" = set; then
-@@ -4277,14 +4819,14 @@
- 
- 
- 
--# Check whether --with-python-config-dir or --without-python-config-dir was given.
-+# Check whether --with-python-config-dir was given.
- if test "${with_python_config_dir+set}" = set; then
--  withval="$with_python_config_dir"
--   vi_cv_path_python_conf="${withval}"
--fi;
-+  withval=$with_python_config_dir;  vi_cv_path_python_conf="${withval}"
-+fi
- 
--      echo "$as_me:$LINENO: checking Python's configuration directory" >&5
--echo $ECHO_N "checking Python's configuration directory... $ECHO_C" >&6
-+
-+      { echo "$as_me:$LINENO: checking Python's configuration directory" >&5
-+echo $ECHO_N "checking Python's configuration directory... $ECHO_C" >&6; }
- if test "${vi_cv_path_python_conf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4300,14 +4842,14 @@
- 	done
- 
- fi
--echo "$as_me:$LINENO: result: $vi_cv_path_python_conf" >&5
--echo "${ECHO_T}$vi_cv_path_python_conf" >&6
-+{ echo "$as_me:$LINENO: result: $vi_cv_path_python_conf" >&5
-+echo "${ECHO_T}$vi_cv_path_python_conf" >&6; }
- 
-       PYTHON_CONFDIR="${vi_cv_path_python_conf}"
- 
-       if test "X$PYTHON_CONFDIR" = "X"; then
--	echo "$as_me:$LINENO: result: can't find it!" >&5
--echo "${ECHO_T}can't find it!" >&6
-+	{ echo "$as_me:$LINENO: result: can't find it!" >&5
-+echo "${ECHO_T}can't find it!" >&6; }
-       else
- 
- 			if test "${vi_cv_path_python_plibs+set}" = set; then
-@@ -4357,8 +4899,8 @@
- 	fi
- 	PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
- 
--								echo "$as_me:$LINENO: checking if -pthread should be used" >&5
--echo $ECHO_N "checking if -pthread should be used... $ECHO_C" >&6
-+								{ echo "$as_me:$LINENO: checking if -pthread should be used" >&5
-+echo $ECHO_N "checking if -pthread should be used... $ECHO_C" >&6; }
- 	threadsafe_flag=
- 	thread_lib=
- 	        if test "`(uname) 2>/dev/null`" != Darwin; then
-@@ -4389,47 +4931,44 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; LIBS=$libs_save_old
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }; LIBS=$libs_save_old
- 
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 	  CFLAGS=$cflags_save
- 	else
--	  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 	fi
- 
--			echo "$as_me:$LINENO: checking if compile and link flags for Python are sane" >&5
--echo $ECHO_N "checking if compile and link flags for Python are sane... $ECHO_C" >&6
-+			{ echo "$as_me:$LINENO: checking if compile and link flags for Python are sane" >&5
-+echo $ECHO_N "checking if compile and link flags for Python are sane... $ECHO_C" >&6; }
- 	cflags_save=$CFLAGS
- 	libs_save=$LIBS
- 	CFLAGS="$CFLAGS $PYTHON_CFLAGS"
-@@ -4450,37 +4989,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; python_ok=yes
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; python_ok=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no: PYTHON DISABLED" >&5
--echo "${ECHO_T}no: PYTHON DISABLED" >&6; python_ok=no
-+	{ echo "$as_me:$LINENO: result: no: PYTHON DISABLED" >&5
-+echo "${ECHO_T}no: PYTHON DISABLED" >&6; }; python_ok=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 	CFLAGS=$cflags_save
- 	LIBS=$libs_save
-@@ -4499,8 +5035,8 @@
- 
-       fi
-     else
--      echo "$as_me:$LINENO: result: too old" >&5
--echo "${ECHO_T}too old" >&6
-+      { echo "$as_me:$LINENO: result: too old" >&5
-+echo "${ECHO_T}too old" >&6; }
-     fi
-   fi
- fi
-@@ -4511,36 +5047,36 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking --enable-tclinterp argument" >&5
--echo $ECHO_N "checking --enable-tclinterp argument... $ECHO_C" >&6
--# Check whether --enable-tclinterp or --disable-tclinterp was given.
-+{ echo "$as_me:$LINENO: checking --enable-tclinterp argument" >&5
-+echo $ECHO_N "checking --enable-tclinterp argument... $ECHO_C" >&6; }
-+# Check whether --enable-tclinterp was given.
- if test "${enable_tclinterp+set}" = set; then
--  enableval="$enable_tclinterp"
--
-+  enableval=$enable_tclinterp;
- else
-   enable_tclinterp="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_tclinterp" >&5
--echo "${ECHO_T}$enable_tclinterp" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $enable_tclinterp" >&5
-+echo "${ECHO_T}$enable_tclinterp" >&6; }
- 
- if test "$enable_tclinterp" = "yes"; then
- 
--    echo "$as_me:$LINENO: checking --with-tclsh argument" >&5
--echo $ECHO_N "checking --with-tclsh argument... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking --with-tclsh argument" >&5
-+echo $ECHO_N "checking --with-tclsh argument... $ECHO_C" >&6; }
- 
--# Check whether --with-tclsh or --without-tclsh was given.
-+# Check whether --with-tclsh was given.
- if test "${with_tclsh+set}" = set; then
--  withval="$with_tclsh"
--  tclsh_name="$withval"; echo "$as_me:$LINENO: result: $tclsh_name" >&5
--echo "${ECHO_T}$tclsh_name" >&6
-+  withval=$with_tclsh; tclsh_name="$withval"; { echo "$as_me:$LINENO: result: $tclsh_name" >&5
-+echo "${ECHO_T}$tclsh_name" >&6; }
- else
--  tclsh_name="tclsh8.5"; echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi;
-+  tclsh_name="tclsh8.5"; { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-   # Extract the first word of "$tclsh_name", so it can be a program name with args.
- set dummy $tclsh_name; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4555,35 +5091,36 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl
--
- if test -n "$vi_cv_path_tcl"; then
--  echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
--echo "${ECHO_T}$vi_cv_path_tcl" >&6
-+  { echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
-+echo "${ECHO_T}$vi_cv_path_tcl" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- 
- 
-+
-     if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.5"; then
-     tclsh_name="tclsh8.4"
-     # Extract the first word of "$tclsh_name", so it can be a program name with args.
- set dummy $tclsh_name; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4598,34 +5135,35 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl
--
- if test -n "$vi_cv_path_tcl"; then
--  echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
--echo "${ECHO_T}$vi_cv_path_tcl" >&6
-+  { echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
-+echo "${ECHO_T}$vi_cv_path_tcl" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   fi
-   if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then
-     tclsh_name="tclsh8.2"
-     # Extract the first word of "$tclsh_name", so it can be a program name with args.
- set dummy $tclsh_name; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4640,34 +5178,35 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl
--
- if test -n "$vi_cv_path_tcl"; then
--  echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
--echo "${ECHO_T}$vi_cv_path_tcl" >&6
-+  { echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
-+echo "${ECHO_T}$vi_cv_path_tcl" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   fi
-   if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.2"; then
-     tclsh_name="tclsh8.0"
-     # Extract the first word of "$tclsh_name", so it can be a program name with args.
- set dummy $tclsh_name; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4682,34 +5221,35 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl
--
- if test -n "$vi_cv_path_tcl"; then
--  echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
--echo "${ECHO_T}$vi_cv_path_tcl" >&6
-+  { echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
-+echo "${ECHO_T}$vi_cv_path_tcl" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   fi
-     if test "X$vi_cv_path_tcl" = "X"; then
-     tclsh_name="tclsh"
-     # Extract the first word of "$tclsh_name", so it can be a program name with args.
- set dummy $tclsh_name; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4724,39 +5264,40 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl
--
- if test -n "$vi_cv_path_tcl"; then
--  echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
--echo "${ECHO_T}$vi_cv_path_tcl" >&6
-+  { echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
-+echo "${ECHO_T}$vi_cv_path_tcl" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   fi
-   if test "X$vi_cv_path_tcl" != "X"; then
--    echo "$as_me:$LINENO: checking Tcl version" >&5
--echo $ECHO_N "checking Tcl version... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking Tcl version" >&5
-+echo $ECHO_N "checking Tcl version... $ECHO_C" >&6; }
-     if echo 'exit [expr [info tclversion] < 8.0]' | $vi_cv_path_tcl - ; then
-       tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -`
--      echo "$as_me:$LINENO: result: $tclver - OK" >&5
--echo "${ECHO_T}$tclver - OK" >&6;
-+      { echo "$as_me:$LINENO: result: $tclver - OK" >&5
-+echo "${ECHO_T}$tclver - OK" >&6; };
-       tclloc=`echo 'set l [info library];set i [string last lib $l];incr i -2;puts [string range $l 0 $i]' | $vi_cv_path_tcl -`
- 
--      echo "$as_me:$LINENO: checking for location of Tcl include" >&5
--echo $ECHO_N "checking for location of Tcl include... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for location of Tcl include" >&5
-+echo $ECHO_N "checking for location of Tcl include... $ECHO_C" >&6; }
-       if test "x$MACOSX" != "xyes"; then
- 	tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/include /usr/include/tcl$tclver"
-       else
-@@ -4765,20 +5306,20 @@
-       TCL_INC=
-       for try in $tclinc; do
- 	if test -f "$try/tcl.h"; then
--	  echo "$as_me:$LINENO: result: $try/tcl.h" >&5
--echo "${ECHO_T}$try/tcl.h" >&6
-+	  { echo "$as_me:$LINENO: result: $try/tcl.h" >&5
-+echo "${ECHO_T}$try/tcl.h" >&6; }
- 	  TCL_INC=$try
- 	  break
- 	fi
-       done
-       if test -z "$TCL_INC"; then
--	echo "$as_me:$LINENO: result: <not found>" >&5
--echo "${ECHO_T}<not found>" >&6
-+	{ echo "$as_me:$LINENO: result: <not found>" >&5
-+echo "${ECHO_T}<not found>" >&6; }
- 	SKIP_TCL=YES
-       fi
-       if test -z "$SKIP_TCL"; then
--	echo "$as_me:$LINENO: checking for location of tclConfig.sh script" >&5
--echo $ECHO_N "checking for location of tclConfig.sh script... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: checking for location of tclConfig.sh script" >&5
-+echo $ECHO_N "checking for location of tclConfig.sh script... $ECHO_C" >&6; }
- 	if test "x$MACOSX" != "xyes"; then
- 	  tclcnf=`echo $tclinc | sed s/include/lib/g`
- 	  tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
-@@ -4787,8 +5328,8 @@
- 	fi
- 	for try in $tclcnf; do
- 	  if test -f $try/tclConfig.sh; then
--	    echo "$as_me:$LINENO: result: $try/tclConfig.sh" >&5
--echo "${ECHO_T}$try/tclConfig.sh" >&6
-+	    { echo "$as_me:$LINENO: result: $try/tclConfig.sh" >&5
-+echo "${ECHO_T}$try/tclConfig.sh" >&6; }
- 	    . $try/tclConfig.sh
- 	    	    TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
- 	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
-@@ -4796,10 +5337,10 @@
- 	  fi
- 	done
- 	if test -z "$TCL_LIBS"; then
--	  echo "$as_me:$LINENO: result: <not found>" >&5
--echo "${ECHO_T}<not found>" >&6
--	  echo "$as_me:$LINENO: checking for Tcl library by myself" >&5
--echo $ECHO_N "checking for Tcl library by myself... $ECHO_C" >&6
-+	  { echo "$as_me:$LINENO: result: <not found>" >&5
-+echo "${ECHO_T}<not found>" >&6; }
-+	  { echo "$as_me:$LINENO: checking for Tcl library by myself" >&5
-+echo $ECHO_N "checking for Tcl library by myself... $ECHO_C" >&6; }
- 	  tcllib=`echo $tclinc | sed s/include/lib/g`
- 	  tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`"
- 	  for ext in .so .a ; do
-@@ -4807,8 +5348,8 @@
- 	      for try in $tcllib ; do
- 		trylib=tcl$ver$ext
- 		if test -f $try/lib$trylib ; then
--		  echo "$as_me:$LINENO: result: $try/lib$trylib" >&5
--echo "${ECHO_T}$try/lib$trylib" >&6
-+		  { echo "$as_me:$LINENO: result: $try/lib$trylib" >&5
-+echo "${ECHO_T}$try/lib$trylib" >&6; }
- 		  TCL_LIBS="-L$try -ltcl$ver -ldl -lm"
- 		  if test "`(uname) 2>/dev/null`" = SunOS &&
- 					 uname -r | grep '^5' >/dev/null; then
-@@ -4820,8 +5361,8 @@
- 	    done
- 	  done
- 	  if test -z "$TCL_LIBS"; then
--	    echo "$as_me:$LINENO: result: <not found>" >&5
--echo "${ECHO_T}<not found>" >&6
-+	    { echo "$as_me:$LINENO: result: <not found>" >&5
-+echo "${ECHO_T}<not found>" >&6; }
- 	    SKIP_TCL=YES
- 	  fi
- 	fi
-@@ -4837,8 +5378,8 @@
- 	fi
-       fi
-     else
--      echo "$as_me:$LINENO: result: too old; need Tcl version 8.0 or later" >&5
--echo "${ECHO_T}too old; need Tcl version 8.0 or later" >&6
-+      { echo "$as_me:$LINENO: result: too old; need Tcl version 8.0 or later" >&5
-+echo "${ECHO_T}too old; need Tcl version 8.0 or later" >&6; }
-     fi
-   fi
- fi
-@@ -4848,23 +5389,23 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking --enable-rubyinterp argument" >&5
--echo $ECHO_N "checking --enable-rubyinterp argument... $ECHO_C" >&6
--# Check whether --enable-rubyinterp or --disable-rubyinterp was given.
-+{ echo "$as_me:$LINENO: checking --enable-rubyinterp argument" >&5
-+echo $ECHO_N "checking --enable-rubyinterp argument... $ECHO_C" >&6; }
-+# Check whether --enable-rubyinterp was given.
- if test "${enable_rubyinterp+set}" = set; then
--  enableval="$enable_rubyinterp"
--
-+  enableval=$enable_rubyinterp;
- else
-   enable_rubyinterp="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_rubyinterp" >&5
--echo "${ECHO_T}$enable_rubyinterp" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $enable_rubyinterp" >&5
-+echo "${ECHO_T}$enable_rubyinterp" >&6; }
- if test "$enable_rubyinterp" = "yes"; then
- 
-   # Extract the first word of "ruby", so it can be a program name with args.
- set dummy ruby; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_vi_cv_path_ruby+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4879,39 +5420,40 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_vi_cv_path_ruby="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- vi_cv_path_ruby=$ac_cv_path_vi_cv_path_ruby
--
- if test -n "$vi_cv_path_ruby"; then
--  echo "$as_me:$LINENO: result: $vi_cv_path_ruby" >&5
--echo "${ECHO_T}$vi_cv_path_ruby" >&6
-+  { echo "$as_me:$LINENO: result: $vi_cv_path_ruby" >&5
-+echo "${ECHO_T}$vi_cv_path_ruby" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   if test "X$vi_cv_path_ruby" != "X"; then
--    echo "$as_me:$LINENO: checking Ruby version" >&5
--echo $ECHO_N "checking Ruby version... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking Ruby version" >&5
-+echo $ECHO_N "checking Ruby version... $ECHO_C" >&6; }
-     if $vi_cv_path_ruby -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
--      echo "$as_me:$LINENO: result: OK" >&5
--echo "${ECHO_T}OK" >&6
--      echo "$as_me:$LINENO: checking Ruby header files" >&5
--echo $ECHO_N "checking Ruby header files... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: result: OK" >&5
-+echo "${ECHO_T}OK" >&6; }
-+      { echo "$as_me:$LINENO: checking Ruby header files" >&5
-+echo $ECHO_N "checking Ruby header files... $ECHO_C" >&6; }
-       rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null`
-       if test "X$rubyhdrdir" != "X"; then
--	echo "$as_me:$LINENO: result: $rubyhdrdir" >&5
--echo "${ECHO_T}$rubyhdrdir" >&6
-+	{ echo "$as_me:$LINENO: result: $rubyhdrdir" >&5
-+echo "${ECHO_T}$rubyhdrdir" >&6; }
- 	RUBY_CFLAGS="-I$rubyhdrdir"
- 	rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LIBS"]'`
- 	if test "X$rubylibs" != "X"; then
-@@ -4946,12 +5488,12 @@
- _ACEOF
- 
-       else
--	echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+	{ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-       fi
-     else
--      echo "$as_me:$LINENO: result: too old; need Ruby version 1.6.0 or later" >&5
--echo "${ECHO_T}too old; need Ruby version 1.6.0 or later" >&6
-+      { echo "$as_me:$LINENO: result: too old; need Ruby version 1.6.0 or later" >&5
-+echo "${ECHO_T}too old; need Ruby version 1.6.0 or later" >&6; }
-     fi
-   fi
- fi
-@@ -4961,17 +5503,17 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking --enable-cscope argument" >&5
--echo $ECHO_N "checking --enable-cscope argument... $ECHO_C" >&6
--# Check whether --enable-cscope or --disable-cscope was given.
-+{ echo "$as_me:$LINENO: checking --enable-cscope argument" >&5
-+echo $ECHO_N "checking --enable-cscope argument... $ECHO_C" >&6; }
-+# Check whether --enable-cscope was given.
- if test "${enable_cscope+set}" = set; then
--  enableval="$enable_cscope"
--
-+  enableval=$enable_cscope;
- else
-   enable_cscope="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_cscope" >&5
--echo "${ECHO_T}$enable_cscope" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $enable_cscope" >&5
-+echo "${ECHO_T}$enable_cscope" >&6; }
- if test "$enable_cscope" = "yes"; then
-   cat >>confdefs.h <<\_ACEOF
- #define FEAT_CSCOPE 1
-@@ -4979,17 +5521,17 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking --enable-workshop argument" >&5
--echo $ECHO_N "checking --enable-workshop argument... $ECHO_C" >&6
--# Check whether --enable-workshop or --disable-workshop was given.
-+{ echo "$as_me:$LINENO: checking --enable-workshop argument" >&5
-+echo $ECHO_N "checking --enable-workshop argument... $ECHO_C" >&6; }
-+# Check whether --enable-workshop was given.
- if test "${enable_workshop+set}" = set; then
--  enableval="$enable_workshop"
--
-+  enableval=$enable_workshop;
- else
-   enable_workshop="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_workshop" >&5
--echo "${ECHO_T}$enable_workshop" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $enable_workshop" >&5
-+echo "${ECHO_T}$enable_workshop" >&6; }
- if test "$enable_workshop" = "yes"; then
-   cat >>confdefs.h <<\_ACEOF
- #define FEAT_SUN_WORKSHOP 1
-@@ -5004,21 +5546,21 @@
-   fi
- fi
- 
--echo "$as_me:$LINENO: checking --disable-netbeans argument" >&5
--echo $ECHO_N "checking --disable-netbeans argument... $ECHO_C" >&6
--# Check whether --enable-netbeans or --disable-netbeans was given.
-+{ echo "$as_me:$LINENO: checking --disable-netbeans argument" >&5
-+echo $ECHO_N "checking --disable-netbeans argument... $ECHO_C" >&6; }
-+# Check whether --enable-netbeans was given.
- if test "${enable_netbeans+set}" = set; then
--  enableval="$enable_netbeans"
--
-+  enableval=$enable_netbeans;
- else
-   enable_netbeans="yes"
--fi;
-+fi
-+
- if test "$enable_netbeans" = "yes"; then
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
--echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
--echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_socket+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5031,56 +5573,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char socket ();
- int
- main ()
- {
--socket ();
-+return socket ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_socket_socket=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_socket_socket=no
-+	ac_cv_lib_socket_socket=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
- if test $ac_cv_lib_socket_socket = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSOCKET 1
-@@ -5091,8 +5630,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5105,56 +5644,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_nsl_gethostbyname=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_nsl_gethostbyname=no
-+	ac_cv_lib_nsl_gethostbyname=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNSL 1
-@@ -5164,8 +5700,8 @@
- 
- fi
- 
--  echo "$as_me:$LINENO: checking whether compiling netbeans integration is possible" >&5
--echo $ECHO_N "checking whether compiling netbeans integration is possible... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking whether compiling netbeans integration is possible" >&5
-+echo $ECHO_N "checking whether compiling netbeans integration is possible... $ECHO_C" >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5205,41 +5741,38 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; enable_netbeans="no"
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }; enable_netbeans="no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- else
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- fi
- if test "$enable_netbeans" = "yes"; then
-   cat >>confdefs.h <<\_ACEOF
-@@ -5252,17 +5785,17 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking --enable-sniff argument" >&5
--echo $ECHO_N "checking --enable-sniff argument... $ECHO_C" >&6
--# Check whether --enable-sniff or --disable-sniff was given.
-+{ echo "$as_me:$LINENO: checking --enable-sniff argument" >&5
-+echo $ECHO_N "checking --enable-sniff argument... $ECHO_C" >&6; }
-+# Check whether --enable-sniff was given.
- if test "${enable_sniff+set}" = set; then
--  enableval="$enable_sniff"
--
-+  enableval=$enable_sniff;
- else
-   enable_sniff="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_sniff" >&5
--echo "${ECHO_T}$enable_sniff" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $enable_sniff" >&5
-+echo "${ECHO_T}$enable_sniff" >&6; }
- if test "$enable_sniff" = "yes"; then
-   cat >>confdefs.h <<\_ACEOF
- #define FEAT_SNIFF 1
-@@ -5274,17 +5807,17 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking --enable-multibyte argument" >&5
--echo $ECHO_N "checking --enable-multibyte argument... $ECHO_C" >&6
--# Check whether --enable-multibyte or --disable-multibyte was given.
-+{ echo "$as_me:$LINENO: checking --enable-multibyte argument" >&5
-+echo $ECHO_N "checking --enable-multibyte argument... $ECHO_C" >&6; }
-+# Check whether --enable-multibyte was given.
- if test "${enable_multibyte+set}" = set; then
--  enableval="$enable_multibyte"
--
-+  enableval=$enable_multibyte;
- else
-   enable_multibyte="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_multibyte" >&5
--echo "${ECHO_T}$enable_multibyte" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $enable_multibyte" >&5
-+echo "${ECHO_T}$enable_multibyte" >&6; }
- if test "$enable_multibyte" = "yes"; then
-   cat >>confdefs.h <<\_ACEOF
- #define FEAT_MBYTE 1
-@@ -5292,53 +5825,53 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking --enable-hangulinput argument" >&5
--echo $ECHO_N "checking --enable-hangulinput argument... $ECHO_C" >&6
--# Check whether --enable-hangulinput or --disable-hangulinput was given.
-+{ echo "$as_me:$LINENO: checking --enable-hangulinput argument" >&5
-+echo $ECHO_N "checking --enable-hangulinput argument... $ECHO_C" >&6; }
-+# Check whether --enable-hangulinput was given.
- if test "${enable_hangulinput+set}" = set; then
--  enableval="$enable_hangulinput"
--
-+  enableval=$enable_hangulinput;
- else
-   enable_hangulinput="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_hangulinput" >&5
--echo "${ECHO_T}$enable_hangulinput" >&6
-+fi
- 
--echo "$as_me:$LINENO: checking --enable-xim argument" >&5
--echo $ECHO_N "checking --enable-xim argument... $ECHO_C" >&6
--# Check whether --enable-xim or --disable-xim was given.
-+{ echo "$as_me:$LINENO: result: $enable_hangulinput" >&5
-+echo "${ECHO_T}$enable_hangulinput" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking --enable-xim argument" >&5
-+echo $ECHO_N "checking --enable-xim argument... $ECHO_C" >&6; }
-+# Check whether --enable-xim was given.
- if test "${enable_xim+set}" = set; then
--  enableval="$enable_xim"
--  echo "$as_me:$LINENO: result: $enable_xim" >&5
--echo "${ECHO_T}$enable_xim" >&6
-+  enableval=$enable_xim; { echo "$as_me:$LINENO: result: $enable_xim" >&5
-+echo "${ECHO_T}$enable_xim" >&6; }
- else
--  enable_xim="auto"; echo "$as_me:$LINENO: result: defaulting to auto" >&5
--echo "${ECHO_T}defaulting to auto" >&6
--fi;
-+  enable_xim="auto"; { echo "$as_me:$LINENO: result: defaulting to auto" >&5
-+echo "${ECHO_T}defaulting to auto" >&6; }
-+fi
- 
--echo "$as_me:$LINENO: checking --enable-fontset argument" >&5
--echo $ECHO_N "checking --enable-fontset argument... $ECHO_C" >&6
--# Check whether --enable-fontset or --disable-fontset was given.
--if test "${enable_fontset+set}" = set; then
--  enableval="$enable_fontset"
- 
-+{ echo "$as_me:$LINENO: checking --enable-fontset argument" >&5
-+echo $ECHO_N "checking --enable-fontset argument... $ECHO_C" >&6; }
-+# Check whether --enable-fontset was given.
-+if test "${enable_fontset+set}" = set; then
-+  enableval=$enable_fontset;
- else
-   enable_fontset="no"
--fi;
--echo "$as_me:$LINENO: result: $enable_fontset" >&5
--echo "${ECHO_T}$enable_fontset" >&6
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $enable_fontset" >&5
-+echo "${ECHO_T}$enable_fontset" >&6; }
- 
- test -z "$with_x" && with_x=yes
- test "${enable_gui-yes}" != no -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && with_x=yes
- if test "$with_x" = no; then
--  echo "$as_me:$LINENO: result: defaulting to: don't HAVE_X11" >&5
--echo "${ECHO_T}defaulting to: don't HAVE_X11" >&6
-+  { echo "$as_me:$LINENO: result: defaulting to: don't HAVE_X11" >&5
-+echo "${ECHO_T}defaulting to: don't HAVE_X11" >&6; }
- else
- 
-   # Extract the first word of "xmkmf", so it can be a program name with args.
- set dummy xmkmf; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_xmkmfpath+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5353,66 +5886,72 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_xmkmfpath="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   ;;
- esac
- fi
- xmkmfpath=$ac_cv_path_xmkmfpath
--
- if test -n "$xmkmfpath"; then
--  echo "$as_me:$LINENO: result: $xmkmfpath" >&5
--echo "${ECHO_T}$xmkmfpath" >&6
-+  { echo "$as_me:$LINENO: result: $xmkmfpath" >&5
-+echo "${ECHO_T}$xmkmfpath" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- 
--  echo "$as_me:$LINENO: checking for X" >&5
--echo $ECHO_N "checking for X... $ECHO_C" >&6
-+
-+  { echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
- 
- 
--# Check whether --with-x or --without-x was given.
-+# Check whether --with-x was given.
- if test "${with_x+set}" = set; then
--  withval="$with_x"
-+  withval=$with_x;
-+fi
- 
--fi;
- # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
- if test "x$with_x" = xno; then
-   # The user explicitly disabled X.
-   have_x=disabled
- else
--  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
--    # Both variables are already set.
--    have_x=yes
--  else
--    if test "${ac_cv_have_x+set}" = set; then
-+  case $x_includes,$x_libraries in #(
-+    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
-+echo "$as_me: error: Cannot use X directory names containing '" >&2;}
-+   { (exit 1); exit 1; }; };; #(
-+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # One or both of the vars are not set, and there is no cached value.
- ac_x_includes=no ac_x_libraries=no
--rm -fr conftest.dir
-+rm -f -r conftest.dir
- if mkdir conftest.dir; then
-   cd conftest.dir
--  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-   cat >Imakefile <<'_ACEOF'
--acfindx:
--	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-+incroot:
-+	@echo incroot='${INCROOT}'
-+usrlibdir:
-+	@echo usrlibdir='${USRLIBDIR}'
-+libdir:
-+	@echo libdir='${LIBDIR}'
- _ACEOF
--  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-+  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-+    for ac_var in incroot usrlibdir libdir; do
-+      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-+    done
-     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-     for ac_extension in a so sl; do
--      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
--	 test -f $ac_im_libdir/libX11.$ac_extension; then
-+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-+	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
- 	ac_im_usrlibdir=$ac_im_libdir; break
-       fi
-     done
-@@ -5420,7 +5959,7 @@
-     # bogus both because they are the default anyway, and because
-     # using them would break gcc on systems where it needs fixed includes.
-     case $ac_im_incroot in
--	/usr/include) ;;
-+	/usr/include) ac_x_includes= ;;
- 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-     esac
-     case $ac_im_usrlibdir in
-@@ -5429,7 +5968,7 @@
-     esac
-   fi
-   cd ..
--  rm -fr conftest.dir
-+  rm -f -r conftest.dir
- fi
- 
- # Standard set of common directories for X headers.
-@@ -5470,7 +6009,7 @@
- /usr/openwin/share/include'
- 
- if test "$ac_x_includes" = no; then
--  # Guess where to find include files, by looking for Intrinsic.h.
-+  # Guess where to find include files, by looking for Xlib.h.
-   # First, try using that file with no special directory specified.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -5478,26 +6017,24 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <X11/Intrinsic.h>
-+#include <X11/Xlib.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
-@@ -5505,12 +6042,13 @@
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   for ac_dir in $ac_x_header_dirs; do
--  if test -r "$ac_dir/X11/Intrinsic.h"; then
-+  if test -r "$ac_dir/X11/Xlib.h"; then
-     ac_x_includes=$ac_dir
-     break
-   fi
- done
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi # $ac_x_includes = no
- 
-@@ -5519,44 +6057,40 @@
-   # See if we find them without any special options.
-   # Don't add to $LIBS permanently.
-   ac_save_LIBS=$LIBS
--  LIBS="-lXt $LIBS"
-+  LIBS="-lX11 $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <X11/Intrinsic.h>
-+#include <X11/Xlib.h>
- int
- main ()
- {
--XtMalloc (0)
-+XrmInitialize ()
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
-@@ -5564,49 +6098,54 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--LIBS=$ac_save_LIBS
-+	LIBS=$ac_save_LIBS
- for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
- do
-   # Don't even attempt the hair of trying to link an X program!
-   for ac_extension in a so sl; do
--    if test -r $ac_dir/libXt.$ac_extension; then
-+    if test -r "$ac_dir/libX11.$ac_extension"; then
-       ac_x_libraries=$ac_dir
-       break 2
-     fi
-   done
- done
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = no
- 
--if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
--  # Didn't find X anywhere.  Cache the known absence of X.
--  ac_cv_have_x="have_x=no"
--else
--  # Record where we found X for the cache.
--  ac_cv_have_x="have_x=yes \
--		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
--fi
-+case $ac_x_includes,$ac_x_libraries in #(
-+  no,* | *,no | *\'*)
-+    # Didn't find X, or a directory has "'" in its name.
-+    ac_cv_have_x="have_x=no";; #(
-+  *)
-+    # Record where we found X for the cache.
-+    ac_cv_have_x="have_x=yes\
-+	ac_x_includes='$ac_x_includes'\
-+	ac_x_libraries='$ac_x_libraries'"
-+esac
- fi
--
--  fi
-+;; #(
-+    *) have_x=yes;;
-+  esac
-   eval "$ac_cv_have_x"
- fi # $with_x != no
- 
- if test "$have_x" != yes; then
--  echo "$as_me:$LINENO: result: $have_x" >&5
--echo "${ECHO_T}$have_x" >&6
-+  { echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6; }
-   no_x=yes
- else
-   # If each of the values was on the command line, it overrides each guess.
-   test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-   # Update the cache value to reflect the command line values.
--  ac_cv_have_x="have_x=yes \
--		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
--  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
--echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
-+  ac_cv_have_x="have_x=yes\
-+	ac_x_includes='$x_includes'\
-+	ac_x_libraries='$x_libraries'"
-+  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
- fi
- 
- if test "$no_x" = yes; then
-@@ -5627,12 +6166,12 @@
-     X_LIBS="$X_LIBS -L$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
--    case `(uname -sr) 2>/dev/null` in
--    "SunOS 5"*)
--      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
--echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
--      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
--      cat >conftest.$ac_ext <<_ACEOF
-+    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
-+    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+    ac_xsave_c_werror_flag=$ac_c_werror_flag
-+    ac_c_werror_flag=yes
-+    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5648,43 +6187,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_R_nospace=yes
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+       X_LIBS="$X_LIBS -R$x_libraries"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_R_nospace=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--      if test $ac_R_nospace = yes; then
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--	X_LIBS="$X_LIBS -R$x_libraries"
--      else
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
--	cat >conftest.$ac_ext <<_ACEOF
-+       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -5700,47 +6228,42 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_R_space=yes
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	  X_LIBS="$X_LIBS -R $x_libraries"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_R_space=no
-+	{ echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
--	if test $ac_R_space = yes; then
--	  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--	  X_LIBS="$X_LIBS -R $x_libraries"
--	else
--	  echo "$as_me:$LINENO: result: neither works" >&5
--echo "${ECHO_T}neither works" >&6
--	fi
--      fi
--      LIBS=$ac_xsave_LIBS
--    esac
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    ac_c_werror_flag=$ac_xsave_c_werror_flag
-+    LIBS=$ac_xsave_LIBS
-   fi
- 
-   # Check for system-dependent libraries X programs must link with.
-@@ -5761,50 +6284,46 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char XOpenDisplay ();
- int
- main ()
- {
--XOpenDisplay ();
-+return XOpenDisplay ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5817,63 +6336,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dnet_ntoa ();
- int
- main ()
- {
--dnet_ntoa ();
-+return dnet_ntoa ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_dnet_dnet_ntoa=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dnet_dnet_ntoa=no
-+	ac_cv_lib_dnet_dnet_ntoa=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- fi
- 
-     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
--      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5886,63 +6402,61 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dnet_ntoa ();
- int
- main ()
- {
--dnet_ntoa ();
-+return dnet_ntoa ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_dnet_stub_dnet_ntoa=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dnet_stub_dnet_ntoa=no
-+	ac_cv_lib_dnet_stub_dnet_ntoa=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- fi
- 
-     fi
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     LIBS="$ac_xsave_LIBS"
- 
-@@ -5954,8 +6468,8 @@
-     # on Irix 5.2, according to T.E. Dickey.
-     # The functions gethostbyname, getservbyname, and inet_addr are
-     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
--    echo "$as_me:$LINENO: checking for gethostbyname" >&5
--echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
- if test "${ac_cv_func_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5982,72 +6496,63 @@
- 
- #undef gethostbyname
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char gethostbyname ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
-+#if defined __stub_gethostbyname || defined __stub___gethostbyname
- choke me
--#else
--char (*f) () = gethostbyname;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != gethostbyname;
-+return gethostbyname ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_gethostbyname=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_gethostbyname=no
-+	ac_cv_func_gethostbyname=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
- 
-     if test $ac_cv_func_gethostbyname = no; then
--      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6060,63 +6565,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_nsl_gethostbyname=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_nsl_gethostbyname=no
-+	ac_cv_lib_nsl_gethostbyname=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- fi
- 
-       if test $ac_cv_lib_nsl_gethostbyname = no; then
--	echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6129,56 +6631,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_bsd_gethostbyname=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_bsd_gethostbyname=no
-+	ac_cv_lib_bsd_gethostbyname=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
- if test $ac_cv_lib_bsd_gethostbyname = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
- fi
-@@ -6193,8 +6692,8 @@
-     # variants that don't use the name server (or something).  -lsocket
-     # must be given before -lnsl if both are needed.  We assume that
-     # if connect needs -lnsl, so does gethostbyname.
--    echo "$as_me:$LINENO: checking for connect" >&5
--echo $ECHO_N "checking for connect... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
- if test "${ac_cv_func_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6221,72 +6720,63 @@
- 
- #undef connect
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_connect) || defined (__stub___connect)
-+#if defined __stub_connect || defined __stub___connect
- choke me
--#else
--char (*f) () = connect;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != connect;
-+return connect ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_connect=no
-+	ac_cv_func_connect=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--echo "${ECHO_T}$ac_cv_func_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
- 
-     if test $ac_cv_func_connect = no; then
--      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6299,56 +6789,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char connect ();
- int
- main ()
- {
--connect ();
-+return connect ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_socket_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_socket_connect=no
-+	ac_cv_lib_socket_connect=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
-   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- fi
-@@ -6356,8 +6843,8 @@
-     fi
- 
-     # Guillermo Gomez says -lposix is necessary on A/UX.
--    echo "$as_me:$LINENO: checking for remove" >&5
--echo $ECHO_N "checking for remove... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for remove" >&5
-+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
- if test "${ac_cv_func_remove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6384,72 +6871,63 @@
- 
- #undef remove
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char remove ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_remove) || defined (__stub___remove)
-+#if defined __stub_remove || defined __stub___remove
- choke me
--#else
--char (*f) () = remove;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != remove;
-+return remove ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_remove=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_remove=no
-+	ac_cv_func_remove=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--echo "${ECHO_T}$ac_cv_func_remove" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
- 
-     if test $ac_cv_func_remove = no; then
--      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
- if test "${ac_cv_lib_posix_remove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6462,56 +6940,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char remove ();
- int
- main ()
- {
--remove ();
-+return remove ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_posix_remove=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_posix_remove=no
-+	ac_cv_lib_posix_remove=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
- if test $ac_cv_lib_posix_remove = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- fi
-@@ -6519,8 +6994,8 @@
-     fi
- 
-     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
--    echo "$as_me:$LINENO: checking for shmat" >&5
--echo $ECHO_N "checking for shmat... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for shmat" >&5
-+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
- if test "${ac_cv_func_shmat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6547,72 +7022,63 @@
- 
- #undef shmat
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shmat ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_shmat) || defined (__stub___shmat)
-+#if defined __stub_shmat || defined __stub___shmat
- choke me
--#else
--char (*f) () = shmat;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != shmat;
-+return shmat ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_func_shmat=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_shmat=no
-+	ac_cv_func_shmat=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
--echo "${ECHO_T}$ac_cv_func_shmat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
- 
-     if test $ac_cv_func_shmat = no; then
--      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6625,56 +7091,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shmat ();
- int
- main ()
- {
--shmat ();
-+return shmat ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_ipc_shmat=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_ipc_shmat=no
-+	ac_cv_lib_ipc_shmat=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
--echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
- if test $ac_cv_lib_ipc_shmat = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- fi
-@@ -6691,8 +7154,8 @@
-   # These have to be linked with before -lX11, unlike the other
-   # libraries we check for below, so use a different variable.
-   # John Interrante, Karl Berry
--  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6705,56 +7168,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char IceConnectionNumber ();
- int
- main ()
- {
--IceConnectionNumber ();
-+return IceConnectionNumber ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_ICE_IceConnectionNumber=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_ICE_IceConnectionNumber=no
-+	ac_cv_lib_ICE_IceConnectionNumber=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
--echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
- if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
- fi
-@@ -6773,8 +7233,8 @@
- 
-   if test -d "$x_includes" && test ! -d "$x_libraries"; then
-     x_libraries=`echo "$x_includes" | sed s/include/lib/`
--    echo "$as_me:$LINENO: result: Corrected X libraries to $x_libraries" >&5
--echo "${ECHO_T}Corrected X libraries to $x_libraries" >&6
-+    { echo "$as_me:$LINENO: result: Corrected X libraries to $x_libraries" >&5
-+echo "${ECHO_T}Corrected X libraries to $x_libraries" >&6; }
-     X_LIBS="$X_LIBS -L$x_libraries"
-     if test "`(uname) 2>/dev/null`" = SunOS &&
- 					 uname -r | grep '^5' >/dev/null; then
-@@ -6784,8 +7244,8 @@
- 
-   if test -d "$x_libraries" && test ! -d "$x_includes"; then
-     x_includes=`echo "$x_libraries" | sed s/lib/include/`
--    echo "$as_me:$LINENO: result: Corrected X includes to $x_includes" >&5
--echo "${ECHO_T}Corrected X includes to $x_includes" >&6
-+    { echo "$as_me:$LINENO: result: Corrected X includes to $x_includes" >&5
-+echo "${ECHO_T}Corrected X includes to $x_includes" >&6; }
-     X_CFLAGS="$X_CFLAGS -I$x_includes"
-   fi
- 
-@@ -6794,8 +7254,8 @@
-     X_LIBS="`echo $X_LIBS\  | sed -e 's%-R/usr/lib %%' -e 's%-R /usr/lib %%'`"
- 
- 
--      echo "$as_me:$LINENO: checking if X11 header files can be found" >&5
--echo $ECHO_N "checking if X11 header files can be found... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking if X11 header files can be found" >&5
-+echo $ECHO_N "checking if X11 header files can be found... $ECHO_C" >&6; }
-   cflags_save=$CFLAGS
-   CFLAGS="$CFLAGS $X_CFLAGS"
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -6814,37 +7274,33 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; no_x=yes
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }; no_x=yes
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   CFLAGS=$cflags_save
- 
-   if test "${no_x-no}" = yes; then
-@@ -6860,8 +7316,8 @@
-     ac_save_LDFLAGS="$LDFLAGS"
-     LDFLAGS="-L$x_libraries $LDFLAGS"
- 
--            echo "$as_me:$LINENO: checking for _XdmcpAuthDoIt in -lXdmcp" >&5
--echo $ECHO_N "checking for _XdmcpAuthDoIt in -lXdmcp... $ECHO_C" >&6
-+            { echo "$as_me:$LINENO: checking for _XdmcpAuthDoIt in -lXdmcp" >&5
-+echo $ECHO_N "checking for _XdmcpAuthDoIt in -lXdmcp... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Xdmcp__XdmcpAuthDoIt+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6874,63 +7330,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char _XdmcpAuthDoIt ();
- int
- main ()
- {
--_XdmcpAuthDoIt ();
-+return _XdmcpAuthDoIt ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_Xdmcp__XdmcpAuthDoIt=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xdmcp__XdmcpAuthDoIt=no
-+	ac_cv_lib_Xdmcp__XdmcpAuthDoIt=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
--echo "${ECHO_T}$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; }
- if test $ac_cv_lib_Xdmcp__XdmcpAuthDoIt = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp"
- fi
- 
- 
--                    echo "$as_me:$LINENO: checking for IceOpenConnection in -lICE" >&5
--echo $ECHO_N "checking for IceOpenConnection in -lICE... $ECHO_C" >&6
-+                    { echo "$as_me:$LINENO: checking for IceOpenConnection in -lICE" >&5
-+echo $ECHO_N "checking for IceOpenConnection in -lICE... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ICE_IceOpenConnection+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6943,64 +7396,61 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char IceOpenConnection ();
- int
- main ()
- {
--IceOpenConnection ();
-+return IceOpenConnection ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_ICE_IceOpenConnection=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_ICE_IceOpenConnection=no
-+	ac_cv_lib_ICE_IceOpenConnection=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
--echo "${ECHO_T}$ac_cv_lib_ICE_IceOpenConnection" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceOpenConnection" >&6; }
- if test $ac_cv_lib_ICE_IceOpenConnection = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE"
- fi
- 
- 
-         LDFLAGS="$X_LIBS $ac_save_LDFLAGS"
--    echo "$as_me:$LINENO: checking for XpmCreatePixmapFromData in -lXpm" >&5
--echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for XpmCreatePixmapFromData in -lXpm" >&5
-+echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromData+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7013,63 +7463,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char XpmCreatePixmapFromData ();
- int
- main ()
- {
--XpmCreatePixmapFromData ();
-+return XpmCreatePixmapFromData ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xpm_XpmCreatePixmapFromData=no
-+	ac_cv_lib_Xpm_XpmCreatePixmapFromData=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
--echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; }
- if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then
-   X_PRE_LIBS="$X_PRE_LIBS -lXpm"
- fi
- 
- 
--        echo "$as_me:$LINENO: checking if X11 header files implicitly declare return values" >&5
--echo $ECHO_N "checking if X11 header files implicitly declare return values... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: checking if X11 header files implicitly declare return values" >&5
-+echo $ECHO_N "checking if X11 header files implicitly declare return values... $ECHO_C" >&6; }
-     cflags_save=$CFLAGS
-     CFLAGS="$CFLAGS $X_CFLAGS -Werror"
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -7088,34 +7535,29 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--CFLAGS="$CFLAGS -Wno-implicit-int"
-+	CFLAGS="$CFLAGS -Wno-implicit-int"
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7132,41 +7574,38 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cflags_save="$cflags_save -Wno-implicit-int"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cflags_save="$cflags_save -Wno-implicit-int"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: test failed" >&5
--echo "${ECHO_T}test failed" >&6
-+	{ echo "$as_me:$LINENO: result: test failed" >&5
-+echo "${ECHO_T}test failed" >&6; }
- 
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     CFLAGS=$cflags_save
- 
-     LDFLAGS="$ac_save_LDFLAGS"
-@@ -7176,15 +7615,15 @@
- 
- test "x$with_x" = xno -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
- 
--echo "$as_me:$LINENO: checking --enable-gui argument" >&5
--echo $ECHO_N "checking --enable-gui argument... $ECHO_C" >&6
--# Check whether --enable-gui or --disable-gui was given.
-+{ echo "$as_me:$LINENO: checking --enable-gui argument" >&5
-+echo $ECHO_N "checking --enable-gui argument... $ECHO_C" >&6; }
-+# Check whether --enable-gui was given.
- if test "${enable_gui+set}" = set; then
--  enableval="$enable_gui"
--
-+  enableval=$enable_gui;
- else
-   enable_gui="auto"
--fi;
-+fi
-+
- 
- enable_gui_canon=`echo "_$enable_gui" | \
- 	sed 's/[ _+-]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-@@ -7202,44 +7641,44 @@
- if test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then
-   SKIP_PHOTON=
-   case "$enable_gui_canon" in
--    no)		echo "$as_me:$LINENO: result: no GUI support" >&5
--echo "${ECHO_T}no GUI support" >&6
-+    no)		{ echo "$as_me:$LINENO: result: no GUI support" >&5
-+echo "${ECHO_T}no GUI support" >&6; }
- 		SKIP_PHOTON=YES ;;
--    yes|"")	echo "$as_me:$LINENO: result: yes - automatic GUI support" >&5
--echo "${ECHO_T}yes - automatic GUI support" >&6 ;;
--    auto)	echo "$as_me:$LINENO: result: auto - automatic GUI support" >&5
--echo "${ECHO_T}auto - automatic GUI support" >&6 ;;
--    photon)	echo "$as_me:$LINENO: result: Photon GUI support" >&5
--echo "${ECHO_T}Photon GUI support" >&6 ;;
--    *)		echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5
--echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6
-+    yes|"")	{ echo "$as_me:$LINENO: result: yes - automatic GUI support" >&5
-+echo "${ECHO_T}yes - automatic GUI support" >&6; } ;;
-+    auto)	{ echo "$as_me:$LINENO: result: auto - automatic GUI support" >&5
-+echo "${ECHO_T}auto - automatic GUI support" >&6; } ;;
-+    photon)	{ echo "$as_me:$LINENO: result: Photon GUI support" >&5
-+echo "${ECHO_T}Photon GUI support" >&6; } ;;
-+    *)		{ echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5
-+echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6; }
- 		SKIP_PHOTON=YES ;;
-   esac
- 
- elif test "x$MACOSX" = "xyes" -a "x$with_x" = "xno" ; then
-   SKIP_CARBON=
-   case "$enable_gui_canon" in
--    no)		echo "$as_me:$LINENO: result: no GUI support" >&5
--echo "${ECHO_T}no GUI support" >&6
-+    no)		{ echo "$as_me:$LINENO: result: no GUI support" >&5
-+echo "${ECHO_T}no GUI support" >&6; }
- 		SKIP_CARBON=YES ;;
--    yes|"")	echo "$as_me:$LINENO: result: yes - automatic GUI support" >&5
--echo "${ECHO_T}yes - automatic GUI support" >&6 ;;
--    auto)	echo "$as_me:$LINENO: result: auto - automatic GUI support" >&5
--echo "${ECHO_T}auto - automatic GUI support" >&6 ;;
--    carbon)	echo "$as_me:$LINENO: result: Carbon GUI support" >&5
--echo "${ECHO_T}Carbon GUI support" >&6 ;;
--    *)		echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5
--echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6
-+    yes|"")	{ echo "$as_me:$LINENO: result: yes - automatic GUI support" >&5
-+echo "${ECHO_T}yes - automatic GUI support" >&6; } ;;
-+    auto)	{ echo "$as_me:$LINENO: result: auto - automatic GUI support" >&5
-+echo "${ECHO_T}auto - automatic GUI support" >&6; } ;;
-+    carbon)	{ echo "$as_me:$LINENO: result: Carbon GUI support" >&5
-+echo "${ECHO_T}Carbon GUI support" >&6; } ;;
-+    *)		{ echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5
-+echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6; }
- 		SKIP_CARBON=YES ;;
-   esac
- 
- else
- 
-   case "$enable_gui_canon" in
--    no|none)	echo "$as_me:$LINENO: result: no GUI support" >&5
--echo "${ECHO_T}no GUI support" >&6 ;;
--    yes|""|auto)	echo "$as_me:$LINENO: result: yes/auto - automatic GUI support" >&5
--echo "${ECHO_T}yes/auto - automatic GUI support" >&6
-+    no|none)	{ echo "$as_me:$LINENO: result: no GUI support" >&5
-+echo "${ECHO_T}no GUI support" >&6; } ;;
-+    yes|""|auto)	{ echo "$as_me:$LINENO: result: yes/auto - automatic GUI support" >&5
-+echo "${ECHO_T}yes/auto - automatic GUI support" >&6; }
- 		SKIP_GTK=
- 		SKIP_GTK2=
- 		SKIP_GNOME=
-@@ -7247,49 +7686,49 @@
- 		SKIP_ATHENA=
- 		SKIP_NEXTAW=
- 		SKIP_CARBON=;;
--    gtk)	echo "$as_me:$LINENO: result: GTK+ 1.x GUI support" >&5
--echo "${ECHO_T}GTK+ 1.x GUI support" >&6
-+    gtk)	{ echo "$as_me:$LINENO: result: GTK+ 1.x GUI support" >&5
-+echo "${ECHO_T}GTK+ 1.x GUI support" >&6; }
- 		SKIP_GTK=;;
--    gtk2)	echo "$as_me:$LINENO: result: GTK+ 2.x GUI support" >&5
--echo "${ECHO_T}GTK+ 2.x GUI support" >&6
-+    gtk2)	{ echo "$as_me:$LINENO: result: GTK+ 2.x GUI support" >&5
-+echo "${ECHO_T}GTK+ 2.x GUI support" >&6; }
- 		SKIP_GTK=
- 		SKIP_GTK2=;;
--    gnome)	echo "$as_me:$LINENO: result: GNOME 1.x GUI support" >&5
--echo "${ECHO_T}GNOME 1.x GUI support" >&6
-+    gnome)	{ echo "$as_me:$LINENO: result: GNOME 1.x GUI support" >&5
-+echo "${ECHO_T}GNOME 1.x GUI support" >&6; }
- 		SKIP_GNOME=
- 		SKIP_GTK=;;
--    gnome2)	echo "$as_me:$LINENO: result: GNOME 2.x GUI support" >&5
--echo "${ECHO_T}GNOME 2.x GUI support" >&6
-+    gnome2)	{ echo "$as_me:$LINENO: result: GNOME 2.x GUI support" >&5
-+echo "${ECHO_T}GNOME 2.x GUI support" >&6; }
- 		SKIP_GNOME=
- 		SKIP_GTK=
- 		SKIP_GTK2=;;
--    motif)	echo "$as_me:$LINENO: result: Motif GUI support" >&5
--echo "${ECHO_T}Motif GUI support" >&6
-+    motif)	{ echo "$as_me:$LINENO: result: Motif GUI support" >&5
-+echo "${ECHO_T}Motif GUI support" >&6; }
- 		SKIP_MOTIF=;;
--    athena)	echo "$as_me:$LINENO: result: Athena GUI support" >&5
--echo "${ECHO_T}Athena GUI support" >&6
-+    athena)	{ echo "$as_me:$LINENO: result: Athena GUI support" >&5
-+echo "${ECHO_T}Athena GUI support" >&6; }
- 		SKIP_ATHENA=;;
--    nextaw)	echo "$as_me:$LINENO: result: neXtaw GUI support" >&5
--echo "${ECHO_T}neXtaw GUI support" >&6
-+    nextaw)	{ echo "$as_me:$LINENO: result: neXtaw GUI support" >&5
-+echo "${ECHO_T}neXtaw GUI support" >&6; }
- 		SKIP_NEXTAW=;;
--    *)		echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5
--echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6 ;;
-+    *)		{ echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5
-+echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6; } ;;
-   esac
- 
- fi
- 
- if test "x$SKIP_GTK" != "xYES" -a "$enable_gui_canon" != "gtk" -a "$enable_gui_canon" != "gtk2"; then
--  echo "$as_me:$LINENO: checking whether or not to look for GTK" >&5
--echo $ECHO_N "checking whether or not to look for GTK... $ECHO_C" >&6
--  # Check whether --enable-gtk-check or --disable-gtk-check was given.
-+  { echo "$as_me:$LINENO: checking whether or not to look for GTK" >&5
-+echo $ECHO_N "checking whether or not to look for GTK... $ECHO_C" >&6; }
-+  # Check whether --enable-gtk-check was given.
- if test "${enable_gtk_check+set}" = set; then
--  enableval="$enable_gtk_check"
--
-+  enableval=$enable_gtk_check;
- else
-   enable_gtk_check="yes"
--fi;
--  echo "$as_me:$LINENO: result: $enable_gtk_check" >&5
--echo "${ECHO_T}$enable_gtk_check" >&6
-+fi
-+
-+  { echo "$as_me:$LINENO: result: $enable_gtk_check" >&5
-+echo "${ECHO_T}$enable_gtk_check" >&6; }
-   if test "x$enable_gtk_check" = "xno"; then
-     SKIP_GTK=YES
-     SKIP_GNOME=YES
-@@ -7298,17 +7737,17 @@
- 
- if test "x$SKIP_GTK2" != "xYES" -a "$enable_gui_canon" != "gtk2" \
- 				-a "$enable_gui_canon" != "gnome2"; then
--  echo "$as_me:$LINENO: checking whether or not to look for GTK+ 2" >&5
--echo $ECHO_N "checking whether or not to look for GTK+ 2... $ECHO_C" >&6
--  # Check whether --enable-gtk2-check or --disable-gtk2-check was given.
-+  { echo "$as_me:$LINENO: checking whether or not to look for GTK+ 2" >&5
-+echo $ECHO_N "checking whether or not to look for GTK+ 2... $ECHO_C" >&6; }
-+  # Check whether --enable-gtk2-check was given.
- if test "${enable_gtk2_check+set}" = set; then
--  enableval="$enable_gtk2_check"
--
-+  enableval=$enable_gtk2_check;
- else
-   enable_gtk2_check="yes"
--fi;
--  echo "$as_me:$LINENO: result: $enable_gtk2_check" >&5
--echo "${ECHO_T}$enable_gtk2_check" >&6
-+fi
-+
-+  { echo "$as_me:$LINENO: result: $enable_gtk2_check" >&5
-+echo "${ECHO_T}$enable_gtk2_check" >&6; }
-   if test "x$enable_gtk2_check" = "xno"; then
-     SKIP_GTK2=YES
-   fi
-@@ -7316,85 +7755,85 @@
- 
- if test "x$SKIP_GNOME" != "xYES" -a "$enable_gui_canon" != "gnome" \
- 				 -a "$enable_gui_canon" != "gnome2"; then
--  echo "$as_me:$LINENO: checking whether or not to look for GNOME" >&5
--echo $ECHO_N "checking whether or not to look for GNOME... $ECHO_C" >&6
--  # Check whether --enable-gnome-check or --disable-gnome-check was given.
-+  { echo "$as_me:$LINENO: checking whether or not to look for GNOME" >&5
-+echo $ECHO_N "checking whether or not to look for GNOME... $ECHO_C" >&6; }
-+  # Check whether --enable-gnome-check was given.
- if test "${enable_gnome_check+set}" = set; then
--  enableval="$enable_gnome_check"
--
-+  enableval=$enable_gnome_check;
- else
-   enable_gnome_check="no"
--fi;
--  echo "$as_me:$LINENO: result: $enable_gnome_check" >&5
--echo "${ECHO_T}$enable_gnome_check" >&6
-+fi
-+
-+  { echo "$as_me:$LINENO: result: $enable_gnome_check" >&5
-+echo "${ECHO_T}$enable_gnome_check" >&6; }
-   if test "x$enable_gnome_check" = "xno"; then
-     SKIP_GNOME=YES
-   fi
- fi
- 
- if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then
--  echo "$as_me:$LINENO: checking whether or not to look for Motif" >&5
--echo $ECHO_N "checking whether or not to look for Motif... $ECHO_C" >&6
--  # Check whether --enable-motif-check or --disable-motif-check was given.
-+  { echo "$as_me:$LINENO: checking whether or not to look for Motif" >&5
-+echo $ECHO_N "checking whether or not to look for Motif... $ECHO_C" >&6; }
-+  # Check whether --enable-motif-check was given.
- if test "${enable_motif_check+set}" = set; then
--  enableval="$enable_motif_check"
--
-+  enableval=$enable_motif_check;
- else
-   enable_motif_check="yes"
--fi;
--  echo "$as_me:$LINENO: result: $enable_motif_check" >&5
--echo "${ECHO_T}$enable_motif_check" >&6
-+fi
-+
-+  { echo "$as_me:$LINENO: result: $enable_motif_check" >&5
-+echo "${ECHO_T}$enable_motif_check" >&6; }
-   if test "x$enable_motif_check" = "xno"; then
-     SKIP_MOTIF=YES
-   fi
- fi
- 
- if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then
--  echo "$as_me:$LINENO: checking whether or not to look for Athena" >&5
--echo $ECHO_N "checking whether or not to look for Athena... $ECHO_C" >&6
--  # Check whether --enable-athena-check or --disable-athena-check was given.
-+  { echo "$as_me:$LINENO: checking whether or not to look for Athena" >&5
-+echo $ECHO_N "checking whether or not to look for Athena... $ECHO_C" >&6; }
-+  # Check whether --enable-athena-check was given.
- if test "${enable_athena_check+set}" = set; then
--  enableval="$enable_athena_check"
--
-+  enableval=$enable_athena_check;
- else
-   enable_athena_check="yes"
--fi;
--  echo "$as_me:$LINENO: result: $enable_athena_check" >&5
--echo "${ECHO_T}$enable_athena_check" >&6
-+fi
-+
-+  { echo "$as_me:$LINENO: result: $enable_athena_check" >&5
-+echo "${ECHO_T}$enable_athena_check" >&6; }
-   if test "x$enable_athena_check" = "xno"; then
-     SKIP_ATHENA=YES
-   fi
- fi
- 
- if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then
--  echo "$as_me:$LINENO: checking whether or not to look for neXtaw" >&5
--echo $ECHO_N "checking whether or not to look for neXtaw... $ECHO_C" >&6
--  # Check whether --enable-nextaw-check or --disable-nextaw-check was given.
-+  { echo "$as_me:$LINENO: checking whether or not to look for neXtaw" >&5
-+echo $ECHO_N "checking whether or not to look for neXtaw... $ECHO_C" >&6; }
-+  # Check whether --enable-nextaw-check was given.
- if test "${enable_nextaw_check+set}" = set; then
--  enableval="$enable_nextaw_check"
--
-+  enableval=$enable_nextaw_check;
- else
-   enable_nextaw_check="yes"
--fi;
--  echo "$as_me:$LINENO: result: $enable_nextaw_check" >&5
--echo "${ECHO_T}$enable_nextaw_check" >&6;
-+fi
-+
-+  { echo "$as_me:$LINENO: result: $enable_nextaw_check" >&5
-+echo "${ECHO_T}$enable_nextaw_check" >&6; };
-   if test "x$enable_nextaw_check" = "xno"; then
-     SKIP_NEXTAW=YES
-   fi
- fi
- 
- if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then
--  echo "$as_me:$LINENO: checking whether or not to look for Carbon" >&5
--echo $ECHO_N "checking whether or not to look for Carbon... $ECHO_C" >&6
--  # Check whether --enable-carbon-check or --disable-carbon-check was given.
-+  { echo "$as_me:$LINENO: checking whether or not to look for Carbon" >&5
-+echo $ECHO_N "checking whether or not to look for Carbon... $ECHO_C" >&6; }
-+  # Check whether --enable-carbon-check was given.
- if test "${enable_carbon_check+set}" = set; then
--  enableval="$enable_carbon_check"
--
-+  enableval=$enable_carbon_check;
- else
-   enable_carbon_check="yes"
--fi;
--  echo "$as_me:$LINENO: result: $enable_carbon_check" >&5
--echo "${ECHO_T}$enable_carbon_check" >&6;
-+fi
-+
-+  { echo "$as_me:$LINENO: result: $enable_carbon_check" >&5
-+echo "${ECHO_T}$enable_carbon_check" >&6; };
-   if test "x$enable_carbon_check" = "xno"; then
-     SKIP_CARBON=YES
-   fi
-@@ -7402,10 +7841,10 @@
- 
- 
- if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then
--  echo "$as_me:$LINENO: checking for Carbon GUI" >&5
--echo $ECHO_N "checking for Carbon GUI... $ECHO_C" >&6
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6;
-+  { echo "$as_me:$LINENO: checking for Carbon GUI" >&5
-+echo $ECHO_N "checking for Carbon GUI... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; };
-   GUITYPE=CARBONGUI
-   if test "$VIMNAME" = "vim"; then
-     VIMNAME=Vim
-@@ -7437,47 +7876,47 @@
- 
- if test -z "$SKIP_GTK"; then
- 
--  echo "$as_me:$LINENO: checking --with-gtk-prefix argument" >&5
--echo $ECHO_N "checking --with-gtk-prefix argument... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking --with-gtk-prefix argument" >&5
-+echo $ECHO_N "checking --with-gtk-prefix argument... $ECHO_C" >&6; }
- 
--# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
-+# Check whether --with-gtk-prefix was given.
- if test "${with_gtk_prefix+set}" = set; then
--  withval="$with_gtk_prefix"
--  gtk_config_prefix="$withval"; echo "$as_me:$LINENO: result: $gtk_config_prefix" >&5
--echo "${ECHO_T}$gtk_config_prefix" >&6
-+  withval=$with_gtk_prefix; gtk_config_prefix="$withval"; { echo "$as_me:$LINENO: result: $gtk_config_prefix" >&5
-+echo "${ECHO_T}$gtk_config_prefix" >&6; }
- else
--  gtk_config_prefix=""; echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi;
-+  gtk_config_prefix=""; { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
- 
--  echo "$as_me:$LINENO: checking --with-gtk-exec-prefix argument" >&5
--echo $ECHO_N "checking --with-gtk-exec-prefix argument... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking --with-gtk-exec-prefix argument" >&5
-+echo $ECHO_N "checking --with-gtk-exec-prefix argument... $ECHO_C" >&6; }
- 
--# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
-+# Check whether --with-gtk-exec-prefix was given.
- if test "${with_gtk_exec_prefix+set}" = set; then
--  withval="$with_gtk_exec_prefix"
--  gtk_config_exec_prefix="$withval"; echo "$as_me:$LINENO: result: $gtk_config_prefix" >&5
--echo "${ECHO_T}$gtk_config_prefix" >&6
-+  withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"; { echo "$as_me:$LINENO: result: $gtk_config_prefix" >&5
-+echo "${ECHO_T}$gtk_config_prefix" >&6; }
- else
--  gtk_config_exec_prefix=""; echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi;
-+  gtk_config_exec_prefix=""; { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
- 
--  echo "$as_me:$LINENO: checking --disable-gtktest argument" >&5
--echo $ECHO_N "checking --disable-gtktest argument... $ECHO_C" >&6
--  # Check whether --enable-gtktest or --disable-gtktest was given.
--if test "${enable_gtktest+set}" = set; then
--  enableval="$enable_gtktest"
- 
-+  { echo "$as_me:$LINENO: checking --disable-gtktest argument" >&5
-+echo $ECHO_N "checking --disable-gtktest argument... $ECHO_C" >&6; }
-+  # Check whether --enable-gtktest was given.
-+if test "${enable_gtktest+set}" = set; then
-+  enableval=$enable_gtktest;
- else
-   enable_gtktest=yes
--fi;
-+fi
-+
-   if test "x$enable_gtktest" = "xyes" ; then
--    echo "$as_me:$LINENO: result: gtk test enabled" >&5
--echo "${ECHO_T}gtk test enabled" >&6
-+    { echo "$as_me:$LINENO: result: gtk test enabled" >&5
-+echo "${ECHO_T}gtk test enabled" >&6; }
-   else
--    echo "$as_me:$LINENO: result: gtk test disabled" >&5
--echo "${ECHO_T}gtk test disabled" >&6
-+    { echo "$as_me:$LINENO: result: gtk test disabled" >&5
-+echo "${ECHO_T}gtk test disabled" >&6; }
-   fi
- 
-   if test "x$gtk_config_prefix" != "x" ; then
-@@ -7491,8 +7930,8 @@
-   if test "X$GTK_CONFIG" = "X"; then
-     # Extract the first word of "gtk-config", so it can be a program name with args.
- set dummy gtk-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7507,33 +7946,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
-   ;;
- esac
- fi
- GTK_CONFIG=$ac_cv_path_GTK_CONFIG
--
- if test -n "$GTK_CONFIG"; then
--  echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
--echo "${ECHO_T}$GTK_CONFIG" >&6
-+  { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5
-+echo "${ECHO_T}$GTK_CONFIG" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     if test "X$GTK_CONFIG" = "Xno"; then
-             # Extract the first word of "gtk12-config", so it can be a program name with args.
- set dummy gtk12-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GTK12_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7548,39 +7988,40 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_GTK12_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_GTK12_CONFIG" && ac_cv_path_GTK12_CONFIG="no"
-   ;;
- esac
- fi
- GTK12_CONFIG=$ac_cv_path_GTK12_CONFIG
--
- if test -n "$GTK12_CONFIG"; then
--  echo "$as_me:$LINENO: result: $GTK12_CONFIG" >&5
--echo "${ECHO_T}$GTK12_CONFIG" >&6
-+  { echo "$as_me:$LINENO: result: $GTK12_CONFIG" >&5
-+echo "${ECHO_T}$GTK12_CONFIG" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-       GTK_CONFIG="$GTK12_CONFIG"
-     fi
-   else
--    echo "$as_me:$LINENO: result: Using GTK configuration program $GTK_CONFIG" >&5
--echo "${ECHO_T}Using GTK configuration program $GTK_CONFIG" >&6
-+    { echo "$as_me:$LINENO: result: Using GTK configuration program $GTK_CONFIG" >&5
-+echo "${ECHO_T}Using GTK configuration program $GTK_CONFIG" >&6; }
-   fi
-   if test "X$PKG_CONFIG" = "X"; then
-     # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7595,28 +8036,29 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-   ;;
- esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
- if test -n "$PKG_CONFIG"; then
--  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   fi
- 
-   if test "x$GTK_CONFIG:$PKG_CONFIG" != "xno:no"; then
-@@ -7625,8 +8067,8 @@
-   if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
-   {
-     min_gtk_version=2.2.0
--    echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
--echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
-     no_gtk=""
-     if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
- 	  && $PKG_CONFIG --exists gtk+-2.0; then
-@@ -7705,13 +8147,22 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7724,27 +8175,29 @@
- ( exit $ac_status )
- no_gtk=yes
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     }
-     fi
-     if test "x$no_gtk" = x ; then
-       if test "x$enable_gtktest" = "xyes"; then
--	echo "$as_me:$LINENO: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5
--echo "${ECHO_T}yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6
-+	{ echo "$as_me:$LINENO: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5
-+echo "${ECHO_T}yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; }
-       else
--	echo "$as_me:$LINENO: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5
--echo "${ECHO_T}found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6
-+	{ echo "$as_me:$LINENO: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5
-+echo "${ECHO_T}found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; }
-       fi
-       GUI_LIB_LOC="$GTK_LIBDIR"
- 		   GTK_LIBNAME="$GTK_LIBS"
- 		  GUI_INC_LOC="$GTK_CFLAGS"
-     else
-     {
--      echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+      { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-       GTK_CFLAGS=""
-       GTK_LIBS=""
-       :
-@@ -7775,8 +8228,8 @@
-   if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then
-   {
-     min_gtk_version=1.1.16
--    echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
--echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5
-+echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; }
-     no_gtk=""
-     if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
- 	  && $PKG_CONFIG --exists gtk+-2.0; then
-@@ -7855,13 +8308,22 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7874,26 +8336,28 @@
- ( exit $ac_status )
- no_gtk=yes
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     }
-     fi
-     if test "x$no_gtk" = x ; then
-       if test "x$enable_gtktest" = "xyes"; then
--	echo "$as_me:$LINENO: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5
--echo "${ECHO_T}yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6
-+	{ echo "$as_me:$LINENO: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5
-+echo "${ECHO_T}yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; }
-       else
--	echo "$as_me:$LINENO: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5
--echo "${ECHO_T}found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6
-+	{ echo "$as_me:$LINENO: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5
-+echo "${ECHO_T}found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; }
-       fi
-       GTK_LIBNAME="$GTK_LIBS"
- 		  GUI_INC_LOC="$GTK_CFLAGS"
-     else
-     {
--      echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+      { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-       GTK_CFLAGS=""
-       GTK_LIBS=""
-       :
-@@ -7921,8 +8385,8 @@
-     if test "x$GUITYPE" = "xGTK"; then
-     if test "$gtk_major_version" = 1 -a "0$gtk_minor_version" -lt 2 \
- 	 -o "$gtk_major_version" = 1 -a "$gtk_minor_version" = 2 -a "0$gtk_micro_version" -lt 3; then
--      echo "$as_me:$LINENO: result: this GTK version is old; version 1.2.3 or later is recommended" >&5
--echo "${ECHO_T}this GTK version is old; version 1.2.3 or later is recommended" >&6
-+      { echo "$as_me:$LINENO: result: this GTK version is old; version 1.2.3 or later is recommended" >&5
-+echo "${ECHO_T}this GTK version is old; version 1.2.3 or later is recommended" >&6; }
-     else
-     {
-       if test "0$gtk_major_version" -ge 2; then
-@@ -7947,26 +8411,25 @@
- 
- 
- 
--# Check whether --with-gnome-includes or --without-gnome-includes was given.
-+# Check whether --with-gnome-includes was given.
- if test "${with_gnome_includes+set}" = set; then
--  withval="$with_gnome_includes"
--  CFLAGS="$CFLAGS -I$withval"
-+  withval=$with_gnome_includes; CFLAGS="$CFLAGS -I$withval"
- 
--fi;
-+fi
- 
- 
--# Check whether --with-gnome-libs or --without-gnome-libs was given.
-+
-+# Check whether --with-gnome-libs was given.
- if test "${with_gnome_libs+set}" = set; then
--  withval="$with_gnome_libs"
--  LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval
-+  withval=$with_gnome_libs; LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval
-+
-+fi
- 
--fi;
- 
- 
--# Check whether --with-gnome or --without-gnome was given.
-+# Check whether --with-gnome was given.
- if test "${with_gnome+set}" = set; then
--  withval="$with_gnome"
--  if test x$withval = xyes; then
-+  withval=$with_gnome; if test x$withval = xyes; then
-       want_gnome=yes
-       have_gnome=yes
-     else
-@@ -7981,34 +8444,35 @@
-     fi
- else
-   want_gnome=yes
--fi;
-+fi
-+
- 
-   if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then
-   {
--    echo "$as_me:$LINENO: checking for libgnomeui-2.0" >&5
--echo $ECHO_N "checking for libgnomeui-2.0... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for libgnomeui-2.0" >&5
-+echo $ECHO_N "checking for libgnomeui-2.0... $ECHO_C" >&6; }
-     if $PKG_CONFIG --exists libgnomeui-2.0; then
--      echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+      { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-       GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`
-       GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0`
-       GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0`
- 
--                  echo "$as_me:$LINENO: checking for FreeBSD" >&5
--echo $ECHO_N "checking for FreeBSD... $ECHO_C" >&6
-+                  { echo "$as_me:$LINENO: checking for FreeBSD" >&5
-+echo $ECHO_N "checking for FreeBSD... $ECHO_C" >&6; }
-       if test "`(uname) 2>/dev/null`" = FreeBSD; then
--	echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 	GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE"
- 	GNOME_LIBS="$GNOME_LIBS -pthread"
-       else
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-       fi
-       have_gnome=yes
-     else
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-       if test "x" = xfail; then
- 	{ { echo "$as_me:$LINENO: error: Could not find libgnomeui-2.0 via pkg-config" >&5
- echo "$as_me: error: Could not find libgnomeui-2.0 via pkg-config" >&2;}
-@@ -8020,8 +8484,8 @@
-   {
-     # Extract the first word of "gnome-config", so it can be a program name with args.
- set dummy gnome-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GNOME_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8036,43 +8500,44 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_GNOME_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no"
-   ;;
- esac
- fi
- GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG
--
- if test -n "$GNOME_CONFIG"; then
--  echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5
--echo "${ECHO_T}$GNOME_CONFIG" >&6
-+  { echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5
-+echo "${ECHO_T}$GNOME_CONFIG" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     if test "$GNOME_CONFIG" = "no"; then
-       no_gnome_config="yes"
-     else
--      echo "$as_me:$LINENO: checking if $GNOME_CONFIG works" >&5
--echo $ECHO_N "checking if $GNOME_CONFIG works... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking if $GNOME_CONFIG works" >&5
-+echo $ECHO_N "checking if $GNOME_CONFIG works... $ECHO_C" >&6; }
-       if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
--	echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 	GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`"
- 	GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
- 	GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
- 	have_gnome=yes
-       else
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 	no_gnome_config="yes"
-       fi
-     fi
-@@ -8088,18 +8553,18 @@
-     fi
- 
-     if test "$no_gnome_config" = "yes"; then
--      echo "$as_me:$LINENO: checking for gnomeConf.sh file in $gnome_prefix" >&5
--echo $ECHO_N "checking for gnomeConf.sh file in $gnome_prefix... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for gnomeConf.sh file in $gnome_prefix" >&5
-+echo $ECHO_N "checking for gnomeConf.sh file in $gnome_prefix... $ECHO_C" >&6; }
-       if test -f $gnome_prefix/gnomeConf.sh; then
--	echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+	{ echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
- 	echo "loading gnome configuration from" \
- 	  "$gnome_prefix/gnomeConf.sh"
- 	. $gnome_prefix/gnomeConf.sh
- 	have_gnome=yes
-       else
--	echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+	{ echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 	if test x = xfail; then
- 	  { { echo "$as_me:$LINENO: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&5
- echo "$as_me: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&2;}
-@@ -8130,8 +8595,8 @@
-   gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
-     GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
- 
--  echo "$as_me:$LINENO: checking for location of Motif GUI includes" >&5
--echo $ECHO_N "checking for location of Motif GUI includes... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for location of Motif GUI includes" >&5
-+echo $ECHO_N "checking for location of Motif GUI includes... $ECHO_C" >&6; }
-   gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/include/g` $GUI_INC_LOC"
-   GUI_INC_LOC=
-   for try in $gui_includes; do
-@@ -8142,42 +8607,42 @@
-   if test -n "$GUI_INC_LOC"; then
-     if test "$GUI_INC_LOC" = /usr/include; then
-       GUI_INC_LOC=
--      echo "$as_me:$LINENO: result: in default path" >&5
--echo "${ECHO_T}in default path" >&6
-+      { echo "$as_me:$LINENO: result: in default path" >&5
-+echo "${ECHO_T}in default path" >&6; }
-     else
--      echo "$as_me:$LINENO: result: $GUI_INC_LOC" >&5
--echo "${ECHO_T}$GUI_INC_LOC" >&6
-+      { echo "$as_me:$LINENO: result: $GUI_INC_LOC" >&5
-+echo "${ECHO_T}$GUI_INC_LOC" >&6; }
-     fi
-   else
--    echo "$as_me:$LINENO: result: <not found>" >&5
--echo "${ECHO_T}<not found>" >&6
-+    { echo "$as_me:$LINENO: result: <not found>" >&5
-+echo "${ECHO_T}<not found>" >&6; }
-     SKIP_MOTIF=YES
-   fi
- fi
- 
- 
- if test -z "$SKIP_MOTIF"; then
--  echo "$as_me:$LINENO: checking --with-motif-lib argument" >&5
--echo $ECHO_N "checking --with-motif-lib argument... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking --with-motif-lib argument" >&5
-+echo $ECHO_N "checking --with-motif-lib argument... $ECHO_C" >&6; }
- 
--# Check whether --with-motif-lib or --without-motif-lib was given.
-+# Check whether --with-motif-lib was given.
- if test "${with_motif_lib+set}" = set; then
--  withval="$with_motif_lib"
--   MOTIF_LIBNAME="${withval}"
--fi;
-+  withval=$with_motif_lib;  MOTIF_LIBNAME="${withval}"
-+fi
-+
- 
-   if test -n "$MOTIF_LIBNAME"; then
--    echo "$as_me:$LINENO: result: $MOTIF_LIBNAME" >&5
--echo "${ECHO_T}$MOTIF_LIBNAME" >&6
-+    { echo "$as_me:$LINENO: result: $MOTIF_LIBNAME" >&5
-+echo "${ECHO_T}$MOTIF_LIBNAME" >&6; }
-     GUI_LIB_LOC=
-   else
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
-         GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`"
- 
--    echo "$as_me:$LINENO: checking for location of Motif GUI libs" >&5
--echo $ECHO_N "checking for location of Motif GUI libs... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for location of Motif GUI libs" >&5
-+echo $ECHO_N "checking for location of Motif GUI libs... $ECHO_C" >&6; }
-     gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
-     GUI_LIB_LOC=
-     for try in $gui_libs; do
-@@ -8190,12 +8655,12 @@
-     if test -n "$GUI_LIB_LOC"; then
-             if test "$GUI_LIB_LOC" = /usr/lib; then
- 	GUI_LIB_LOC=
--	echo "$as_me:$LINENO: result: in default path" >&5
--echo "${ECHO_T}in default path" >&6
-+	{ echo "$as_me:$LINENO: result: in default path" >&5
-+echo "${ECHO_T}in default path" >&6; }
-       else
- 	if test -n "$GUI_LIB_LOC"; then
--	  echo "$as_me:$LINENO: result: $GUI_LIB_LOC" >&5
--echo "${ECHO_T}$GUI_LIB_LOC" >&6
-+	  { echo "$as_me:$LINENO: result: $GUI_LIB_LOC" >&5
-+echo "${ECHO_T}$GUI_LIB_LOC" >&6; }
- 	  if test "`(uname) 2>/dev/null`" = SunOS &&
- 					 uname -r | grep '^5' >/dev/null; then
- 	    GUI_LIB_LOC="$GUI_LIB_LOC -R $GUI_LIB_LOC"
-@@ -8204,8 +8669,8 @@
-       fi
-       MOTIF_LIBNAME=-lXm
-     else
--      echo "$as_me:$LINENO: result: <not found>" >&5
--echo "${ECHO_T}<not found>" >&6
-+      { echo "$as_me:$LINENO: result: <not found>" >&5
-+echo "${ECHO_T}<not found>" >&6; }
-       SKIP_MOTIF=YES
-     fi
-   fi
-@@ -8222,8 +8687,8 @@
- GUI_X_LIBS=
- 
- if test -z "$SKIP_ATHENA"; then
--  echo "$as_me:$LINENO: checking if Athena header files can be found" >&5
--echo $ECHO_N "checking if Athena header files can be found... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Athena header files can be found" >&5
-+echo $ECHO_N "checking if Athena header files can be found... $ECHO_C" >&6; }
-   cflags_save=$CFLAGS
-   CFLAGS="$CFLAGS $X_CFLAGS"
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -8244,37 +8709,33 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; SKIP_ATHENA=YES
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }; SKIP_ATHENA=YES
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   CFLAGS=$cflags_save
- fi
- 
-@@ -8283,8 +8744,8 @@
- fi
- 
- if test -z "$SKIP_NEXTAW"; then
--  echo "$as_me:$LINENO: checking if neXtaw header files can be found" >&5
--echo $ECHO_N "checking if neXtaw header files can be found... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if neXtaw header files can be found" >&5
-+echo $ECHO_N "checking if neXtaw header files can be found... $ECHO_C" >&6; }
-   cflags_save=$CFLAGS
-   CFLAGS="$CFLAGS $X_CFLAGS"
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -8305,37 +8766,33 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; SKIP_NEXTAW=YES
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }; SKIP_NEXTAW=YES
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   CFLAGS=$cflags_save
- fi
- 
-@@ -8353,8 +8810,8 @@
- 
-     ldflags_save=$LDFLAGS
-   LDFLAGS="$X_LIBS $LDFLAGS"
--  echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
--echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
-+echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8367,62 +8824,59 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char XShapeQueryExtension ();
- int
- main ()
- {
--XShapeQueryExtension ();
-+return XShapeQueryExtension ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_Xext_XShapeQueryExtension=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xext_XShapeQueryExtension=no
-+	ac_cv_lib_Xext_XShapeQueryExtension=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
--echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
- if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
-   GUI_X_LIBS="-lXext"
- fi
- 
--    echo "$as_me:$LINENO: checking for wslen in -lw" >&5
--echo $ECHO_N "checking for wslen in -lw... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for wslen in -lw" >&5
-+echo $ECHO_N "checking for wslen in -lw... $ECHO_C" >&6; }
- if test "${ac_cv_lib_w_wslen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8435,62 +8889,59 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char wslen ();
- int
- main ()
- {
--wslen ();
-+return wslen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_w_wslen=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_w_wslen=no
-+	ac_cv_lib_w_wslen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5
--echo "${ECHO_T}$ac_cv_lib_w_wslen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5
-+echo "${ECHO_T}$ac_cv_lib_w_wslen" >&6; }
- if test $ac_cv_lib_w_wslen = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
- fi
- 
--  echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
--echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
-+echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8503,62 +8954,59 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlsym ();
- int
- main ()
- {
--dlsym ();
-+return dlsym ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_dl_dlsym=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dl_dlsym=no
-+	ac_cv_lib_dl_dlsym=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6; }
- if test $ac_cv_lib_dl_dlsym = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
- fi
- 
--  echo "$as_me:$LINENO: checking for XmuCreateStippledPixmap in -lXmu" >&5
--echo $ECHO_N "checking for XmuCreateStippledPixmap in -lXmu... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for XmuCreateStippledPixmap in -lXmu" >&5
-+echo $ECHO_N "checking for XmuCreateStippledPixmap in -lXmu... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Xmu_XmuCreateStippledPixmap+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8571,63 +9019,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char XmuCreateStippledPixmap ();
- int
- main ()
- {
--XmuCreateStippledPixmap ();
-+return XmuCreateStippledPixmap ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_Xmu_XmuCreateStippledPixmap=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xmu_XmuCreateStippledPixmap=no
-+	ac_cv_lib_Xmu_XmuCreateStippledPixmap=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
--echo "${ECHO_T}$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; }
- if test $ac_cv_lib_Xmu_XmuCreateStippledPixmap = yes; then
-   GUI_X_LIBS="-lXmu $GUI_X_LIBS"
- fi
- 
-   if test -z "$SKIP_MOTIF"; then
--    echo "$as_me:$LINENO: checking for XpEndJob in -lXp" >&5
--echo $ECHO_N "checking for XpEndJob in -lXp... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for XpEndJob in -lXp" >&5
-+echo $ECHO_N "checking for XpEndJob in -lXp... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Xp_XpEndJob+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8640,56 +9085,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char XpEndJob ();
- int
- main ()
- {
--XpEndJob ();
-+return XpEndJob ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_Xp_XpEndJob=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xp_XpEndJob=no
-+	ac_cv_lib_Xp_XpEndJob=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5
--echo "${ECHO_T}$ac_cv_lib_Xp_XpEndJob" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xp_XpEndJob" >&6; }
- if test $ac_cv_lib_Xp_XpEndJob = yes; then
-   GUI_X_LIBS="-lXp $GUI_X_LIBS"
- fi
-@@ -8697,8 +9139,8 @@
-   fi
-   LDFLAGS=$ldflags_save
- 
--    echo "$as_me:$LINENO: checking for extra X11 defines" >&5
--echo $ECHO_N "checking for extra X11 defines... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for extra X11 defines" >&5
-+echo $ECHO_N "checking for extra X11 defines... $ECHO_C" >&6; }
-   NARROW_PROTO=
-   rm -fr conftestdir
-   if mkdir conftestdir; then
-@@ -8714,11 +9156,11 @@
-     rm -fr conftestdir
-   fi
-   if test -z "$NARROW_PROTO"; then
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   else
--    echo "$as_me:$LINENO: result: $NARROW_PROTO" >&5
--echo "${ECHO_T}$NARROW_PROTO" >&6
-+    { echo "$as_me:$LINENO: result: $NARROW_PROTO" >&5
-+echo "${ECHO_T}$NARROW_PROTO" >&6; }
-   fi
- 
- fi
-@@ -8730,18 +9172,19 @@
- for ac_header in X11/SM/SMlib.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8752,41 +9195,37 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8795,24 +9234,22 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -8820,9 +9257,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8846,25 +9284,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8888,18 +9320,19 @@
- for ac_header in X11/xpm.h X11/Sunkeysym.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8910,41 +9343,37 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8953,24 +9382,22 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -8978,9 +9405,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9004,25 +9432,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -9036,8 +9458,8 @@
- 
- 
-     if test ! "$enable_xim" = "no"; then
--    echo "$as_me:$LINENO: checking for XIMText in X11/Xlib.h" >&5
--echo $ECHO_N "checking for XIMText in X11/Xlib.h... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for XIMText in X11/Xlib.h" >&5
-+echo $ECHO_N "checking for XIMText in X11/Xlib.h... $ECHO_C" >&6; }
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9048,11 +9470,11 @@
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "XIMText" >/dev/null 2>&1; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
--  echo "$as_me:$LINENO: result: no; xim has been disabled" >&5
--echo "${ECHO_T}no; xim has been disabled" >&6; enable_xim = "no"
-+  { echo "$as_me:$LINENO: result: no; xim has been disabled" >&5
-+echo "${ECHO_T}no; xim has been disabled" >&6; }; enable_xim = "no"
- fi
- rm -f conftest*
- 
-@@ -9061,8 +9483,8 @@
- 
-     if test "$enable_xim" = "auto" -a "$enable_hangulinput" != "yes" \
- 		-a "x$GUITYPE" != "xNONE" ; then
--    echo "$as_me:$LINENO: result: X GUI selected; xim has been enabled" >&5
--echo "${ECHO_T}X GUI selected; xim has been enabled" >&6
-+    { echo "$as_me:$LINENO: result: X GUI selected; xim has been enabled" >&5
-+echo "${ECHO_T}X GUI selected; xim has been enabled" >&6; }
-     enable_xim="yes"
-   fi
- fi
-@@ -9070,8 +9492,8 @@
- if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
-   cppflags_save=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
--  echo "$as_me:$LINENO: checking for X11/Xmu/Editres.h" >&5
--echo $ECHO_N "checking for X11/Xmu/Editres.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for X11/Xmu/Editres.h" >&5
-+echo $ECHO_N "checking for X11/Xmu/Editres.h... $ECHO_C" >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9090,29 +9512,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 		      cat >>confdefs.h <<\_ACEOF
- #define HAVE_X11_XMU_EDITRES_H 1
- _ACEOF
-@@ -9121,10 +9538,11 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   CPPFLAGS=$cppflags_save
- fi
- 
-@@ -9142,18 +9560,19 @@
- 		   Xm/UnhighlightT.h Xm/Notebook.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9164,41 +9583,37 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9207,24 +9622,22 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -9232,9 +9645,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9258,25 +9672,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -9290,8 +9698,8 @@
- 
- 
-   if test $ac_cv_header_Xm_XpmP_h = yes; then
--        echo "$as_me:$LINENO: checking for XpmAttributes_21 in Xm/XpmP.h" >&5
--echo $ECHO_N "checking for XpmAttributes_21 in Xm/XpmP.h... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: checking for XpmAttributes_21 in Xm/XpmP.h" >&5
-+echo $ECHO_N "checking for XpmAttributes_21 in Xm/XpmP.h... $ECHO_C" >&6; }
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9308,29 +9716,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define XPMATTRIBUTES_TYPE XpmAttributes_21
- _ACEOF
- 
-@@ -9338,14 +9741,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; cat >>confdefs.h <<\_ACEOF
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define XPMATTRIBUTES_TYPE XpmAttributes
- _ACEOF
- 
- 
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   else
-     cat >>confdefs.h <<\_ACEOF
- #define XPMATTRIBUTES_TYPE XpmAttributes
-@@ -9356,18 +9760,18 @@
- fi
- 
- if test "x$GUITYPE" = "xNONE" -a "$enable_xim" = "yes"; then
--  echo "$as_me:$LINENO: result: no GUI selected; xim has been disabled" >&5
--echo "${ECHO_T}no GUI selected; xim has been disabled" >&6
-+  { echo "$as_me:$LINENO: result: no GUI selected; xim has been disabled" >&5
-+echo "${ECHO_T}no GUI selected; xim has been disabled" >&6; }
-   enable_xim="no"
- fi
- if test "x$GUITYPE" = "xNONE" -a "$enable_fontset" = "yes"; then
--  echo "$as_me:$LINENO: result: no GUI selected; fontset has been disabled" >&5
--echo "${ECHO_T}no GUI selected; fontset has been disabled" >&6
-+  { echo "$as_me:$LINENO: result: no GUI selected; fontset has been disabled" >&5
-+echo "${ECHO_T}no GUI selected; fontset has been disabled" >&6; }
-   enable_fontset="no"
- fi
- if test "x$GUITYPE:$enable_fontset" = "xGTK:yes" -a "0$gtk_major_version" -ge 2; then
--  echo "$as_me:$LINENO: result: GTK+ 2 GUI selected; fontset has been disabled" >&5
--echo "${ECHO_T}GTK+ 2 GUI selected; fontset has been disabled" >&6
-+  { echo "$as_me:$LINENO: result: GTK+ 2 GUI selected; fontset has been disabled" >&5
-+echo "${ECHO_T}GTK+ 2 GUI selected; fontset has been disabled" >&6; }
-   enable_fontset="no"
- fi
- 
-@@ -9404,8 +9808,8 @@
- 
- if test "$enable_hangulinput" = "yes"; then
-   if test "x$GUITYPE" = "xNONE"; then
--    echo "$as_me:$LINENO: result: no GUI selected; hangul input has been disabled" >&5
--echo "${ECHO_T}no GUI selected; hangul input has been disabled" >&6
-+    { echo "$as_me:$LINENO: result: no GUI selected; hangul input has been disabled" >&5
-+echo "${ECHO_T}no GUI selected; hangul input has been disabled" >&6; }
-     enable_hangulinput=no
-   else
-     cat >>confdefs.h <<\_ACEOF
-@@ -9420,115 +9824,33 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking quality of toupper" >&5
--echo $ECHO_N "checking quality of toupper... $ECHO_C" >&6
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
--echo "$as_me: error: failed to compile test program" >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <ctype.h>
--main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  cat >>confdefs.h <<\_ACEOF
--#define BROKEN_TOUPPER 1
--_ACEOF
-- echo "$as_me:$LINENO: result: bad" >&5
--echo "${ECHO_T}bad" >&6
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--echo "$as_me:$LINENO: result: good" >&5
--echo "${ECHO_T}good" >&6
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--echo "$as_me:$LINENO: checking whether __DATE__ and __TIME__ work" >&5
--echo $ECHO_N "checking whether __DATE__ and __TIME__ work... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--printf("(" __DATE__ " " __TIME__ ")");
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+#AC_MSG_CHECKING(quality of toupper)
-+#AC_TRY_RUN([#include <ctype.h>
-+#main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }],
-+#	AC_DEFINE(BROKEN_TOUPPER) AC_MSG_RESULT(bad),
-+#	AC_MSG_RESULT(good), AC_MSG_ERROR(failed to compile test program))
-+
-+#AC_MSG_CHECKING(whether __DATE__ and __TIME__ work)
-+#AC_TRY_COMPILE(, [printf("(" __DATE__ " " __TIME__ ")");],
-+#	AC_MSG_RESULT(yes); AC_DEFINE(HAVE_DATE_TIME),
-+#	AC_MSG_RESULT(no))
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_DATE_TIME 1
- _ACEOF
- 
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test "${ac_cv_header_elf_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for elf.h" >&5
--echo $ECHO_N "checking for elf.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for elf.h" >&5
-+echo $ECHO_N "checking for elf.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_elf_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_elf_h" >&5
--echo "${ECHO_T}$ac_cv_header_elf_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_elf_h" >&5
-+echo "${ECHO_T}$ac_cv_header_elf_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking elf.h usability" >&5
--echo $ECHO_N "checking elf.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking elf.h usability" >&5
-+echo $ECHO_N "checking elf.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9539,41 +9861,37 @@
- #include <elf.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking elf.h presence" >&5
--echo $ECHO_N "checking elf.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking elf.h presence" >&5
-+echo $ECHO_N "checking elf.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9582,24 +9900,22 @@
- /* end confdefs.h.  */
- #include <elf.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -9607,9 +9923,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9633,25 +9950,18 @@
- echo "$as_me: WARNING: elf.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: elf.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: elf.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for elf.h" >&5
--echo $ECHO_N "checking for elf.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for elf.h" >&5
-+echo $ECHO_N "checking for elf.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_elf_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_elf_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_elf_h" >&5
--echo "${ECHO_T}$ac_cv_header_elf_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_elf_h" >&5
-+echo "${ECHO_T}$ac_cv_header_elf_h" >&6; }
- 
- fi
- if test $ac_cv_header_elf_h = yes; then
-@@ -9661,8 +9971,8 @@
- 
- if test "$HAS_ELF" = 1; then
- 
--echo "$as_me:$LINENO: checking for main in -lelf" >&5
--echo $ECHO_N "checking for main in -lelf... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for main in -lelf" >&5
-+echo $ECHO_N "checking for main in -lelf... $ECHO_C" >&6; }
- if test "${ac_cv_lib_elf_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9679,46 +9989,43 @@
- int
- main ()
- {
--main ();
-+return main ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_elf_main=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_elf_main=no
-+	ac_cv_lib_elf_main=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
--echo "${ECHO_T}$ac_cv_lib_elf_main" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_elf_main" >&6; }
- if test $ac_cv_lib_elf_main = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBELF 1
-@@ -9738,9 +10045,9 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
--echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -9762,38 +10069,35 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_Header=no"
-+	eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -9805,13 +10109,12 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -9819,302 +10122,213 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+for ac_lib in '' dir; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_search_opendir="none required"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_search_opendir=$ac_res
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
--  for ac_lib in dir; do
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--    cat >conftest.$ac_ext <<_ACEOF
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext
-+  if test "${ac_cv_search_opendir+set}" = set; then
-+  break
-+fi
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  :
-+else
-+  ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-+else
-+  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+for ac_lib in '' x; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_search_opendir="-l$ac_lib"
--break
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_search_opendir=$ac_res
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--  done
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext
-+  if test "${ac_cv_search_opendir+set}" = set; then
-+  break
-+fi
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  :
-+else
-+  ac_cv_search_opendir=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
--  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
- fi
- 
--else
--  echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
--if test "${ac_cv_search_opendir+set}" = set; then
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
--cat >conftest.$ac_ext <<_ACEOF
-+  cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char opendir ();
- int
- main ()
- {
--opendir ();
-+
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_search_opendir="none required"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
--  for ac_lib in x; do
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char opendir ();
--int
--main ()
--{
--opendir ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_search_opendir="-l$ac_lib"
--break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--  done
--fi
--LIBS=$ac_func_search_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
--  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
--
--fi
--
--fi
--
--
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
--if test "${ac_cv_header_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_header_stdc=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_header_stdc=no
-+	ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -10170,6 +10384,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* 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))
-@@ -10189,18 +10404,27 @@
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -10213,12 +10437,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -10227,8 +10453,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
--echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_wait_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10241,7 +10467,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #ifndef WEXITSTATUS
--# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
- #endif
- #ifndef WIFEXITED
- # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-@@ -10258,38 +10484,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_header_sys_wait_h=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_header_sys_wait_h=no
-+	ac_cv_header_sys_wait_h=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
- if test $ac_cv_header_sys_wait_h = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -10300,8 +10522,8 @@
- 
- 
- if test $ac_cv_header_sys_wait_h = no; then
--  echo "$as_me:$LINENO: checking for sys/wait.h that defines union wait" >&5
--echo $ECHO_N "checking for sys/wait.h that defines union wait... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for sys/wait.h that defines union wait" >&5
-+echo $ECHO_N "checking for sys/wait.h that defines union wait... $ECHO_C" >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10318,29 +10540,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 			cat >>confdefs.h <<\_ACEOF
- #define HAVE_SYS_WAIT_H 1
- _ACEOF
-@@ -10353,10 +10570,11 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 
-@@ -10410,18 +10628,19 @@
- 	sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10432,41 +10651,37 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10475,24 +10690,22 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -10500,9 +10713,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -10526,25 +10740,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -10557,8 +10765,8 @@
- done
- 
- 
--echo "$as_me:$LINENO: checking for pthread_np.h" >&5
--echo $ECHO_N "checking for pthread_np.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for pthread_np.h" >&5
-+echo $ECHO_N "checking for pthread_np.h... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10577,29 +10785,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 		      cat >>confdefs.h <<\_ACEOF
- #define HAVE_PTHREAD_NP_H 1
- _ACEOF
-@@ -10608,27 +10811,29 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
- for ac_header in strings.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10639,41 +10844,37 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -10682,24 +10883,22 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
+ $as_echo_n "checking uint32_t is 32 bits... " >&6; }
+-if test "$cross_compiling" = yes; then :
+-  as_fn_error "could not compile program using uint32_t." "$LINENO" 5
 -else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -10707,9 +10906,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -10733,25 +10933,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -10770,8 +10964,8 @@
- 
- else
- 
--echo "$as_me:$LINENO: checking if strings.h can be included after string.h" >&5
--echo $ECHO_N "checking if strings.h can be included after string.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if strings.h can be included after string.h" >&5
-+echo $ECHO_N "checking if strings.h can be included after string.h... $ECHO_C" >&6; }
- cppflags_save=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10804,47 +10998,43 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >>confdefs.h <<\_ACEOF
-+	cat >>confdefs.h <<\_ACEOF
- #define NO_STRINGS_WITH_STRING_H 1
- _ACEOF
- 
--		echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+		{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CPPFLAGS=$cppflags_save
- fi
- 
- if test $ac_cv_c_compiler_gnu = yes; then
--    echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
--echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-+echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; }
- if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10885,15 +11075,15 @@
- 
-   fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
--echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; }
-   if test $ac_cv_prog_gcc_traditional = yes; then
-     CC="$CC -traditional"
-   fi
- fi
- 
--echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
--echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10911,10 +11101,10 @@
- #ifndef __cplusplus
-   /* Ultrix mips cc rejects this.  */
-   typedef int charset[2];
--  const charset x;
-+  const charset cs;
-   /* SunOS 4.1.1 cc rejects this.  */
--  char const *const *ccp;
--  char **p;
-+  char const *const *pcpcc;
-+  char **ppc;
-   /* NEC SVR4.0.2 mips cc rejects this.  */
-   struct point {int x, y;};
-   static struct point const zero = {0,0};
-@@ -10923,16 +11113,17 @@
-      an arm of an if-expression whose if-part is not a constant
-      expression */
-   const char *g = "string";
--  ccp = &g + (g ? g-g : 0);
-+  pcpcc = &g + (g ? g-g : 0);
-   /* HPUX 7.0 cc rejects these. */
--  ++ccp;
--  p = (char**) ccp;
--  ccp = (char const *const *) p;
-+  ++pcpcc;
-+  ppc = (char**) pcpcc;
-+  pcpcc = (char const *const *) ppc;
-   { /* SCO 3.2v4 cc rejects this.  */
-     char *t;
-     char const *s = 0 ? (char *) 0 : (char const *) 0;
- 
-     *t++ = 0;
-+    if (s) return 0;
-   }
-   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-     int x[] = {25, 17};
-@@ -10951,7 +11142,9 @@
-   }
-   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-     const int foo = 10;
-+    if (!foo) return 0;
-   }
-+  return !cs[0] && !zero.x;
- #endif
- 
-   ;
-@@ -10959,38 +11152,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_c_const=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_c_const=no
-+	ac_cv_c_const=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
--echo "${ECHO_T}$ac_cv_c_const" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6; }
- if test $ac_cv_c_const = no; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -10999,8 +11188,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking for mode_t" >&5
--echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for mode_t" >&5
-+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_mode_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11011,50 +11200,47 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef mode_t ac__type_new_;
- int
- main ()
- {
--if ((mode_t *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (mode_t))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_type_mode_t=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_type_mode_t=no
-+	ac_cv_type_mode_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
--echo "${ECHO_T}$ac_cv_type_mode_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-+echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
- if test $ac_cv_type_mode_t = yes; then
-   :
- else
-@@ -11065,8 +11251,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for off_t" >&5
-+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11077,62 +11263,59 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef off_t ac__type_new_;
- int
- main ()
- {
--if ((off_t *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (off_t))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_type_off_t=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_type_off_t=no
-+	ac_cv_type_off_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
- if test $ac_cv_type_off_t = yes; then
-   :
- else
- 
- cat >>confdefs.h <<_ACEOF
--#define off_t long
-+#define off_t long int
- _ACEOF
- 
- fi
- 
--echo "$as_me:$LINENO: checking for pid_t" >&5
--echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for pid_t" >&5
-+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_pid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11143,50 +11326,47 @@
- cat >>conftest.$ac_ext <<_ACEOF
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- $ac_includes_default
-+typedef pid_t ac__type_new_;
- int
- main ()
- {
--if ((pid_t *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (pid_t))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_type_pid_t=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_type_pid_t=no
-+	ac_cv_type_pid_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
--echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
- if test $ac_cv_type_pid_t = yes; then
-   :
- else
-@@ -11197,8 +11377,8 @@
- 
- fi
  
--echo "$as_me:$LINENO: checking for size_t" >&5
--echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_size_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11209,62 +11389,59 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef size_t ac__type_new_;
- int
- main ()
- {
--if ((size_t *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (size_t))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
+ #ifdef HAVE_STDINT_H
+@@ -11660,7 +11657,7 @@ main() {
+   exit(0);
  }
  _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_type_size_t=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_type_size_t=no
-+	ac_cv_type_size_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
- if test $ac_cv_type_size_t = yes; then
-   :
+-if ac_fn_c_try_run "$LINENO"; then :
++if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
  else
- 
- cat >>confdefs.h <<_ACEOF
--#define size_t unsigned
-+#define size_t unsigned int
- _ACEOF
- 
- fi
- 
--echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
--echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
- if test "${ac_cv_type_uid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11286,8 +11463,8 @@
- rm -f conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
--echo "${ECHO_T}$ac_cv_type_uid_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
- if test $ac_cv_type_uid_t = no; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -11301,8 +11478,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11326,38 +11503,34 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_header_time=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_header_time=no
-+	ac_cv_header_time=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-+echo "${ECHO_T}$ac_cv_header_time" >&6; }
- if test $ac_cv_header_time = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -11366,8 +11539,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking for ino_t" >&5
--echo $ECHO_N "checking for ino_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ino_t" >&5
-+echo $ECHO_N "checking for ino_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_ino_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11378,50 +11551,47 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef ino_t ac__type_new_;
- int
- main ()
- {
--if ((ino_t *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (ino_t))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_type_ino_t=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_type_ino_t=no
-+	ac_cv_type_ino_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
--echo "${ECHO_T}$ac_cv_type_ino_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5
-+echo "${ECHO_T}$ac_cv_type_ino_t" >&6; }
- if test $ac_cv_type_ino_t = yes; then
-   :
- else
-@@ -11432,8 +11602,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking for dev_t" >&5
--echo $ECHO_N "checking for dev_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for dev_t" >&5
-+echo $ECHO_N "checking for dev_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_dev_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11444,50 +11614,47 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef dev_t ac__type_new_;
- int
- main ()
- {
--if ((dev_t *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (dev_t))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_type_dev_t=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_type_dev_t=no
-+	ac_cv_type_dev_t=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5
--echo "${ECHO_T}$ac_cv_type_dev_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5
-+echo "${ECHO_T}$ac_cv_type_dev_t" >&6; }
- if test $ac_cv_type_dev_t = yes; then
-   :
- else
-@@ -11499,11 +11666,11 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking for rlim_t" >&5
--echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for rlim_t" >&5
-+echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6; }
- if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then
--  echo "$as_me:$LINENO: result: (cached) $ac_cv_type_rlim_t" >&5
--echo "${ECHO_T}(cached) $ac_cv_type_rlim_t" >&6
-+  { echo "$as_me:$LINENO: result: (cached) $ac_cv_type_rlim_t" >&5
-+echo "${ECHO_T}(cached) $ac_cv_type_rlim_t" >&6; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -11530,8 +11697,8 @@
- fi
- rm -f conftest*
- 
--	  echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5
--echo "${ECHO_T}$ac_cv_type_rlim_t" >&6
-+	  { echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5
-+echo "${ECHO_T}$ac_cv_type_rlim_t" >&6; }
- fi
- if test $ac_cv_type_rlim_t = no; then
-   cat >> confdefs.h <<\EOF
-@@ -11539,11 +11706,11 @@
- EOF
+@@ -11668,8 +11665,6 @@ else
  fi
- 
--echo "$as_me:$LINENO: checking for stack_t" >&5
--echo $ECHO_N "checking for stack_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for stack_t" >&5
-+echo $ECHO_N "checking for stack_t... $ECHO_C" >&6; }
- if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then
--  echo "$as_me:$LINENO: result: (cached) $ac_cv_type_stack_t" >&5
--echo "${ECHO_T}(cached) $ac_cv_type_stack_t" >&6
-+  { echo "$as_me:$LINENO: result: (cached) $ac_cv_type_stack_t" >&5
-+echo "${ECHO_T}(cached) $ac_cv_type_stack_t" >&6; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -11568,8 +11735,8 @@
- fi
- rm -f conftest*
- 
--	  echo "$as_me:$LINENO: result: $ac_cv_type_stack_t" >&5
--echo "${ECHO_T}$ac_cv_type_stack_t" >&6
-+	  { echo "$as_me:$LINENO: result: $ac_cv_type_stack_t" >&5
-+echo "${ECHO_T}$ac_cv_type_stack_t" >&6; }
- fi
- if test $ac_cv_type_stack_t = no; then
-   cat >> confdefs.h <<\EOF
-@@ -11577,8 +11744,8 @@
- EOF
- fi
- 
--echo "$as_me:$LINENO: checking whether stack_t has an ss_base field" >&5
--echo $ECHO_N "checking whether stack_t has an ss_base field... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether stack_t has an ss_base field" >&5
-+echo $ECHO_N "checking whether stack_t has an ss_base field... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11603,29 +11770,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_SS_BASE 1
- _ACEOF
- 
-@@ -11633,26 +11795,27 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- olibs="$LIBS"
--echo "$as_me:$LINENO: checking --with-tlib argument" >&5
--echo $ECHO_N "checking --with-tlib argument... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking --with-tlib argument" >&5
-+echo $ECHO_N "checking --with-tlib argument... $ECHO_C" >&6; }
- 
--# Check whether --with-tlib or --without-tlib was given.
-+# Check whether --with-tlib was given.
- if test "${with_tlib+set}" = set; then
--  withval="$with_tlib"
-+  withval=$with_tlib;
-+fi
- 
--fi;
- if test -n "$with_tlib"; then
--  echo "$as_me:$LINENO: result: $with_tlib" >&5
--echo "${ECHO_T}$with_tlib" >&6
-+  { echo "$as_me:$LINENO: result: $with_tlib" >&5
-+echo "${ECHO_T}$with_tlib" >&6; }
-   LIBS="$LIBS -l$with_tlib"
--  echo "$as_me:$LINENO: checking for linking with $with_tlib library" >&5
--echo $ECHO_N "checking for linking with $with_tlib library... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for linking with $with_tlib library" >&5
-+echo $ECHO_N "checking for linking with $with_tlib library... $ECHO_C" >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11669,43 +11832,40 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: OK" >&5
--echo "${ECHO_T}OK" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: OK" >&5
-+echo "${ECHO_T}OK" >&6; }
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { echo "$as_me:$LINENO: error: FAILED" >&5
-+	{ { echo "$as_me:$LINENO: error: FAILED" >&5
- echo "$as_me: error: FAILED" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     olibs="$LIBS"
- else
--  echo "$as_me:$LINENO: result: empty: automatic terminal library selection" >&5
--echo "${ECHO_T}empty: automatic terminal library selection" >&6
-+  { echo "$as_me:$LINENO: result: empty: automatic terminal library selection" >&5
-+echo "${ECHO_T}empty: automatic terminal library selection" >&6; }
-               case "`uname -s 2>/dev/null`" in
- 	OSF1|SCO_SV)	tlibs="ncurses curses termlib termcap";;
- 	*)	tlibs="ncurses termlib termcap curses";;
-@@ -11713,9 +11873,9 @@
-   for libname in $tlibs; do
- 
- as_ac_Lib=`echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for tgetent in -l${libname}" >&5
--echo $ECHO_N "checking for tgetent in -l${libname}... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for tgetent in -l${libname}" >&5
-+echo $ECHO_N "checking for tgetent in -l${libname}... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -11727,56 +11887,54 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char tgetent ();
- int
- main ()
- {
--tgetent ();
-+return tgetent ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_Lib=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_Lib=no"
-+	eval "$as_ac_Lib=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Lib'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_LIB${libname}" | $as_tr_cpp` 1
-@@ -11803,13 +11961,22 @@
- main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11822,25 +11989,27 @@
- ( exit $ac_status )
- res="FAIL"
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
-       if test "$res" = "OK"; then
- 	break
-       fi
--      echo "$as_me:$LINENO: result: $libname library is not usable" >&5
--echo "${ECHO_T}$libname library is not usable" >&6
-+      { echo "$as_me:$LINENO: result: $libname library is not usable" >&5
-+echo "${ECHO_T}$libname library is not usable" >&6; }
-       LIBS="$olibs"
-     fi
-   done
-   if test "x$olibs" = "x$LIBS"; then
--    echo "$as_me:$LINENO: result: no terminal library found" >&5
--echo "${ECHO_T}no terminal library found" >&6
-+    { echo "$as_me:$LINENO: result: no terminal library found" >&5
-+echo "${ECHO_T}no terminal library found" >&6; }
-   fi
- fi
- 
- if test "x$olibs" = "x$LIBS"; then
--  echo "$as_me:$LINENO: checking for tgetent()" >&5
--echo $ECHO_N "checking for tgetent()... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for tgetent()" >&5
-+echo $ECHO_N "checking for tgetent()... $ECHO_C" >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11857,34 +12026,30 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { echo "$as_me:$LINENO: error: NOT FOUND!
-+	{ { echo "$as_me:$LINENO: error: NOT FOUND!
-       You need to install a terminal library; for example ncurses.
-       Or specify the name of the library with --with-tlib." >&5
- echo "$as_me: error: NOT FOUND!
-@@ -11892,18 +12057,46 @@
-       Or specify the name of the library with --with-tlib." >&2;}
-    { (exit 1); exit 1; }; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- 
--echo "$as_me:$LINENO: checking whether we talk terminfo" >&5
--echo $ECHO_N "checking whether we talk terminfo... $ECHO_C" >&6
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: failed to compile test program." >&5
--echo "$as_me: error: failed to compile test program." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
-+#AC_MSG_CHECKING(whether we talk terminfo)
-+#AC_TRY_RUN([
-+##ifdef HAVE_TERMCAP_H
-+## include <termcap.h>
-+##endif
-+#main()
-+#{char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }],
-+#	  AC_MSG_RESULT([no -- we are in termcap land]),
-+#	  AC_MSG_RESULT([yes -- terminfo spoken here]); AC_DEFINE(TERMINFO),
-+#	  AC_MSG_ERROR(failed to compile test program.))
-+cat >>confdefs.h <<\_ACEOF
-+#define TERMINFO 1
-+_ACEOF
-+
-+
-+#if test "x$olibs" != "x$LIBS"; then
-+#  AC_MSG_CHECKING(what tgetent() returns for an unknown terminal)
-+#  AC_TRY_RUN([
-+##ifdef HAVE_TERMCAP_H
-+## include <termcap.h>
-+##endif
-+#main()
-+#{char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }],
-+#	  AC_MSG_RESULT(zero); AC_DEFINE(TGETENT_ZERO_ERR, 0),
-+#	  AC_MSG_RESULT(non-zero),
-+#	  AC_MSG_ERROR(failed to compile test program.))
-+#fi
-+cat >>confdefs.h <<\_ACEOF
-+#define TGETENT_ZERO_ERR 1
-+_ACEOF
-+
-+
-+{ echo "$as_me:$LINENO: checking whether termcap.h contains ospeed" >&5
-+echo $ECHO_N "checking whether termcap.h contains ospeed... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -11913,144 +12106,47 @@
- #ifdef HAVE_TERMCAP_H
- # include <termcap.h>
- #endif
--main()
--{char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
-+
-+int
-+main ()
-+{
-+ospeed = 20000
-+  ;
-+  return 0;
-+}
- _ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: no -- we are in termcap land" >&5
--echo "${ECHO_T}no -- we are in termcap land" >&6
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--echo "$as_me:$LINENO: result: yes -- terminfo spoken here" >&5
--echo "${ECHO_T}yes -- terminfo spoken here" >&6; cat >>confdefs.h <<\_ACEOF
--#define TERMINFO 1
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
-+#define HAVE_OSPEED 1
- _ACEOF
- 
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 -
--if test "x$olibs" != "x$LIBS"; then
--  echo "$as_me:$LINENO: checking what tgetent() returns for an unknown terminal" >&5
--echo $ECHO_N "checking what tgetent() returns for an unknown terminal... $ECHO_C" >&6
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: failed to compile test program." >&5
--echo "$as_me: error: failed to compile test program." >&2;}
--   { (exit 1); exit 1; }; }
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#ifdef HAVE_TERMCAP_H
--# include <termcap.h>
--#endif
--main()
--{char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: zero" >&5
--echo "${ECHO_T}zero" >&6; cat >>confdefs.h <<\_ACEOF
--#define TGETENT_ZERO_ERR 0
--_ACEOF
--
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--echo "$as_me:$LINENO: result: non-zero" >&5
--echo "${ECHO_T}non-zero" >&6
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--
--echo "$as_me:$LINENO: checking whether termcap.h contains ospeed" >&5
--echo $ECHO_N "checking whether termcap.h contains ospeed... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#ifdef HAVE_TERMCAP_H
--# include <termcap.h>
--#endif
--
--int
--main ()
--{
--ospeed = 20000
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
--#define HAVE_OSPEED 1
--_ACEOF
--
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--	echo "$as_me:$LINENO: checking whether ospeed can be extern" >&5
--echo $ECHO_N "checking whether ospeed can be extern... $ECHO_C" >&6
--	cat >conftest.$ac_ext <<_ACEOF
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+	{ echo "$as_me:$LINENO: checking whether ospeed can be extern" >&5
-+echo $ECHO_N "checking whether ospeed can be extern... $ECHO_C" >&6; }
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -12071,29 +12167,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define OSPEED_EXTERN 1
- _ACEOF
- 
-@@ -12101,18 +12193,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
--echo "$as_me:$LINENO: checking whether termcap.h contains UP, BC and PC" >&5
--echo $ECHO_N "checking whether termcap.h contains UP, BC and PC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether termcap.h contains UP, BC and PC" >&5
-+echo $ECHO_N "checking whether termcap.h contains UP, BC and PC... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -12133,29 +12227,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_UP_BC_PC 1
- _ACEOF
- 
-@@ -12163,10 +12253,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--	echo "$as_me:$LINENO: checking whether UP, BC and PC can be extern" >&5
--echo $ECHO_N "checking whether UP, BC and PC can be extern... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+	{ echo "$as_me:$LINENO: checking whether UP, BC and PC can be extern" >&5
-+echo $ECHO_N "checking whether UP, BC and PC can be extern... $ECHO_C" >&6; }
- 	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -12188,29 +12278,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define UP_BC_PC_EXTERN 1
- _ACEOF
- 
-@@ -12218,18 +12304,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
--echo "$as_me:$LINENO: checking whether tputs() uses outfuntype" >&5
--echo $ECHO_N "checking whether tputs() uses outfuntype... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether tputs() uses outfuntype" >&5
-+echo $ECHO_N "checking whether tputs() uses outfuntype... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -12250,29 +12338,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_OUTFUNTYPE 1
- _ACEOF
- 
-@@ -12280,13 +12363,14 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--echo "$as_me:$LINENO: checking whether sys/select.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether sys/select.h and sys/time.h may both be included... $ECHO_C" >&6
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+{ echo "$as_me:$LINENO: checking whether sys/select.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether sys/select.h and sys/time.h may both be included... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -12306,29 +12390,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 			cat >>confdefs.h <<\_ACEOF
- #define SYS_SELECT_WITH_SYS_TIME 1
- _ACEOF
-@@ -12337,28 +12416,29 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
--echo "$as_me:$LINENO: checking for /dev/ptc" >&5
--echo $ECHO_N "checking for /dev/ptc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for /dev/ptc" >&5
-+echo $ECHO_N "checking for /dev/ptc... $ECHO_C" >&6; }
- if test -r /dev/ptc; then
-   cat >>confdefs.h <<\_ACEOF
- #define HAVE_DEV_PTC 1
- _ACEOF
- 
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--echo "$as_me:$LINENO: checking for SVR4 ptys" >&5
--echo $ECHO_N "checking for SVR4 ptys... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for SVR4 ptys" >&5
-+echo $ECHO_N "checking for SVR4 ptys... $ECHO_C" >&6; }
- if test -c /dev/ptmx ; then
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -12376,29 +12456,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_SVR4_PTYS 1
- _ACEOF
- 
-@@ -12406,18 +12482,19 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
  
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--echo "$as_me:$LINENO: checking for ptyranges" >&5
--echo $ECHO_N "checking for ptyranges... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ptyranges" >&5
-+echo $ECHO_N "checking for ptyranges... $ECHO_C" >&6; }
- if test -d /dev/ptym ; then
-   pdir='/dev/ptym'
- else
-@@ -12453,102 +12530,72 @@
- #define PTYRANGE1 "$p1"
- _ACEOF
- 
--  echo "$as_me:$LINENO: result: $p0 / $p1" >&5
--echo "${ECHO_T}$p0 / $p1" >&6
-+  { echo "$as_me:$LINENO: result: $p0 / $p1" >&5
-+echo "${ECHO_T}$p0 / $p1" >&6; }
- else
--  echo "$as_me:$LINENO: result: don't know" >&5
--echo "${ECHO_T}don't know" >&6
-+  { echo "$as_me:$LINENO: result: don't know" >&5
-+echo "${ECHO_T}don't know" >&6; }
- fi
  
--echo "$as_me:$LINENO: checking default tty permissions/group" >&5
--echo $ECHO_N "checking default tty permissions/group... $ECHO_C" >&6
--rm -f conftest_grp
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
--echo "$as_me: error: failed to compile test program" >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <stdio.h>
--main()
--{
--  struct stat sb;
--  char *x,*ttyname();
--  int om, m;
--  FILE *fp;
--
--  if (!(x = ttyname(0))) exit(1);
--  if (stat(x, &sb)) exit(1);
--  om = sb.st_mode;
--  if (om & 002) exit(0);
--  m = system("mesg y");
--  if (m == -1 || m == 127) exit(1);
--  if (stat(x, &sb)) exit(1);
--  m = sb.st_mode;
--  if (chmod(x, om)) exit(1);
--  if (m & 002) exit(0);
--  if (sb.st_gid == getgid()) exit(1);
--  if (!(fp=fopen("conftest_grp", "w")))
--    exit(1);
--  fprintf(fp, "%d\n", sb.st_gid);
--  fclose(fp);
--  exit(0);
--}
--
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+#dnl    ****  pty mode/group handling ****
-+#dnl
-+#dnl support provided by Luke Mewburn <lm at rmit.edu.au>, 931222
-+#AC_MSG_CHECKING(default tty permissions/group)
-+#rm -f conftest_grp
-+#AC_TRY_RUN([
-+##include <sys/types.h>
-+##include <sys/stat.h>
-+##include <stdio.h>
-+#main()
-+#{
-+#  struct stat sb;
-+#  char *x,*ttyname();
-+#  int om, m;
-+#  FILE *fp;
-+#
-+#  if (!(x = ttyname(0))) exit(1);
-+#  if (stat(x, &sb)) exit(1);
-+#  om = sb.st_mode;
-+#  if (om & 002) exit(0);
-+#  m = system("mesg y");
-+#  if (m == -1 || m == 127) exit(1);
-+#  if (stat(x, &sb)) exit(1);
-+#  m = sb.st_mode;
-+#  if (chmod(x, om)) exit(1);
-+#  if (m & 002) exit(0);
-+#  if (sb.st_gid == getgid()) exit(1);
-+#  if (!(fp=fopen("conftest_grp", "w")))
-+#    exit(1);
-+#  fprintf(fp, "%d\n", sb.st_gid);
-+#  fclose(fp);
-+#  exit(0);
-+#}
-+#],[
-+#    if test -f conftest_grp; then
-+#	ptygrp=`cat conftest_grp`
-+#	AC_MSG_RESULT([pty mode: 0620, group: $ptygrp])
-+#	AC_DEFINE(PTYMODE, 0620)
-+#	AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp)
-+#    else
-+#	AC_MSG_RESULT([ptys are world accessable])
-+#    fi
-+#],
-+#    AC_MSG_RESULT([can't determine - assume ptys are world accessable]),
-+#    AC_MSG_ERROR(failed to compile test program))
-+#rm -f conftest_grp
- 
--    if test -f conftest_grp; then
--	ptygrp=`cat conftest_grp`
--	echo "$as_me:$LINENO: result: pty mode: 0620, group: $ptygrp" >&5
--echo "${ECHO_T}pty mode: 0620, group: $ptygrp" >&6
--	cat >>confdefs.h <<\_ACEOF
-+cat >>confdefs.h <<\_ACEOF
- #define PTYMODE 0620
- _ACEOF
- 
--	cat >>confdefs.h <<_ACEOF
--#define PTYGROUP $ptygrp
-+cat >>confdefs.h <<\_ACEOF
-+#define PTYGROUP 0
- _ACEOF
- 
--    else
--	echo "$as_me:$LINENO: result: ptys are world accessable" >&5
--echo "${ECHO_T}ptys are world accessable" >&6
--    fi
--
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5
--echo "${ECHO_T}can't determine - assume ptys are world accessable" >&6
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest_grp
- 
- 
--echo "$as_me:$LINENO: checking return type of signal handlers" >&5
--echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
- if test "${ac_cv_type_signal+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12560,56 +12607,44 @@
- /* end confdefs.h.  */
- #include <sys/types.h>
- #include <signal.h>
--#ifdef signal
--# undef signal
--#endif
--#ifdef __cplusplus
--extern "C" void (*signal (int, void (*)(int)))(int);
--#else
--void (*signal ()) ();
--#endif
- 
- int
- main ()
- {
--int i;
-+return *(signal (0, 0)) (0) == 1;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_type_signal=void
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_type_signal=int
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_type_signal=int
-+	ac_cv_type_signal=void
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
--echo "${ECHO_T}$ac_cv_type_signal" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-+echo "${ECHO_T}$ac_cv_type_signal" >&6; }
- 
- cat >>confdefs.h <<_ACEOF
- #define RETSIGTYPE $ac_cv_type_signal
-@@ -12629,8 +12664,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking for struct sigcontext" >&5
--echo $ECHO_N "checking for struct sigcontext... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for struct sigcontext" >&5
-+echo $ECHO_N "checking for struct sigcontext... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -12654,29 +12689,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 		cat >>confdefs.h <<\_ACEOF
- #define HAVE_SIGCONTEXT 1
- _ACEOF
-@@ -12685,62 +12715,28 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--
--echo "$as_me:$LINENO: checking getcwd implementation" >&5
--echo $ECHO_N "checking getcwd implementation... $ECHO_C" >&6
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
--echo "$as_me: error: failed to compile test program" >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--char *dagger[] = { "IFS=pwd", 0 };
--main()
--{
--  char buffer[500];
--  extern char **environ;
--  environ = dagger;
--  return getcwd(buffer, 500) ? 0 : 1;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: it is usable" >&5
--echo "${ECHO_T}it is usable" >&6
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--( exit $ac_status )
--echo "$as_me:$LINENO: result: it stinks" >&5
--echo "${ECHO_T}it stinks" >&6
--		cat >>confdefs.h <<\_ACEOF
--#define BAD_GETCWD 1
--_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
-+#dnl tricky stuff: try to find out if getcwd() is implemented with
-+#dnl system("sh -c pwd")
-+#AC_MSG_CHECKING(getcwd implementation)
-+#AC_TRY_RUN([
-+#char *dagger[] = { "IFS=pwd", 0 };
-+#main()
-+#{
-+#  char buffer[500];
-+#  extern char **environ;
-+#  environ = dagger;
-+#  return getcwd(buffer, 500) ? 0 : 1;
-+#}],
-+#	AC_MSG_RESULT(it is usable),
-+#	AC_MSG_RESULT(it stinks)
-+#		AC_DEFINE(BAD_GETCWD),
-+#	AC_MSG_ERROR(failed to compile test program))
- 
- 
- 
-@@ -12797,9 +12793,9 @@
- 	usleep utime utimes
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -12825,68 +12821,60 @@
- 
- #undef $ac_func
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -12896,8 +12884,8 @@
- done
- 
- 
--echo "$as_me:$LINENO: checking for st_blksize" >&5
--echo $ECHO_N "checking for st_blksize... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for st_blksize" >&5
-+echo $ECHO_N "checking for st_blksize... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -12919,29 +12907,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_ST_BLKSIZE 1
- _ACEOF
- 
-@@ -12949,58 +12932,26 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--echo "$as_me:$LINENO: checking whether stat() ignores a trailing slash" >&5
--echo $ECHO_N "checking whether stat() ignores a trailing slash... $ECHO_C" >&6
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
--echo "$as_me: error: failed to compile test program" >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/types.h>
--#include <sys/stat.h>
--main() {struct stat st;  exit(stat("configure/", &st) != 0); }
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+#AC_MSG_CHECKING(whether stat() ignores a trailing slash)
-+#AC_TRY_RUN(
-+#[#include <sys/types.h>
-+##include <sys/stat.h>
-+#main() {struct stat st;  exit(stat("configure/", &st) != 0); }],
-+#	AC_MSG_RESULT(yes); AC_DEFINE(STAT_IGNORES_SLASH),
-+#	AC_MSG_RESULT(no), AC_MSG_ERROR(failed to compile test program))
-+cat >>confdefs.h <<\_ACEOF
- #define STAT_IGNORES_SLASH 1
- _ACEOF
- 
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
- 
--echo "$as_me:$LINENO: checking for iconv_open()" >&5
--echo $ECHO_N "checking for iconv_open()... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for iconv_open()" >&5
-+echo $ECHO_N "checking for iconv_open()... $ECHO_C" >&6; }
- save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13023,29 +12974,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes; with -liconv" >&5
--echo "${ECHO_T}yes; with -liconv" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes; with -liconv" >&5
-+echo "${ECHO_T}yes; with -liconv" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_ICONV 1
- _ACEOF
- 
-@@ -13053,7 +13000,7 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--LIBS="$save_LIBS"
-+	LIBS="$save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -13074,29 +13021,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_ICONV 1
- _ACEOF
- 
-@@ -13104,18 +13047,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
- 
--echo "$as_me:$LINENO: checking for nl_langinfo(CODESET)" >&5
--echo $ECHO_N "checking for nl_langinfo(CODESET)... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for nl_langinfo(CODESET)" >&5
-+echo $ECHO_N "checking for nl_langinfo(CODESET)... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -13136,29 +13081,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_NL_LANGINFO_CODESET 1
- _ACEOF
- 
-@@ -13166,26 +13107,27 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
--echo "$as_me:$LINENO: checking --disable-acl argument" >&5
--echo $ECHO_N "checking --disable-acl argument... $ECHO_C" >&6
--# Check whether --enable-acl or --disable-acl was given.
-+{ echo "$as_me:$LINENO: checking --disable-acl argument" >&5
-+echo $ECHO_N "checking --disable-acl argument... $ECHO_C" >&6; }
-+# Check whether --enable-acl was given.
- if test "${enable_acl+set}" = set; then
--  enableval="$enable_acl"
--
-+  enableval=$enable_acl;
- else
-   enable_acl="yes"
--fi;
-+fi
-+
- if test "$enable_acl" = "yes"; then
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--echo "$as_me:$LINENO: checking for acl_get_file in -lposix1e" >&5
--echo $ECHO_N "checking for acl_get_file in -lposix1e... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+{ echo "$as_me:$LINENO: checking for acl_get_file in -lposix1e" >&5
-+echo $ECHO_N "checking for acl_get_file in -lposix1e... $ECHO_C" >&6; }
- if test "${ac_cv_lib_posix1e_acl_get_file+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13198,61 +13140,58 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char acl_get_file ();
- int
- main ()
- {
--acl_get_file ();
-+return acl_get_file ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_posix1e_acl_get_file=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_posix1e_acl_get_file=no
-+	ac_cv_lib_posix1e_acl_get_file=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5
--echo "${ECHO_T}$ac_cv_lib_posix1e_acl_get_file" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix1e_acl_get_file" >&6; }
- if test $ac_cv_lib_posix1e_acl_get_file = yes; then
-   LIBS="$LIBS -lposix1e"
- else
--  echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5
--echo $ECHO_N "checking for acl_get_file in -lacl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5
-+echo $ECHO_N "checking for acl_get_file in -lacl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13265,60 +13204,57 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char acl_get_file ();
- int
- main ()
- {
--acl_get_file ();
-+return acl_get_file ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_acl_acl_get_file=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_acl_acl_get_file=no
-+	ac_cv_lib_acl_acl_get_file=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
--echo "${ECHO_T}$ac_cv_lib_acl_acl_get_file" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5
-+echo "${ECHO_T}$ac_cv_lib_acl_acl_get_file" >&6; }
- if test $ac_cv_lib_acl_acl_get_file = yes; then
-   LIBS="$LIBS -lacl"
--		  echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5
--echo $ECHO_N "checking for fgetxattr in -lattr... $ECHO_C" >&6
-+		  { echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5
-+echo $ECHO_N "checking for fgetxattr in -lattr... $ECHO_C" >&6; }
- if test "${ac_cv_lib_attr_fgetxattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13331,56 +13267,53 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char fgetxattr ();
- int
- main ()
- {
--fgetxattr ();
-+return fgetxattr ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_attr_fgetxattr=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_attr_fgetxattr=no
-+	ac_cv_lib_attr_fgetxattr=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5
--echo "${ECHO_T}$ac_cv_lib_attr_fgetxattr" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5
-+echo "${ECHO_T}$ac_cv_lib_attr_fgetxattr" >&6; }
- if test $ac_cv_lib_attr_fgetxattr = yes; then
-   LIBS="$LIBS -lattr"
- fi
-@@ -13390,8 +13323,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking for POSIX ACL support" >&5
--echo $ECHO_N "checking for POSIX ACL support... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for POSIX ACL support" >&5
-+echo $ECHO_N "checking for POSIX ACL support... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -13415,29 +13348,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_POSIX_ACL 1
- _ACEOF
- 
-@@ -13445,14 +13374,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
--echo "$as_me:$LINENO: checking for Solaris ACL support" >&5
--echo $ECHO_N "checking for Solaris ACL support... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Solaris ACL support" >&5
-+echo $ECHO_N "checking for Solaris ACL support... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -13473,29 +13403,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_SOLARIS_ACL 1
- _ACEOF
- 
-@@ -13503,14 +13429,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
--echo "$as_me:$LINENO: checking for AIX ACL support" >&5
--echo $ECHO_N "checking for AIX ACL support... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for AIX ACL support" >&5
-+echo $ECHO_N "checking for AIX ACL support... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -13542,29 +13469,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_AIX_ACL 1
- _ACEOF
- 
-@@ -13572,31 +13495,32 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- else
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- fi
- 
--echo "$as_me:$LINENO: checking --disable-gpm argument" >&5
--echo $ECHO_N "checking --disable-gpm argument... $ECHO_C" >&6
--# Check whether --enable-gpm or --disable-gpm was given.
-+{ echo "$as_me:$LINENO: checking --disable-gpm argument" >&5
-+echo $ECHO_N "checking --disable-gpm argument... $ECHO_C" >&6; }
-+# Check whether --enable-gpm was given.
- if test "${enable_gpm+set}" = set; then
--  enableval="$enable_gpm"
--
-+  enableval=$enable_gpm;
- else
-   enable_gpm="yes"
--fi;
-+fi
-+
- 
- if test "$enable_gpm" = "yes"; then
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--    echo "$as_me:$LINENO: checking for gpm" >&5
--echo $ECHO_N "checking for gpm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+    { echo "$as_me:$LINENO: checking for gpm" >&5
-+echo $ECHO_N "checking for gpm... $ECHO_C" >&6; }
- if test "${vi_cv_have_gpm+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13618,41 +13542,38 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   	    	    vi_cv_have_gpm=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--vi_cv_have_gpm=no
-+	vi_cv_have_gpm=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$olibs"
- 
- fi
--echo "$as_me:$LINENO: result: $vi_cv_have_gpm" >&5
--echo "${ECHO_T}$vi_cv_have_gpm" >&6
-+{ echo "$as_me:$LINENO: result: $vi_cv_have_gpm" >&5
-+echo "${ECHO_T}$vi_cv_have_gpm" >&6; }
-   if test $vi_cv_have_gpm = yes; then
-     LIBS="$LIBS -lgpm"
-     cat >>confdefs.h <<\_ACEOF
-@@ -13661,12 +13582,12 @@
- 
-   fi
- else
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- fi
- 
--echo "$as_me:$LINENO: checking for rename" >&5
--echo $ECHO_N "checking for rename... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for rename" >&5
-+echo $ECHO_N "checking for rename... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -13683,29 +13604,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_RENAME 1
- _ACEOF
- 
-@@ -13713,14 +13630,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
--echo "$as_me:$LINENO: checking for sysctl" >&5
--echo $ECHO_N "checking for sysctl... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sysctl" >&5
-+echo $ECHO_N "checking for sysctl... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -13745,29 +13663,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_SYSCTL 1
- _ACEOF
- 
-@@ -13775,13 +13688,14 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: not usable" >&5
--echo "${ECHO_T}not usable" >&6
-+	{ echo "$as_me:$LINENO: result: not usable" >&5
-+echo "${ECHO_T}not usable" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--echo "$as_me:$LINENO: checking for sysinfo" >&5
--echo $ECHO_N "checking for sysinfo... $ECHO_C" >&6
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+{ echo "$as_me:$LINENO: checking for sysinfo" >&5
-+echo $ECHO_N "checking for sysinfo... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -13804,29 +13718,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_SYSINFO 1
- _ACEOF
- 
-@@ -13834,13 +13743,14 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: not usable" >&5
--echo "${ECHO_T}not usable" >&6
-+	{ echo "$as_me:$LINENO: result: not usable" >&5
-+echo "${ECHO_T}not usable" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--echo "$as_me:$LINENO: checking for sysinfo.mem_unit" >&5
--echo $ECHO_N "checking for sysinfo.mem_unit... $ECHO_C" >&6
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+{ echo "$as_me:$LINENO: checking for sysinfo.mem_unit" >&5
-+echo $ECHO_N "checking for sysinfo.mem_unit... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -13860,29 +13770,24 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_SYSINFO_MEM_UNIT 1
- _ACEOF
- 
-@@ -13890,257 +13795,116 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--
--echo "$as_me:$LINENO: checking for sysconf" >&5
--echo $ECHO_N "checking for sysconf... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <unistd.h>
--int
--main ()
--{
--	(void)sysconf(_SC_PAGESIZE);
--	(void)sysconf(_SC_PHYS_PAGES);
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
--#define HAVE_SYSCONF 1
--_ACEOF
--
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--echo "$as_me:$LINENO: result: not usable" >&5
--echo "${ECHO_T}not usable" >&6
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--
--
--echo "$as_me:$LINENO: checking size of int" >&5
--echo $ECHO_N "checking size of int... $ECHO_C" >&6
--if test "${ac_cv_sizeof_int+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
--echo "$as_me: error: failed to compile test program" >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <stdio.h>
--		main()
--		{
--		  FILE *f=fopen("conftestval", "w");
--		  if (!f) exit(1);
--		  fprintf(f, "%d\n", (int)sizeof(int));
--		  exit(0);
--		}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_sizeof_int=`cat conftestval`
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--ac_cv_sizeof_int=0
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int" >&6
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_INT $ac_cv_sizeof_int
--_ACEOF
--
--
--echo "$as_me:$LINENO: checking whether memmove/bcopy/memcpy handle overlaps" >&5
--echo $ECHO_N "checking whether memmove/bcopy/memcpy handle overlaps... $ECHO_C" >&6
--bcopy_test_prog='
--main() {
--  char buf[10];
--  strcpy(buf, "abcdefghi");
--  mch_memmove(buf, buf + 2, 3);
--  if (strncmp(buf, "ababcf", 6))
--    exit(1);
--  strcpy(buf, "abcdefghi");
--  mch_memmove(buf + 2, buf, 3);
--  if (strncmp(buf, "cdedef", 6))
--    exit(1);
--  exit(0); /* libc version works properly.  */
--}'
--
--
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
--echo "$as_me: error: failed to compile test program" >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  cat >>confdefs.h <<\_ACEOF
--#define USEMEMMOVE 1
--_ACEOF
-- echo "$as_me:$LINENO: result: memmove does" >&5
--echo "${ECHO_T}memmove does" >&6
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
--echo "$as_me: error: failed to compile test program" >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#define mch_memmove(s,d,l) bcopy(d,s,l) $bcopy_test_prog
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  cat >>confdefs.h <<\_ACEOF
--#define USEBCOPY 1
--_ACEOF
-- echo "$as_me:$LINENO: result: bcopy does" >&5
--echo "${ECHO_T}bcopy does" >&6
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: failed to compile test program" >&5
--echo "$as_me: error: failed to compile test program" >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+{ echo "$as_me:$LINENO: checking for sysconf" >&5
-+echo $ECHO_N "checking for sysconf... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog
-+#include <unistd.h>
-+int
-+main ()
-+{
-+	(void)sysconf(_SC_PAGESIZE);
-+	(void)sysconf(_SC_PHYS_PAGES);
-+
-+  ;
-+  return 0;
-+}
- _ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  cat >>confdefs.h <<\_ACEOF
--#define USEMEMCPY 1
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SYSCONF 1
- _ACEOF
-- echo "$as_me:$LINENO: result: memcpy does" >&5
--echo "${ECHO_T}memcpy does" >&6
-+
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--( exit $ac_status )
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+	{ echo "$as_me:$LINENO: result: not usable" >&5
-+echo "${ECHO_T}not usable" >&6; }
- fi
- 
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+#AC_MSG_CHECKING(size of int)
-+#AC_CACHE_VAL(ac_cv_sizeof_int,
-+#	[AC_TRY_RUN([#include <stdio.h>
-+#		main()
-+#		{
-+#		  FILE *f=fopen("conftestval", "w");
-+#		  if (!f) exit(1);
-+#		  fprintf(f, "%d\n", (int)sizeof(int));
-+#		  exit(0);
-+#		}],
-+#	    ac_cv_sizeof_int=`cat conftestval`,
-+#	    ac_cv_sizeof_int=0,
-+#	    AC_MSG_ERROR(failed to compile test program))])
-+#AC_MSG_RESULT($ac_cv_sizeof_int)
-+#AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int)
-+cat >>confdefs.h <<\_ACEOF
-+#define SIZEOF_INT 4
-+_ACEOF
-+
-+
-+#AC_MSG_CHECKING(whether memmove/bcopy/memcpy handle overlaps)
-+#[bcopy_test_prog='
-+#main() {
-+#  char buf[10];
-+#  strcpy(buf, "abcdefghi");
-+#  mch_memmove(buf, buf + 2, 3);
-+#  if (strncmp(buf, "ababcf", 6))
-+#    exit(1);
-+#  strcpy(buf, "abcdefghi");
-+#  mch_memmove(buf + 2, buf, 3);
-+#  if (strncmp(buf, "cdedef", 6))
-+#    exit(1);
-+#  exit(0); /* libc version works properly.  */
-+#}']
-+
-+#dnl Check for memmove() before bcopy(), makes memmove() be used when both are
-+#dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.
-+
-+#AC_TRY_RUN([#define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog],
-+#    AC_DEFINE(USEMEMMOVE) AC_MSG_RESULT(memmove does),
-+#    AC_TRY_RUN([#define mch_memmove(s,d,l) bcopy(d,s,l) $bcopy_test_prog],
-+#	AC_DEFINE(USEBCOPY) AC_MSG_RESULT(bcopy does),
-+#	AC_TRY_RUN([#define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog],
-+#	    AC_DEFINE(USEMEMCPY) AC_MSG_RESULT(memcpy does), AC_MSG_RESULT(no),
-+#	    AC_MSG_ERROR(failed to compile test program)),
-+#	AC_MSG_ERROR(failed to compile test program)),
-+#    AC_MSG_ERROR(failed to compile test program))
-+cat >>confdefs.h <<\_ACEOF
-+#define USEMEMMOVE 1
-+_ACEOF
-+
-+
- 
- if test "$enable_multibyte" = "yes"; then
-   cflags_save=$CFLAGS
-@@ -14148,8 +13912,8 @@
-   if test -n "$x_includes" ; then
-     CFLAGS="$CFLAGS -I$x_includes"
-     LDFLAGS="$X_LIBS $LDFLAGS -lX11"
--    echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
--echo $ECHO_N "checking whether X_LOCALE needed... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5
-+echo $ECHO_N "checking whether X_LOCALE needed... $ECHO_C" >&6; }
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14166,27 +13930,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14194,45 +13953,41 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char _Xsetlocale ();
- int
- main ()
- {
--_Xsetlocale ();
-+return _Xsetlocale ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 		cat >>confdefs.h <<\_ACEOF
- #define X_LOCALE 1
- _ACEOF
-@@ -14241,26 +13996,28 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   fi
-   CFLAGS=$cflags_save
-   LDFLAGS=$ldflags_save
- fi
- 
--echo "$as_me:$LINENO: checking for _xpg4_setrunelocale in -lxpg4" >&5
--echo $ECHO_N "checking for _xpg4_setrunelocale in -lxpg4... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for _xpg4_setrunelocale in -lxpg4" >&5
-+echo $ECHO_N "checking for _xpg4_setrunelocale in -lxpg4... $ECHO_C" >&6; }
- if test "${ac_cv_lib_xpg4__xpg4_setrunelocale+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14273,63 +14030,60 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char _xpg4_setrunelocale ();
- int
- main ()
- {
--_xpg4_setrunelocale ();
-+return _xpg4_setrunelocale ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   ac_cv_lib_xpg4__xpg4_setrunelocale=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_xpg4__xpg4_setrunelocale=no
-+	ac_cv_lib_xpg4__xpg4_setrunelocale=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
--echo "${ECHO_T}$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
-+echo "${ECHO_T}$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
- if test $ac_cv_lib_xpg4__xpg4_setrunelocale = yes; then
-   LIBS="$LIBS -lxpg4"
- fi
- 
- 
--echo "$as_me:$LINENO: checking how to create tags" >&5
--echo $ECHO_N "checking how to create tags... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to create tags" >&5
-+echo $ECHO_N "checking how to create tags... $ECHO_C" >&6; }
- test -f tags && mv tags tags.save
- if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
-   TAGPRG="ctags -I INIT+ --fields=+S"
-@@ -14343,15 +14097,15 @@
-   (eval ctags -i+m /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="ctags -i+m"
- fi
- test -f tags.save && mv tags.save tags
--echo "$as_me:$LINENO: result: $TAGPRG" >&5
--echo "${ECHO_T}$TAGPRG" >&6
-+{ echo "$as_me:$LINENO: result: $TAGPRG" >&5
-+echo "${ECHO_T}$TAGPRG" >&6; }
- 
--echo "$as_me:$LINENO: checking how to run man with a section nr" >&5
--echo $ECHO_N "checking how to run man with a section nr... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run man with a section nr" >&5
-+echo $ECHO_N "checking how to run man with a section nr... $ECHO_C" >&6; }
- MANDEF="man"
- (eval MANPAGER=cat PAGER=cat man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s"
--echo "$as_me:$LINENO: result: $MANDEF" >&5
--echo "${ECHO_T}$MANDEF" >&6
-+{ echo "$as_me:$LINENO: result: $MANDEF" >&5
-+echo "${ECHO_T}$MANDEF" >&6; }
- if test "$MANDEF" = "man -s"; then
-   cat >>confdefs.h <<\_ACEOF
- #define USEMAN_S 1
-@@ -14359,19 +14113,19 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking --disable-nls argument" >&5
--echo $ECHO_N "checking --disable-nls argument... $ECHO_C" >&6
--# Check whether --enable-nls or --disable-nls was given.
-+{ echo "$as_me:$LINENO: checking --disable-nls argument" >&5
-+echo $ECHO_N "checking --disable-nls argument... $ECHO_C" >&6; }
-+# Check whether --enable-nls was given.
- if test "${enable_nls+set}" = set; then
--  enableval="$enable_nls"
--
-+  enableval=$enable_nls;
- else
-   enable_nls="yes"
--fi;
-+fi
-+
- 
- if test "$enable_nls" = "yes"; then
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
-   INSTALL_LANGS=install-languages
- 
-@@ -14380,8 +14134,8 @@
- 
-   # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_MSGFMT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14394,27 +14148,29 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_MSGFMT="msgfmt"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- MSGFMT=$ac_cv_prog_MSGFMT
- if test -n "$MSGFMT"; then
--  echo "$as_me:$LINENO: result: $MSGFMT" >&5
--echo "${ECHO_T}$MSGFMT" >&6
-+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  echo "$as_me:$LINENO: checking for NLS" >&5
--echo $ECHO_N "checking for NLS... $ECHO_C" >&6
-+
-+  { echo "$as_me:$LINENO: checking for NLS" >&5
-+echo $ECHO_N "checking for NLS... $ECHO_C" >&6; }
-   if test -f po/Makefile; then
-     have_gettext="no"
-     if test -n "$MSGFMT"; then
-@@ -14434,34 +14190,30 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: gettext() works" >&5
--echo "${ECHO_T}gettext() works" >&6; have_gettext="yes"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: gettext() works" >&5
-+echo "${ECHO_T}gettext() works" >&6; }; have_gettext="yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--olibs=$LIBS
-+	olibs=$LIBS
- 	  LIBS="$LIBS -lintl"
- 	  cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -14479,45 +14231,43 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: gettext() works with -lintl" >&5
--echo "${ECHO_T}gettext() works with -lintl" >&6; have_gettext="yes"
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: gettext() works with -lintl" >&5
-+echo "${ECHO_T}gettext() works with -lintl" >&6; }; have_gettext="yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: gettext() doesn't work" >&5
--echo "${ECHO_T}gettext() doesn't work" >&6;
-+	{ echo "$as_me:$LINENO: result: gettext() doesn't work" >&5
-+echo "${ECHO_T}gettext() doesn't work" >&6; };
- 	      LIBS=$olibs
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     else
--      echo "$as_me:$LINENO: result: msgfmt not found - disabled" >&5
--echo "${ECHO_T}msgfmt not found - disabled" >&6;
-+      { echo "$as_me:$LINENO: result: msgfmt not found - disabled" >&5
-+echo "${ECHO_T}msgfmt not found - disabled" >&6; };
-     fi
-     if test $have_gettext = "yes"; then
-       cat >>confdefs.h <<\_ACEOF
-@@ -14530,9 +14280,9 @@
- for ac_func in bind_textdomain_codeset
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -14558,68 +14308,60 @@
- 
- #undef $ac_func
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* 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
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14628,8 +14370,8 @@
- fi
- done
- 
--            echo "$as_me:$LINENO: checking for _nl_msg_cat_cntr" >&5
--echo $ECHO_N "checking for _nl_msg_cat_cntr... $ECHO_C" >&6
-+            { echo "$as_me:$LINENO: checking for _nl_msg_cat_cntr" >&5
-+echo $ECHO_N "checking for _nl_msg_cat_cntr... $ECHO_C" >&6; }
-       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14647,29 +14389,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF
- #define HAVE_NL_MSG_CAT_CNTR 1
- _ACEOF
- 
-@@ -14677,33 +14415,34 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     fi
-   else
--    echo "$as_me:$LINENO: result: no \"po/Makefile\" - disabled" >&5
--echo "${ECHO_T}no \"po/Makefile\" - disabled" >&6;
-+    { echo "$as_me:$LINENO: result: no \"po/Makefile\" - disabled" >&5
-+echo "${ECHO_T}no \"po/Makefile\" - disabled" >&6; };
-   fi
- else
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- fi
- 
- if test "${ac_cv_header_dlfcn_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for dlfcn.h" >&5
--echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dlfcn.h" >&5
-+echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_dlfcn_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
--echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
-+echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking dlfcn.h usability" >&5
--echo $ECHO_N "checking dlfcn.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dlfcn.h usability" >&5
-+echo $ECHO_N "checking dlfcn.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14714,41 +14453,37 @@
- #include <dlfcn.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking dlfcn.h presence" >&5
--echo $ECHO_N "checking dlfcn.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dlfcn.h presence" >&5
-+echo $ECHO_N "checking dlfcn.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14757,24 +14492,22 @@
- /* end confdefs.h.  */
- #include <dlfcn.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -14782,9 +14515,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14808,87 +14542,76 @@
- echo "$as_me: WARNING: dlfcn.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for dlfcn.h" >&5
--echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for dlfcn.h" >&5
-+echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_dlfcn_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_dlfcn_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
--echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
-+echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6; }
- 
- fi
- if test $ac_cv_header_dlfcn_h = yes; then
-   DLL=dlfcn.h
- else
-   if test "${ac_cv_header_dl_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for dl.h" >&5
--echo $ECHO_N "checking for dl.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dl.h" >&5
-+echo $ECHO_N "checking for dl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_dl_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5
--echo "${ECHO_T}$ac_cv_header_dl_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_dl_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking dl.h usability" >&5
--echo $ECHO_N "checking dl.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dl.h usability" >&5
-+echo $ECHO_N "checking dl.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <dl.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <dl.h>
-+_ACEOF
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking dl.h presence" >&5
--echo $ECHO_N "checking dl.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dl.h presence" >&5
-+echo $ECHO_N "checking dl.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -14897,24 +14620,22 @@
- /* end confdefs.h.  */
- #include <dl.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -14922,9 +14643,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14948,25 +14670,18 @@
- echo "$as_me: WARNING: dl.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: dl.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: dl.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for dl.h" >&5
--echo $ECHO_N "checking for dl.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for dl.h" >&5
-+echo $ECHO_N "checking for dl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_dl_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_dl_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5
--echo "${ECHO_T}$ac_cv_header_dl_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_dl_h" >&6; }
- 
- fi
- if test $ac_cv_header_dl_h = yes; then
-@@ -14983,8 +14698,8 @@
- #define HAVE_DLFCN_H 1
- _ACEOF
- 
--  echo "$as_me:$LINENO: checking for dlopen()" >&5
--echo $ECHO_N "checking for dlopen()... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dlopen()" >&5
-+echo $ECHO_N "checking for dlopen()... $ECHO_C" >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15004,29 +14719,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6;
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; };
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DLOPEN 1
-@@ -15036,10 +14747,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6;
--	      echo "$as_me:$LINENO: checking for dlopen() in -ldl" >&5
--echo $ECHO_N "checking for dlopen() in -ldl... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; };
-+	      { echo "$as_me:$LINENO: checking for dlopen() in -ldl" >&5
-+echo $ECHO_N "checking for dlopen() in -ldl... $ECHO_C" >&6; }
- 	      olibs=$LIBS
- 	      LIBS="$LIBS -ldl"
- 	      cat >conftest.$ac_ext <<_ACEOF
-@@ -15061,29 +14772,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6;
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; };
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DLOPEN 1
-@@ -15093,17 +14800,19 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6;
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; };
- 			  LIBS=$olibs
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
--      echo "$as_me:$LINENO: checking for dlsym()" >&5
--echo $ECHO_N "checking for dlsym()... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for dlsym()" >&5
-+echo $ECHO_N "checking for dlsym()... $ECHO_C" >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15123,29 +14832,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6;
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; };
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DLSYM 1
-@@ -15155,10 +14860,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6;
--	      echo "$as_me:$LINENO: checking for dlsym() in -ldl" >&5
--echo $ECHO_N "checking for dlsym() in -ldl... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; };
-+	      { echo "$as_me:$LINENO: checking for dlsym() in -ldl" >&5
-+echo $ECHO_N "checking for dlsym() in -ldl... $ECHO_C" >&6; }
- 	      olibs=$LIBS
- 	      LIBS="$LIBS -ldl"
- 	      cat >conftest.$ac_ext <<_ACEOF
-@@ -15180,29 +14885,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6;
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; };
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DLSYM 1
-@@ -15212,14 +14913,16 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6;
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; };
- 			  LIBS=$olibs
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- elif test x${DLL} = xdl.h; then
- 
-@@ -15227,8 +14930,8 @@
- #define HAVE_DL_H 1
- _ACEOF
- 
--  echo "$as_me:$LINENO: checking for shl_load()" >&5
--echo $ECHO_N "checking for shl_load()... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for shl_load()" >&5
-+echo $ECHO_N "checking for shl_load()... $ECHO_C" >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15248,29 +14951,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6;
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; };
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SHL_LOAD 1
-@@ -15280,10 +14979,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6;
--	  echo "$as_me:$LINENO: checking for shl_load() in -ldld" >&5
--echo $ECHO_N "checking for shl_load() in -ldld... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; };
-+	  { echo "$as_me:$LINENO: checking for shl_load() in -ldld" >&5
-+echo $ECHO_N "checking for shl_load() in -ldld... $ECHO_C" >&6; }
- 	  olibs=$LIBS
- 	  LIBS="$LIBS -ldld"
- 	  cat >conftest.$ac_ext <<_ACEOF
-@@ -15305,29 +15004,25 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6;
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; };
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SHL_LOAD 1
-@@ -15337,32 +15032,35 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6;
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; };
- 		  LIBS=$olibs
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- 
- for ac_header in setjmp.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15373,41 +15071,37 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -15416,24 +15110,22 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -15441,9 +15133,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -15467,25 +15160,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -15507,24 +15194,24 @@
- 
- if test "x$MACOSX" = "xyes" && test "x$CARBON" = "xyes" \
- 	&& test "x$GUITYPE" != "xCARBONGUI"; then
--  echo "$as_me:$LINENO: checking whether we need -framework Carbon" >&5
--echo $ECHO_N "checking whether we need -framework Carbon... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking whether we need -framework Carbon" >&5
-+echo $ECHO_N "checking whether we need -framework Carbon... $ECHO_C" >&6; }
-     if test "x$enable_multibyte" = "xyes" || test "x$features" = "xbig" \
- 	|| test "x$features" = "xhuge"; then
-     LIBS="$LIBS -framework Carbon"
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+    { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   else
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   fi
- fi
- if test "x$MACARCH" = "xboth"; then
-   LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
- fi
- 
--echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
--echo $ECHO_N "checking for GCC 3 or later... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
-+echo $ECHO_N "checking for GCC 3 or later... $ECHO_C" >&6; }
- DEPEND_CFLAGS_FILTER=
- if test "$GCC" = yes; then
-   gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
-@@ -15533,15 +15220,16 @@
-   fi
- fi
- if test "$DEPEND_CFLAGS_FILTER" = ""; then
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- else
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- fi
- 
- 
--          ac_config_files="$ac_config_files auto/config.mk:config.mk.in"
-+ac_config_files="$ac_config_files auto/config.mk:config.mk.in"
-+
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -15560,39 +15248,58 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-       # `set' does not quote correctly, so add quotes (double-quote
-       # substitution turns \\\\ into \\, and sed turns \\ into \).
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -15601,32 +15308,18 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- 
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
--  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[	 ]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[	 ]*$//;
--}'
--fi
--
- DEFS=-DHAVE_CONFIG_H
- 
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
--  ac_i=`echo "$ac_i" |
--	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
--  # 2. Add them.
--  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
--  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+  ac_i=`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.
-+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
- 
-@@ -15657,17 +15350,45 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
- fi
--DUALCASE=1; export DUALCASE # for MKS sh
- 
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -15677,8 +15398,43 @@
- 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.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -15692,18 +15448,19 @@
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
--    $as_unset $as_var
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
- 
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
-@@ -15711,159 +15468,120 @@
- 
- 
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
--
--
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
- 
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
--	 /*)
--	   if ("$as_dir/$as_base" -c '
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- 
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-     sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-       N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
-+      s/-\n.*//
-     ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
--    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+  chmod +x "$as_me.lineno" ||
-+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- 
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
- esac
- 
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
- else
-   as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
- 
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
-@@ -15872,7 +15590,28 @@
-   as_mkdir_p=false
- fi
- 
--as_executable_p="test -f"
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+        test -d "$1/.";
-+      else
-+	case $1 in
-+        -*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
-+fi
-+as_executable_p=$as_test_x
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -15881,31 +15620,14 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- exec 6>&1
- 
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# Save the log message, to keep $[0] and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling.  Logging --version etc. is OK.
--exec 5>>auto/config.log
--{
--  echo
--  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
-+# values after options handling.
-+ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.61.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -15913,30 +15635,19 @@
-   CONFIG_COMMANDS = $CONFIG_COMMANDS
-   $ $0 $@
- 
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
- 
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
--  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
--  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
--  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
- 
--if test -n "$ac_config_commands"; then
--  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+_ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -15944,7 +15655,7 @@
- Usage: $0 [OPTIONS] [FILE]...
- 
-   -h, --help       print this help, then exit
--  -V, --version    print version number, then exit
-+  -V, --version    print version number and configuration settings, then exit
-   -q, --quiet      do not print progress messages
-   -d, --debug      don't remove temporary files
-       --recheck    update $as_me by reconfiguring in the same conditions
-@@ -15960,18 +15671,20 @@
- $config_headers
- 
- Report bugs to <bug-autoconf at gnu.org>."
--_ACEOF
- 
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.59,
--  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.61,
-+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
- 
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
- _ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -15982,39 +15695,24 @@
- do
-   case $1 in
-   --*=*)
--    ac_option=`expr "x$1" : 'x\([^=]*\)='`
--    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-     ac_shift=:
-     ;;
--  -*)
-+  *)
-     ac_option=$1
-     ac_optarg=$2
-     ac_shift=shift
-     ;;
--  *) # This is not an option, so the user has probably given explicit
--     # arguments.
--     ac_option=$1
--     ac_need_defaults=false;;
-   esac
- 
-   case $ac_option in
-   # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     ac_cs_recheck=: ;;
--  --version | --vers* | -V )
--    echo "$ac_cs_version"; exit 0 ;;
--  --he | --h)
--    # Conflict between --help and --header
--    { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; };;
--  --help | --hel | -h )
--    echo "$ac_cs_usage"; exit 0 ;;
--  --debug | --d* | -d )
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    echo "$ac_cs_version"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-     $ac_shift
-@@ -16024,18 +15722,24 @@
-     $ac_shift
-     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-     ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; };;
-+  --help | --hel | -h )
-+    echo "$ac_cs_usage"; exit ;;
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil | --si | --s)
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
-+  -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
- 
--  *) ac_config_targets="$ac_config_targets $1" ;;
-+  *) ac_config_targets="$ac_config_targets $1"
-+     ac_need_defaults=false ;;
- 
-   esac
-   shift
-@@ -16051,29 +15755,43 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
--  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
--  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+  CONFIG_SHELL=$SHELL
-+  export CONFIG_SHELL
-+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
- 
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+  echo "$ac_log"
-+} >&5
- 
--
--
--
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+_ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- for ac_config_target in $ac_config_targets
- do
--  case "$ac_config_target" in
--  # Handling of arguments.
--  "auto/config.mk" ) CONFIG_FILES="$CONFIG_FILES auto/config.mk:config.mk.in" ;;
--  "auto/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS auto/config.h:config.h.in" ;;
-+  case $ac_config_target in
-+    "auto/config.h") CONFIG_HEADERS="$CONFIG_HEADERS auto/config.h:config.h.in" ;;
-+    "auto/config.mk") CONFIG_FILES="$CONFIG_FILES auto/config.mk:config.mk.in" ;;
-+
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
- done
- 
-+
- # If the user did not use the arguments to specify the items to instantiate,
- # then the envvar interface is used.  Set only those that are not.
- # We use the long form for the default assignment because of an extremely
-@@ -16084,373 +15802,483 @@
- fi
- 
- # Have a temporary directory for convenience.  Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
-+# simply because there is no reason against having it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
--  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-   trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
- 
- {
--  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-   test -n "$tmp" && test -d "$tmp"
- }  ||
- {
--  tmp=./confstat$$-$RANDOM
--  (umask 077 && mkdir $tmp)
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
- } ||
- {
-    echo "$me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
- 
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
- #
--# CONFIG_FILES section.
-+# Set up the sed scripts for CONFIG_FILES section.
- #
- 
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
--  # Protect against being on the right side of a sed subst in config.status.
--  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
--   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s, at SHELL@,$SHELL,;t t
--s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s, at exec_prefix@,$exec_prefix,;t t
--s, at prefix@,$prefix,;t t
--s, at program_transform_name@,$program_transform_name,;t t
--s, at bindir@,$bindir,;t t
--s, at sbindir@,$sbindir,;t t
--s, at libexecdir@,$libexecdir,;t t
--s, at datadir@,$datadir,;t t
--s, at sysconfdir@,$sysconfdir,;t t
--s, at sharedstatedir@,$sharedstatedir,;t t
--s, at localstatedir@,$localstatedir,;t t
--s, at libdir@,$libdir,;t t
--s, at includedir@,$includedir,;t t
--s, at oldincludedir@,$oldincludedir,;t t
--s, at infodir@,$infodir,;t t
--s, at mandir@,$mandir,;t t
--s, at build_alias@,$build_alias,;t t
--s, at host_alias@,$host_alias,;t t
--s, at target_alias@,$target_alias,;t t
--s, at DEFS@,$DEFS,;t t
--s, at ECHO_C@,$ECHO_C,;t t
--s, at ECHO_N@,$ECHO_N,;t t
--s, at ECHO_T@,$ECHO_T,;t t
--s, at LIBS@,$LIBS,;t t
--s, at SET_MAKE@,$SET_MAKE,;t t
--s, at CC@,$CC,;t t
--s, at CFLAGS@,$CFLAGS,;t t
--s, at LDFLAGS@,$LDFLAGS,;t t
--s, at CPPFLAGS@,$CPPFLAGS,;t t
--s, at ac_ct_CC@,$ac_ct_CC,;t t
--s, at EXEEXT@,$EXEEXT,;t t
--s, at OBJEXT@,$OBJEXT,;t t
--s, at CPP@,$CPP,;t t
--s, at EGREP@,$EGREP,;t t
--s, at AWK@,$AWK,;t t
--s, at STRIP@,$STRIP,;t t
--s, at CPP_MM@,$CPP_MM,;t t
--s, at OS_EXTRA_SRC@,$OS_EXTRA_SRC,;t t
--s, at OS_EXTRA_OBJ@,$OS_EXTRA_OBJ,;t t
--s, at VIMNAME@,$VIMNAME,;t t
--s, at EXNAME@,$EXNAME,;t t
--s, at VIEWNAME@,$VIEWNAME,;t t
--s, at line_break@,$line_break,;t t
--s, at dovimdiff@,$dovimdiff,;t t
--s, at dogvimdiff@,$dogvimdiff,;t t
--s, at compiledby@,$compiledby,;t t
--s, at vi_cv_path_mzscheme@,$vi_cv_path_mzscheme,;t t
--s, at MZSCHEME_SRC@,$MZSCHEME_SRC,;t t
--s, at MZSCHEME_OBJ@,$MZSCHEME_OBJ,;t t
--s, at MZSCHEME_PRO@,$MZSCHEME_PRO,;t t
--s, at MZSCHEME_LIBS@,$MZSCHEME_LIBS,;t t
--s, at MZSCHEME_CFLAGS@,$MZSCHEME_CFLAGS,;t t
--s, at vi_cv_path_perl@,$vi_cv_path_perl,;t t
--s, at vi_cv_perllib@,$vi_cv_perllib,;t t
--s, at shrpenv@,$shrpenv,;t t
--s, at PERL_SRC@,$PERL_SRC,;t t
--s, at PERL_OBJ@,$PERL_OBJ,;t t
--s, at PERL_PRO@,$PERL_PRO,;t t
--s, at PERL_CFLAGS@,$PERL_CFLAGS,;t t
--s, at PERL_LIBS@,$PERL_LIBS,;t t
--s, at vi_cv_path_python@,$vi_cv_path_python,;t t
--s, at PYTHON_CONFDIR@,$PYTHON_CONFDIR,;t t
--s, at PYTHON_LIBS@,$PYTHON_LIBS,;t t
--s, at PYTHON_GETPATH_CFLAGS@,$PYTHON_GETPATH_CFLAGS,;t t
--s, at PYTHON_CFLAGS@,$PYTHON_CFLAGS,;t t
--s, at PYTHON_SRC@,$PYTHON_SRC,;t t
--s, at PYTHON_OBJ@,$PYTHON_OBJ,;t t
--s, at vi_cv_path_tcl@,$vi_cv_path_tcl,;t t
--s, at TCL_SRC@,$TCL_SRC,;t t
--s, at TCL_OBJ@,$TCL_OBJ,;t t
--s, at TCL_PRO@,$TCL_PRO,;t t
--s, at TCL_CFLAGS@,$TCL_CFLAGS,;t t
--s, at TCL_LIBS@,$TCL_LIBS,;t t
--s, at vi_cv_path_ruby@,$vi_cv_path_ruby,;t t
--s, at RUBY_SRC@,$RUBY_SRC,;t t
--s, at RUBY_OBJ@,$RUBY_OBJ,;t t
--s, at RUBY_PRO@,$RUBY_PRO,;t t
--s, at RUBY_CFLAGS@,$RUBY_CFLAGS,;t t
--s, at RUBY_LIBS@,$RUBY_LIBS,;t t
--s, at WORKSHOP_SRC@,$WORKSHOP_SRC,;t t
--s, at WORKSHOP_OBJ@,$WORKSHOP_OBJ,;t t
--s, at NETBEANS_SRC@,$NETBEANS_SRC,;t t
--s, at NETBEANS_OBJ@,$NETBEANS_OBJ,;t t
--s, at SNIFF_SRC@,$SNIFF_SRC,;t t
--s, at SNIFF_OBJ@,$SNIFF_OBJ,;t t
--s, at xmkmfpath@,$xmkmfpath,;t t
--s, at X_CFLAGS@,$X_CFLAGS,;t t
--s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
--s, at X_LIBS@,$X_LIBS,;t t
--s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
--s, at X_LIB@,$X_LIB,;t t
--s, at GTK_CONFIG@,$GTK_CONFIG,;t t
--s, at GTK12_CONFIG@,$GTK12_CONFIG,;t t
--s, at PKG_CONFIG@,$PKG_CONFIG,;t t
--s, at GTK_CFLAGS@,$GTK_CFLAGS,;t t
--s, at GTK_LIBS@,$GTK_LIBS,;t t
--s, at GTK_LIBNAME@,$GTK_LIBNAME,;t t
--s, at GNOME_LIBS@,$GNOME_LIBS,;t t
--s, at GNOME_LIBDIR@,$GNOME_LIBDIR,;t t
--s, at GNOME_INCLUDEDIR@,$GNOME_INCLUDEDIR,;t t
--s, at GNOME_CONFIG@,$GNOME_CONFIG,;t t
--s, at MOTIF_LIBNAME@,$MOTIF_LIBNAME,;t t
--s, at NARROW_PROTO@,$NARROW_PROTO,;t t
--s, at GUI_INC_LOC@,$GUI_INC_LOC,;t t
--s, at GUI_LIB_LOC@,$GUI_LIB_LOC,;t t
--s, at GUITYPE@,$GUITYPE,;t t
--s, at GUI_X_LIBS@,$GUI_X_LIBS,;t t
--s, at HANGULIN_SRC@,$HANGULIN_SRC,;t t
--s, at HANGULIN_OBJ@,$HANGULIN_OBJ,;t t
--s, at TAGPRG@,$TAGPRG,;t t
--s, at INSTALL_LANGS@,$INSTALL_LANGS,;t t
--s, at INSTALL_TOOL_LANGS@,$INSTALL_TOOL_LANGS,;t t
--s, at MSGFMT@,$MSGFMT,;t t
--s, at MAKEMO@,$MAKEMO,;t t
--s, at DEPEND_CFLAGS_FILTER@,$DEPEND_CFLAGS_FILTER,;t t
--s, at LIBOBJS@,$LIBOBJS,;t t
--s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
--
--_ACEOF
--
--  cat >>$CONFIG_STATUS <<\_ACEOF
--  # Split the substitutions into bite-sized pieces for seds with
--  # small command number limits, like on Digital OSF/1 and HP-UX.
--  ac_max_sed_lines=48
--  ac_sed_frag=1 # Number of current file.
--  ac_beg=1 # First line for current file.
--  ac_end=$ac_max_sed_lines # Line after last line for current file.
--  ac_more_lines=:
--  ac_sed_cmds=
--  while $ac_more_lines; do
--    if test $ac_beg -gt 1; then
--      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    else
--      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    fi
--    if test ! -s $tmp/subs.frag; then
--      ac_more_lines=false
--    else
--      # The purpose of the label and of the branching condition is to
--      # speed up the sed processing (if there are no `@' at all, there
--      # is no need to browse any of the substitutions).
--      # These are the two extra sed commands mentioned above.
--      (echo ':t
--  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
--      if test -z "$ac_sed_cmds"; then
--	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
--      else
--	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
--      fi
--      ac_sed_frag=`expr $ac_sed_frag + 1`
--      ac_beg=$ac_end
--      ac_end=`expr $ac_end + $ac_max_sed_lines`
--    fi
--  done
--  if test -z "$ac_sed_cmds"; then
--    ac_sed_cmds=cat
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+CPP!$CPP$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+AWK!$AWK$ac_delim
-+STRIP!$STRIP$ac_delim
-+CPP_MM!$CPP_MM$ac_delim
-+OS_EXTRA_SRC!$OS_EXTRA_SRC$ac_delim
-+OS_EXTRA_OBJ!$OS_EXTRA_OBJ$ac_delim
-+VIMNAME!$VIMNAME$ac_delim
-+EXNAME!$EXNAME$ac_delim
-+VIEWNAME!$VIEWNAME$ac_delim
-+line_break!$line_break$ac_delim
-+dovimdiff!$dovimdiff$ac_delim
-+dogvimdiff!$dogvimdiff$ac_delim
-+compiledby!$compiledby$ac_delim
-+vi_cv_path_mzscheme!$vi_cv_path_mzscheme$ac_delim
-+MZSCHEME_SRC!$MZSCHEME_SRC$ac_delim
-+MZSCHEME_OBJ!$MZSCHEME_OBJ$ac_delim
-+MZSCHEME_PRO!$MZSCHEME_PRO$ac_delim
-+MZSCHEME_LIBS!$MZSCHEME_LIBS$ac_delim
-+MZSCHEME_CFLAGS!$MZSCHEME_CFLAGS$ac_delim
-+vi_cv_path_perl!$vi_cv_path_perl$ac_delim
-+vi_cv_perllib!$vi_cv_perllib$ac_delim
-+shrpenv!$shrpenv$ac_delim
-+PERL_SRC!$PERL_SRC$ac_delim
-+PERL_OBJ!$PERL_OBJ$ac_delim
-+PERL_PRO!$PERL_PRO$ac_delim
-+PERL_CFLAGS!$PERL_CFLAGS$ac_delim
-+PERL_LIBS!$PERL_LIBS$ac_delim
-+vi_cv_path_python!$vi_cv_path_python$ac_delim
-+PYTHON_CONFDIR!$PYTHON_CONFDIR$ac_delim
-+PYTHON_LIBS!$PYTHON_LIBS$ac_delim
-+PYTHON_GETPATH_CFLAGS!$PYTHON_GETPATH_CFLAGS$ac_delim
-+PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim
-+PYTHON_SRC!$PYTHON_SRC$ac_delim
-+PYTHON_OBJ!$PYTHON_OBJ$ac_delim
-+vi_cv_path_tcl!$vi_cv_path_tcl$ac_delim
-+TCL_SRC!$TCL_SRC$ac_delim
-+TCL_OBJ!$TCL_OBJ$ac_delim
-+TCL_PRO!$TCL_PRO$ac_delim
-+TCL_CFLAGS!$TCL_CFLAGS$ac_delim
-+TCL_LIBS!$TCL_LIBS$ac_delim
-+vi_cv_path_ruby!$vi_cv_path_ruby$ac_delim
-+RUBY_SRC!$RUBY_SRC$ac_delim
-+RUBY_OBJ!$RUBY_OBJ$ac_delim
-+RUBY_PRO!$RUBY_PRO$ac_delim
-+RUBY_CFLAGS!$RUBY_CFLAGS$ac_delim
-+RUBY_LIBS!$RUBY_LIBS$ac_delim
-+WORKSHOP_SRC!$WORKSHOP_SRC$ac_delim
-+WORKSHOP_OBJ!$WORKSHOP_OBJ$ac_delim
-+NETBEANS_SRC!$NETBEANS_SRC$ac_delim
-+NETBEANS_OBJ!$NETBEANS_OBJ$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
--fi # test -n "$CONFIG_FILES"
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+SNIFF_SRC!$SNIFF_SRC$ac_delim
-+SNIFF_OBJ!$SNIFF_OBJ$ac_delim
-+xmkmfpath!$xmkmfpath$ac_delim
-+XMKMF!$XMKMF$ac_delim
-+X_CFLAGS!$X_CFLAGS$ac_delim
-+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-+X_LIBS!$X_LIBS$ac_delim
-+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-+X_LIB!$X_LIB$ac_delim
-+GTK_CONFIG!$GTK_CONFIG$ac_delim
-+GTK12_CONFIG!$GTK12_CONFIG$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
-+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
-+GTK_LIBS!$GTK_LIBS$ac_delim
-+GTK_LIBNAME!$GTK_LIBNAME$ac_delim
-+GNOME_LIBS!$GNOME_LIBS$ac_delim
-+GNOME_LIBDIR!$GNOME_LIBDIR$ac_delim
-+GNOME_INCLUDEDIR!$GNOME_INCLUDEDIR$ac_delim
-+GNOME_CONFIG!$GNOME_CONFIG$ac_delim
-+MOTIF_LIBNAME!$MOTIF_LIBNAME$ac_delim
-+NARROW_PROTO!$NARROW_PROTO$ac_delim
-+GUI_INC_LOC!$GUI_INC_LOC$ac_delim
-+GUI_LIB_LOC!$GUI_LIB_LOC$ac_delim
-+GUITYPE!$GUITYPE$ac_delim
-+GUI_X_LIBS!$GUI_X_LIBS$ac_delim
-+HANGULIN_SRC!$HANGULIN_SRC$ac_delim
-+HANGULIN_OBJ!$HANGULIN_OBJ$ac_delim
-+TAGPRG!$TAGPRG$ac_delim
-+INSTALL_LANGS!$INSTALL_LANGS$ac_delim
-+INSTALL_TOOL_LANGS!$INSTALL_TOOL_LANGS$ac_delim
-+MSGFMT!$MSGFMT$ac_delim
-+MAKEMO!$MAKEMO$ac_delim
-+DEPEND_CFLAGS_FILTER!$DEPEND_CFLAGS_FILTER$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
- 
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
- _ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
-+
- cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--	cat >$tmp/stdin
--	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+   { (exit 1); exit 1; }; };;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+   { (exit 1); exit 1; }; };;
-+      esac
-+      ac_file_inputs="$ac_file_inputs $ac_f"
-+    done
-+
-+    # Let's still pretend it is `configure' which instantiates (i.e., don't
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input="Generated from "`IFS=:
-+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
-+      { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    fi
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin";;
-+    esac
-+    ;;
-   esac
- 
--  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+  ac_dir=`$as_dirname -- "$ac_file" ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$ac_file" : 'X\(//\)[^/]' \| \
- 	 X"$ac_file" : 'X\(//\)$' \| \
--	 X"$ac_file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  { as_dir="$ac_dir"
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-     as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-     done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
--
-   ac_builddir=.
- 
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`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/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
- 
- case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
-+  .)  # We are building in place.
-     ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-     ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
- 
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
- 
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    configure_input=
--  else
--    configure_input="$ac_file.  "
--  fi
--  configure_input=$configure_input"Generated from `echo $ac_file_in |
--				     sed 's,.*/,,'` by configure."
-+_ACEOF
- 
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--	 # Absolute (can't be DOS-style, as IFS=:)
--	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 echo "$f";;
--      *) # Relative
--	 if test -f "$f"; then
--	   # Build tree
--	   echo "$f"
--	 elif test -f "$srcdir/$f"; then
--	   # Source tree
--	   echo "$srcdir/$f"
--	 else
--	   # /dev/null tree
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 fi;;
--      esac
--    done` || { (exit 1); exit 1; }
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+
-+case `sed -n '/datarootdir/ {
-+  p
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+    s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
- _ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
- $extrasub
-@@ -16458,251 +16286,136 @@
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s, at configure_input@,$configure_input,;t t
--s, at srcdir@,$ac_srcdir,;t t
--s, at abs_srcdir@,$ac_abs_srcdir,;t t
--s, at top_srcdir@,$ac_top_srcdir,;t t
--s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s, at builddir@,$ac_builddir,;t t
--s, at abs_builddir@,$ac_abs_builddir,;t t
--s, at top_builddir@,$ac_top_builddir,;t t
--s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
--  rm -f $tmp/stdin
--  if test x"$ac_file" != x-; then
--    mv $tmp/out $ac_file
--  else
--    cat $tmp/out
--    rm -f $tmp/out
--  fi
--
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_HEADER section.
--#
--
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
--ac_dB='[	 ].*$,\1#\2'
--ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
-+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;}
- 
--for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  rm -f "$tmp/stdin"
-   case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--	cat >$tmp/stdin
--	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
-+  -) cat "$tmp/out"; rm -f "$tmp/out";;
-+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-   esac
-+ ;;
-+  :H)
-+  #
-+  # CONFIG_HEADER
-+  #
-+_ACEOF
-+
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status.  If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless.  But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-+ac_dB='\\)[	 (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
- 
--  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--	 # Absolute (can't be DOS-style, as IFS=:)
--	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 # Do quote $f, to prevent DOS paths from being IFS'd.
--	 echo "$f";;
--      *) # Relative
--	 if test -f "$f"; then
--	   # Build tree
--	   echo "$f"
--	 elif test -f "$srcdir/$f"; then
--	   # Source tree
--	   echo "$srcdir/$f"
--	 else
--	   # /dev/null tree
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 fi;;
--      esac
--    done` || { (exit 1); exit 1; }
--  # Remove the trailing spaces.
--  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
--
--_ACEOF
--
--# Transform confdefs.h into two sed scripts, `conftest.defines' and
--# `conftest.undefs', that substitutes the proper values into
--# config.h.in to produce config.h.  The first handles `#define'
--# templates, and the second `#undef' templates.
--# And first: Protect against being on the right side of a sed subst in
--# config.status.  Protect against being in an unquoted here document
--# in config.status.
--rm -f conftest.defines conftest.undefs
--# Using a here document instead of a string reduces the quoting nightmare.
--# Putting comments in sed scripts is not portable.
--#
--# `end' is used to avoid that the second main sed command (meant for
--# 0-ary CPP macros) applies to n-ary macro definitions.
--# See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\_ACEOF
--s/[\\&,]/\\&/g
--s,[\\$`],\\&,g
--t clear
--: clear
--s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--t end
--s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--: end
--_ACEOF
--# If some macros were called several times there might be several times
--# the same #defines, which is useless.  Nevertheless, we may not want to
--# sort them, since we want the *last* AC-DEFINE to be honored.
--uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--rm -f confdef2sed.sed
-+uniq confdefs.h |
-+  sed -n '
-+	t rset
-+	:rset
-+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-+	t ok
-+	d
-+	:ok
-+	s/[\\&,]/\\&/g
-+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+  ' >>conftest.defines
- 
--# This sed command replaces #undef with comments.  This is necessary, for
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments.  This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\_ACEOF
--s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--_ACEOF
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[	 #]*u.*,/* & */,' >>conftest.defines
-+
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
- 
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo '  :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
-+while :
- do
--  # Write a limited-size here document to $tmp/defines.sed.
--  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#define' lines.
--  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+  # Write a here document:
-+    cat >>$CONFIG_STATUS <<_ACEOF
-+    # First, check the format of the line:
-+    cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-+b
-+:def
-+_ACEOF
-+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-   echo 'CEOF
--  sed -f $tmp/defines.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+  grep . conftest.tail >/dev/null || break
-   rm -f conftest.defines
-   mv conftest.tail conftest.defines
- done
--rm -f conftest.defines
--echo '  fi # grep' >>$CONFIG_STATUS
--echo >>$CONFIG_STATUS
--
--# Break up conftest.undefs because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.undefs >/dev/null
--do
--  # Write a limited-size here document to $tmp/undefs.sed.
--  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#undef'
--  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
--  echo 'CEOF
--  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
--  rm -f conftest.undefs
--  mv conftest.tail conftest.undefs
--done
--rm -f conftest.undefs
-+rm -f conftest.defines conftest.tail
- 
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
- cat >>$CONFIG_STATUS <<\_ACEOF
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    echo "/* Generated by configure.  */" >$tmp/config.h
--  else
--    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
--  fi
--  cat $tmp/in >>$tmp/config.h
--  rm -f $tmp/in
-   if test x"$ac_file" != x-; then
--    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-+    echo "/* $configure_input  */" >"$tmp/config.h"
-+    cat "$ac_result" >>"$tmp/config.h"
-+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
--      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$ac_file" : 'X\(//\)[^/]' \| \
--	 X"$ac_file" : 'X\(//\)$' \| \
--	 X"$ac_file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--      { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
--    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
--
-       rm -f $ac_file
--      mv $tmp/config.h $ac_file
-+      mv "$tmp/config.h" $ac_file
-     fi
-   else
--    cat $tmp/config.h
--    rm -f $tmp/config.h
-+    echo "/* $configure_input  */"
-+    cat "$ac_result"
-   fi
--done
--_ACEOF
-+  rm -f "$tmp/out12"
-+ ;;
-+
-+
-+  esac
-+
-+done # for ac_tag
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
- 
- { (exit 0); exit 0; }
- _ACEOF
-@@ -16725,7 +16438,7 @@
-     ac_config_status_args="$ac_config_status_args --quiet"
-   exec 5>/dev/null
-   $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
--  exec 5>>auto/config.log
-+  exec 5>>config.log
-   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-   # would make configure fail if this is the last instruction.
-   $ac_cs_success || { (exit 1); exit 1; }
+ bcopy_test_prog='
diff --git a/package/vim/patches b/package/vim/patches
index 2d5f457..d2a4050 100644
--- a/package/vim/patches
+++ b/package/vim/patches
@@ -1,300 +1,5 @@
 001
 002
+003
 004
 005
-006
-008
-009
-010
-011
-012
-013
-014
-015
-016
-017
-018
-019
-020
-021
-022
-023
-024
-025
-026
-027
-028
-029
-030
-031
-032
-033
-034
-035
-036
-037
-038
-039
-040
-042
-043
-044
-045
-046
-047
-048
-049
-050
-051
-052
-053
-054
-055
-056
-057
-058
-059
-060
-061
-062
-063
-064
-066
-067
-068
-069
-071
-073
-074
-075
-076
-077
-078
-079
-081
-082
-083
-084
-085
-086
-087
-089
-090
-093
-094
-095
-096
-097
-098
-099
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-125
-126ne
-127
-130
-131
-132
-133
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-159
-160
-161
-162
-163
-164
-165
-166
-167
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-197
-198
-199
-200
-201
-202
-203
-205
-206
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-230
-231
-232
-233
-234
-235
-236
-237
-238
-239
-240
-241
-242
-243
-244
-245
-246
-247
-248
-249
-250
-251
-252
-253
-254
-255
-256
-257
-258
-259
-260
-261
-262
-263
-264
-265
-266
-267
-268
-269
-270
-271
-272
-273
-274
-276
-277
-279
-284
-286
-287
-289
-290
-292
-293
-294
-295
-296
-297
-298
-299
-300
-301
-302
-303
-304
-305
-306
-307
-308
-309
-310
-311
-313
-314
-315
-316
-317
-318
-319
-320
-322
-323
-324
-325
-326
-327
-328
-329
-330
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
index 399cb0e..f539aca 100644
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -3,12 +3,12 @@
 # Vim Text Editor
 #
 #############################################################
-VIM_VERSION:=7.1
+VIM_VERSION:=7.3
 VIM_SOURCE:=vim-$(VIM_VERSION).tar.bz2
 VIM_SITE:=http://ftp.vim.org/pub/vim
 VIM_SOURCE_SITE:=$(VIM_SITE)/unix
-VIM_PATCH_SITE:=$(VIM_SITE)/patches/7.1
-VIM_DIR:=$(BUILD_DIR)/vim71
+VIM_PATCH_SITE:=$(VIM_SITE)/patches/$(VIM_VERSION)
+VIM_DIR:=$(BUILD_DIR)/vim73
 VIM_PATCHES:=$(shell sed -e 's:^:$(DL_DIR)/$(VIM_VERSION).:' package/vim/patches)
 VIM_CONFIG_H:=$(VIM_DIR)/src/auto/config.h
 VIM_CONFIG_MK:=$(VIM_DIR)/src/auto/config.mk
@@ -42,6 +42,13 @@ $(VIM_DIR)/.configured: $(VIM_DIR)/.patched
 		STRIP="$(TARGET_STRIP)" \
 		PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
 		PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
+		vim_cv_toupper_broken=no \
+		vim_cv_terminfo=yes \
+		vim_cv_tty_group=yes \
+		vim_cv_tty_mode=0620 \
+		vim_cv_getcwd_broken=no \
+		vim_cv_stat_ignores_slash=no \
+		vim_cv_memmove_handles_overlap=yes \
 		./configure $(QUIET) --prefix=/usr \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
-- 
1.7.0.4



More information about the buildroot mailing list