--- zsh-4.3.10.orig/config.h.in
+++ zsh-4.3.10/config.h.in
@@ -662,77 +662,77 @@
 /* Define if your system's struct dirent has a member named d_stat. */
 #undef HAVE_STRUCT_DIRENT_D_STAT
 
-/* Define to 1 if `ru_idrss' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_idrss'. */
 #undef HAVE_STRUCT_RUSAGE_RU_IDRSS
 
-/* Define to 1 if `ru_inblock' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_inblock'. */
 #undef HAVE_STRUCT_RUSAGE_RU_INBLOCK
 
-/* Define to 1 if `ru_isrss' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_isrss'. */
 #undef HAVE_STRUCT_RUSAGE_RU_ISRSS
 
-/* Define to 1 if `ru_ixrss' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_ixrss'. */
 #undef HAVE_STRUCT_RUSAGE_RU_IXRSS
 
-/* Define to 1 if `ru_majflt' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_majflt'. */
 #undef HAVE_STRUCT_RUSAGE_RU_MAJFLT
 
-/* Define to 1 if `ru_maxrss' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_maxrss'. */
 #undef HAVE_STRUCT_RUSAGE_RU_MAXRSS
 
-/* Define to 1 if `ru_minflt' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_minflt'. */
 #undef HAVE_STRUCT_RUSAGE_RU_MINFLT
 
-/* Define to 1 if `ru_msgrcv' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_msgrcv'. */
 #undef HAVE_STRUCT_RUSAGE_RU_MSGRCV
 
-/* Define to 1 if `ru_msgsnd' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_msgsnd'. */
 #undef HAVE_STRUCT_RUSAGE_RU_MSGSND
 
-/* Define to 1 if `ru_nivcsw' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_nivcsw'. */
 #undef HAVE_STRUCT_RUSAGE_RU_NIVCSW
 
-/* Define to 1 if `ru_nsignals' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_nsignals'. */
 #undef HAVE_STRUCT_RUSAGE_RU_NSIGNALS
 
-/* Define to 1 if `ru_nswap' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_nswap'. */
 #undef HAVE_STRUCT_RUSAGE_RU_NSWAP
 
-/* Define to 1 if `ru_nvcsw' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_nvcsw'. */
 #undef HAVE_STRUCT_RUSAGE_RU_NVCSW
 
-/* Define to 1 if `ru_oublock' is member of `struct rusage'. */
+/* Define to 1 if `struct rusage' is a member of `ru_oublock'. */
 #undef HAVE_STRUCT_RUSAGE_RU_OUBLOCK
 
 /* Define if your system's struct sockaddr_in6 has a member named
    sin6_scope_id. */
 #undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
 
-/* Define to 1 if `st_atimensec' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_atimensec'. */
 #undef HAVE_STRUCT_STAT_ST_ATIMENSEC
 
-/* Define to 1 if `st_atimespec.tv_nsec' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_atimespec.tv_nsec'. */
 #undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC
 
-/* Define to 1 if `st_atim.tv_nsec' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_atim.tv_nsec'. */
 #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
 
-/* Define to 1 if `st_ctimensec' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_ctimensec'. */
 #undef HAVE_STRUCT_STAT_ST_CTIMENSEC
 
-/* Define to 1 if `st_ctimespec.tv_nsec' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_ctimespec.tv_nsec'. */
 #undef HAVE_STRUCT_STAT_ST_CTIMESPEC_TV_NSEC
 
-/* Define to 1 if `st_ctim.tv_nsec' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_ctim.tv_nsec'. */
 #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC
 
-/* Define to 1 if `st_mtimensec' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_mtimensec'. */
 #undef HAVE_STRUCT_STAT_ST_MTIMENSEC
 
-/* Define to 1 if `st_mtimespec.tv_nsec' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_mtimespec.tv_nsec'. */
 #undef HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC
 
-/* Define to 1 if `st_mtim.tv_nsec' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_mtim.tv_nsec'. */
 #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
 
 /* Define to 1 if struct timezone is defined by a system header */
@@ -964,6 +964,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
--- zsh-4.3.10.orig/configure
+++ zsh-4.3.10/configure
@@ -1,60 +1,81 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.64.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+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
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  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=:
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
@@ -63,20 +84,18 @@
 # 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
+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
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -87,354 +106,321 @@
   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; }
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  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) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-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
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 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
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_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
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-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
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      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
-
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
 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
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_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 ||
+$as_echo X"$as_dir" |
+    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 -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
-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
-  :
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
 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; }
-
-_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
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
 
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
 
-(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
-}
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-exitcode=0
-if as_func_success; then
-  :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
+  as_expr=false
 fi
 
-if as_func_ret_success; then
-  :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# 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
 
 
-  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 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
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -451,8 +437,7 @@
       s/-\n.*//
     ' >$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; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_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
@@ -462,49 +447,40 @@
   exit
 }
 
-
-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
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
-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
+  mkdir conf$$.dir 2>/dev/null
 fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  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 ||
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    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'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -512,7 +488,7 @@
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -529,12 +505,12 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
-	case $1 in
-        -*)set "./$1";;
+	case $1 in #(
+	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -548,7 +524,6 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-
 exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
@@ -567,7 +542,6 @@
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME=
@@ -575,6 +549,7 @@
 PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
+PACKAGE_URL=
 
 ac_unique_file="Src/zsh.h"
 # Factoring default headers for most tests.
@@ -613,118 +588,159 @@
 # 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
-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
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-tzsh
-zshenv
-zshrc
-zprofile
-zlogin
-zlogout
-fndir
-sitefndir
-FUNCTIONS_SUBDIRS
-scriptdir
-sitescriptdir
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-EXELDFLAGS
-LIBLDFLAGS
-CPP
-GREP
-EGREP
-U
-ALLOCA
-SET_MAKE
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-AWK
-LN
-YODL
-PDFETEX
-TEXI2PDF
-TEXI2HTML
-ANSI2KNR
-PCRECONF
-SIGNAL_H
-ERRNO_H
-ZSH_CURSES_H
-CURSES_KEYS_H
-ZSH_TERM_H
-RLIMITS_INC_H
-SHORTBOOTNAMES
-INSTLIB
-UNINSTLIB
-D
-DL_EXT
-DLLD
-DLCFLAGS
-DLLDFLAGS
-E
-EXTRA_LDFLAGS
-EXPOPT
-IMPOPT
-L
-LINKMODS
-MOD_EXPORT
-MOD_IMPORT_VARIABLE
-MOD_IMPORT_FUNCTION
-EXTRAZSHOBJS
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+EXTRAZSHOBJS
+MOD_IMPORT_FUNCTION
+MOD_IMPORT_VARIABLE
+MOD_EXPORT
+LINKMODS
+L
+IMPOPT
+EXPOPT
+EXTRA_LDFLAGS
+E
+DLLDFLAGS
+DLCFLAGS
+DLLD
+DL_EXT
+D
+UNINSTLIB
+INSTLIB
+SHORTBOOTNAMES
+RLIMITS_INC_H
+ZSH_TERM_H
+CURSES_KEYS_H
+ZSH_CURSES_H
+ERRNO_H
+SIGNAL_H
+PCRECONF
+ANSI2KNR
+TEXI2HTML
+TEXI2PDF
+PDFETEX
+YODL
+LN
+AWK
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+SET_MAKE
+ALLOCA
+U
+EGREP
+GREP
+CPP
+LIBLDFLAGS
+EXELDFLAGS
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+sitescriptdir
+scriptdir
+FUNCTIONS_SUBDIRS
+sitefndir
+fndir
+zlogout
+zlogin
+zprofile
+zshrc
+zshenv
+tzsh
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files='CLEAN_MK
 CONFIG_MK
 DEFS_MK
 VERSION_MK'
+ac_user_opts='
+enable_option_checking
+enable_cppflags
+enable_cflags
+enable_ldflags
+enable_libs
+enable_zsh_debug
+enable_zsh_mem
+enable_zsh_mem_debug
+enable_zsh_mem_warning
+enable_zsh_secure_free
+enable_zsh_hash_debug
+enable_etcdir
+enable_zshenv
+enable_zshrc
+enable_zprofile
+enable_zlogin
+enable_zlogout
+enable_dynamic
+enable_restricted_r
+enable_locale
+enable_ansi2knr
+enable_fndir
+enable_site_fndir
+enable_function_subdirs
+enable_scriptdir
+enable_site_scriptdir
+enable_custom_patchlevel
+enable_maildir_support
+enable_max_function_depth
+enable_readnullcmd
+enable_pcre
+enable_cap
+enable_gdbm
+enable_largefile
+with_term_lib
+with_tcsetpgrp
+enable_multibyte
+enable_dynamic_nss
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -739,6 +755,8 @@
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -837,13 +855,20 @@
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    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 ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -856,13 +881,20 @@
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    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=\$ac_optarg ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1053,22 +1085,36 @@
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    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=\$ac_optarg ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    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 ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1088,25 +1134,25 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1115,23 +1161,36 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
 fi
 
-# Be sure to have absolute directory names.
+# Check all directory arguments for consistency.
 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=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  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; }; }
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1145,7 +1204,7 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1161,23 +1220,21 @@
 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; }; }
+  as_fn_error "working directory cannot be determined"
 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; }; }
+  as_fn_error "pwd does not report name of working directory"
 
 
 # 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 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 ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1204,13 +1261,11 @@
 fi
 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; }; }
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 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; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1258,9 +1313,9 @@
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1270,25 +1325,25 @@
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --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]
-  --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]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --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]
+  --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
@@ -1309,6 +1364,7 @@
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-cppflags=...   specify C preprocessor flags
@@ -1377,6 +1433,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
@@ -1384,15 +1441,17 @@
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1428,7 +1487,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1438,25 +1497,526 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.64
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2009 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
 fi
-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.61.  Invocation command line was
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  $ $0 $@
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
 
-_ACEOF
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* 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_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  return $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $2
+  (void) $2;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+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
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  eval "$4=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
+eval ac_res=\$$4
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_member
+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.64.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
 exec 5>>config.log
 {
 cat <<_ASUNAME
@@ -1488,8 +2048,8 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1523,12 +2083,12 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1544,13 +2104,13 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1575,12 +2135,13 @@
     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;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -1609,9 +2170,9 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1626,9 +2187,9 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1644,64 +2205,69 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   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;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1711,16 +2277,16 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1734,60 +2300,56 @@
   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
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # 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=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1805,24 +2367,16 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -1836,35 +2390,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -1880,28 +2426,24 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -1938,13 +2480,11 @@
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
 
 # Un-double any \ or $ (doubled by AC_ARG_PROGRAM).
 cat <<\EOF_SED > conftestsed
@@ -1962,7 +2502,7 @@
 
 
 # Check whether --enable-cppflags was given.
-if test "${enable_cppflags+set}" = set; then
+if test "${enable_cppflags+set}" = set; then :
   enableval=$enable_cppflags; if test "$enableval" = "yes"
 	then CPPFLAGS="$CPPFLAGS"
 	else CPPFLAGS="$enable_cppflags"
@@ -1970,7 +2510,7 @@
 fi
 
     # Check whether --enable-cflags was given.
-if test "${enable_cflags+set}" = set; then
+if test "${enable_cflags+set}" = set; then :
   enableval=$enable_cflags; if test "$enableval" = "yes"
 	then CFLAGS="$CFLAGS"
 	else CFLAGS="$enable_cflags"
@@ -1978,7 +2518,7 @@
 fi
 
     # Check whether --enable-ldflags was given.
-if test "${enable_ldflags+set}" = set; then
+if test "${enable_ldflags+set}" = set; then :
   enableval=$enable_ldflags; if test "$enableval" = "yes"
 	then LDFLAGS="$LDFLAGS"
 	else LDFLAGS="$enable_ldflags"
@@ -1986,7 +2526,7 @@
 fi
 
     # Check whether --enable-libs was given.
-if test "${enable_libs+set}" = set; then
+if test "${enable_libs+set}" = set; then :
   enableval=$enable_libs; if test "$enableval" = "yes"
 	then LIBS="$LIBS"
 	else LIBS="$enable_libs"
@@ -1995,85 +2535,67 @@
 
 
 
-
 # Check whether --enable-zsh-debug was given.
-if test "${enable_zsh_debug+set}" = set; then
+if test "${enable_zsh_debug+set}" = set; then :
   enableval=$enable_zsh_debug; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define DEBUG 1
-_ACEOF
+  $as_echo "#define DEBUG 1" >>confdefs.h
 
 fi
 fi
 
 
 
-
 # Check whether --enable-zsh-mem was given.
-if test "${enable_zsh_mem+set}" = set; then
+if test "${enable_zsh_mem+set}" = set; then :
   enableval=$enable_zsh_mem; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define ZSH_MEM 1
-_ACEOF
+  $as_echo "#define ZSH_MEM 1" >>confdefs.h
 
 fi
 fi
 
 
 
-
 # Check whether --enable-zsh-mem-debug was given.
-if test "${enable_zsh_mem_debug+set}" = set; then
+if test "${enable_zsh_mem_debug+set}" = set; then :
   enableval=$enable_zsh_mem_debug; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define ZSH_MEM_DEBUG 1
-_ACEOF
+  $as_echo "#define ZSH_MEM_DEBUG 1" >>confdefs.h
 
 fi
 fi
 
 
 
-
 # Check whether --enable-zsh-mem-warning was given.
-if test "${enable_zsh_mem_warning+set}" = set; then
+if test "${enable_zsh_mem_warning+set}" = set; then :
   enableval=$enable_zsh_mem_warning; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define ZSH_MEM_WARNING 1
-_ACEOF
+  $as_echo "#define ZSH_MEM_WARNING 1" >>confdefs.h
 
 fi
 fi
 
 
 
-
 # Check whether --enable-zsh-secure-free was given.
-if test "${enable_zsh_secure_free+set}" = set; then
+if test "${enable_zsh_secure_free+set}" = set; then :
   enableval=$enable_zsh_secure_free; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define ZSH_SECURE_FREE 1
-_ACEOF
+  $as_echo "#define ZSH_SECURE_FREE 1" >>confdefs.h
 
 fi
 fi
 
 
 
-
 # Check whether --enable-zsh-hash-debug was given.
-if test "${enable_zsh_hash_debug+set}" = set; then
+if test "${enable_zsh_hash_debug+set}" = set; then :
   enableval=$enable_zsh_hash_debug; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define ZSH_HASH_DEBUG 1
-_ACEOF
+  $as_echo "#define ZSH_HASH_DEBUG 1" >>confdefs.h
 
 fi
 fi
 
 
 # Check whether --enable-etcdir was given.
-if test "${enable_etcdir+set}" = set; then
+if test "${enable_etcdir+set}" = set; then :
   enableval=$enable_etcdir; etcdir="$enableval"
 else
   etcdir=/etc
@@ -2081,7 +2603,7 @@
 
 
 # Check whether --enable-zshenv was given.
-if test "${enable_zshenv+set}" = set; then
+if test "${enable_zshenv+set}" = set; then :
   enableval=$enable_zshenv; zshenv="$enableval"
 else
   if test "x$etcdir" = xno; then
@@ -2092,7 +2614,6 @@
 fi
 
 
-
 if test "x$zshenv" != xno; then
   cat >>confdefs.h <<_ACEOF
 #define GLOBAL_ZSHENV "$zshenv"
@@ -2101,7 +2622,7 @@
 fi
 
 # Check whether --enable-zshrc was given.
-if test "${enable_zshrc+set}" = set; then
+if test "${enable_zshrc+set}" = set; then :
   enableval=$enable_zshrc; zshrc="$enableval"
 else
   if test "x$etcdir" = xno; then
@@ -2112,7 +2633,6 @@
 fi
 
 
-
 if test "x$zshrc" != xno; then
   cat >>confdefs.h <<_ACEOF
 #define GLOBAL_ZSHRC "$zshrc"
@@ -2121,7 +2641,7 @@
 fi
 
 # Check whether --enable-zprofile was given.
-if test "${enable_zprofile+set}" = set; then
+if test "${enable_zprofile+set}" = set; then :
   enableval=$enable_zprofile; zprofile="$enableval"
 else
   if test "x$etcdir" = xno; then
@@ -2132,7 +2652,6 @@
 fi
 
 
-
 if test "x$zprofile" != xno; then
   cat >>confdefs.h <<_ACEOF
 #define GLOBAL_ZPROFILE "$zprofile"
@@ -2141,7 +2660,7 @@
 fi
 
 # Check whether --enable-zlogin was given.
-if test "${enable_zlogin+set}" = set; then
+if test "${enable_zlogin+set}" = set; then :
   enableval=$enable_zlogin; zlogin="$enableval"
 else
   if test "x$etcdir" = xno; then
@@ -2152,7 +2671,6 @@
 fi
 
 
-
 if test "x$zlogin" != xno; then
   cat >>confdefs.h <<_ACEOF
 #define GLOBAL_ZLOGIN "$zlogin"
@@ -2161,7 +2679,7 @@
 fi
 
 # Check whether --enable-zlogout was given.
-if test "${enable_zlogout+set}" = set; then
+if test "${enable_zlogout+set}" = set; then :
   enableval=$enable_zlogout; zlogout="$enableval"
 else
   if test "x$etcdir" = xno; then
@@ -2172,7 +2690,6 @@
 fi
 
 
-
 if test "x$zlogout" != xno; then
   cat >>confdefs.h <<_ACEOF
 #define GLOBAL_ZLOGOUT "$zlogout"
@@ -2182,7 +2699,7 @@
 
 
 # Check whether --enable-dynamic was given.
-if test "${enable_dynamic+set}" = set; then
+if test "${enable_dynamic+set}" = set; then :
   enableval=$enable_dynamic; dynamic="$enableval"
 else
   dynamic=yes
@@ -2190,45 +2707,35 @@
 
 
 
-
 # Check whether --enable-restricted-r was given.
-if test "${enable_restricted_r+set}" = set; then
+if test "${enable_restricted_r+set}" = set; then :
   enableval=$enable_restricted_r; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define RESTRICTED_R 1
-_ACEOF
+  $as_echo "#define RESTRICTED_R 1" >>confdefs.h
 
 fi
 else
-  cat >>confdefs.h <<\_ACEOF
-#define RESTRICTED_R 1
-_ACEOF
+  $as_echo "#define RESTRICTED_R 1" >>confdefs.h
 
 
 fi
 
 
 
-
 # Check whether --enable-locale was given.
-if test "${enable_locale+set}" = set; then
+if test "${enable_locale+set}" = set; then :
   enableval=$enable_locale; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define CONFIG_LOCALE 1
-_ACEOF
+  $as_echo "#define CONFIG_LOCALE 1" >>confdefs.h
 
 fi
 else
-  cat >>confdefs.h <<\_ACEOF
-#define CONFIG_LOCALE 1
-_ACEOF
+  $as_echo "#define CONFIG_LOCALE 1" >>confdefs.h
 
 
 fi
 
 
 # Check whether --enable-ansi2knr was given.
-if test "${enable_ansi2knr+set}" = set; then
+if test "${enable_ansi2knr+set}" = set; then :
   enableval=$enable_ansi2knr; ansi2knr="$enableval"
 else
   ansi2knr=default
@@ -2236,7 +2743,7 @@
 
 
 # Check whether --enable-fndir was given.
-if test "${enable_fndir+set}" = set; then
+if test "${enable_fndir+set}" = set; then :
   enableval=$enable_fndir; if test x$enableval = xyes; then
   fndir=${datadir}/${tzsh_name}/'${VERSION}'/functions
 else
@@ -2248,7 +2755,7 @@
 
 
 # Check whether --enable-site-fndir was given.
-if test "${enable_site_fndir+set}" = set; then
+if test "${enable_site_fndir+set}" = set; then :
   enableval=$enable_site_fndir; if test x$enableval = xyes; then
   sitefndir=${datadir}/${tzsh_name}/site-functions
 else
@@ -2261,7 +2768,7 @@
 
 
 # Check whether --enable-function-subdirs was given.
-if test "${enable_function_subdirs+set}" = set; then
+if test "${enable_function_subdirs+set}" = set; then :
   enableval=$enable_function_subdirs;
 fi
 
@@ -2276,7 +2783,7 @@
 
 
 # Check whether --enable-scriptdir was given.
-if test "${enable_scriptdir+set}" = set; then
+if test "${enable_scriptdir+set}" = set; then :
   enableval=$enable_scriptdir; if test x$enableval = xyes; then
   scriptdir=${datadir}/${tzsh_name}/'${VERSION}'/scripts
 else
@@ -2288,7 +2795,7 @@
 
 
 # Check whether --enable-site-scriptdir was given.
-if test "${enable_site_scriptdir+set}" = set; then
+if test "${enable_site_scriptdir+set}" = set; then :
   enableval=$enable_site_scriptdir; if test x$enableval = xyes; then
   sitescriptdir=${datadir}/${tzsh_name}/scripts
 else
@@ -2305,9 +2812,8 @@
 fi
 
 
-
 # Check whether --enable-custom-patchlevel was given.
-if test "${enable_custom_patchlevel+set}" = set; then
+if test "${enable_custom_patchlevel+set}" = set; then :
   enableval=$enable_custom_patchlevel; if test x$enableval != x && test x$enableval != xno; then
   cat >>confdefs.h <<_ACEOF
 #define CUSTOM_PATCHLEVEL "$enableval"
@@ -2318,26 +2824,20 @@
 
 
 
-
 # Check whether --enable-maildir-support was given.
-if test "${enable_maildir_support+set}" = set; then
+if test "${enable_maildir_support+set}" = set; then :
   enableval=$enable_maildir_support; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define MAILDIR_SUPPORT 1
-_ACEOF
+  $as_echo "#define MAILDIR_SUPPORT 1" >>confdefs.h
 
 fi
 fi
 
 
 
-
 # Check whether --enable-max-function-depth was given.
-if test "${enable_max_function_depth+set}" = set; then
+if test "${enable_max_function_depth+set}" = set; then :
   enableval=$enable_max_function_depth; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define MAX_FUNCTION_DEPTH 1000
-_ACEOF
+  $as_echo "#define MAX_FUNCTION_DEPTH 1000" >>confdefs.h
 
 elif test x$enableval != xno; then
   cat >>confdefs.h <<_ACEOF
@@ -2346,22 +2846,17 @@
 
 fi
 else
-  cat >>confdefs.h <<\_ACEOF
-#define MAX_FUNCTION_DEPTH 1000
-_ACEOF
+  $as_echo "#define MAX_FUNCTION_DEPTH 1000" >>confdefs.h
 
 
 fi
 
 
 
-
 # Check whether --enable-readnullcmd was given.
-if test "${enable_readnullcmd+set}" = set; then
+if test "${enable_readnullcmd+set}" = set; then :
   enableval=$enable_readnullcmd; if test x$enableval = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define DEFAULT_READNULLCMD "more"
-_ACEOF
+  $as_echo "#define DEFAULT_READNULLCMD \"more\"" >>confdefs.h
 
 elif test x$enableval != xno; then
   cat >>confdefs.h <<_ACEOF
@@ -2370,28 +2865,26 @@
 
 fi
 else
-  cat >>confdefs.h <<\_ACEOF
-#define DEFAULT_READNULLCMD "more"
-_ACEOF
+  $as_echo "#define DEFAULT_READNULLCMD \"more\"" >>confdefs.h
 
 
 fi
 
 
 # Check whether --enable-pcre was given.
-if test "${enable_pcre+set}" = set; then
+if test "${enable_pcre+set}" = set; then :
   enableval=$enable_pcre;
 fi
 
 
 # Check whether --enable-cap was given.
-if test "${enable_cap+set}" = set; then
+if test "${enable_cap+set}" = set; then :
   enableval=$enable_cap;
 fi
 
 
 # Check whether --enable-gdbm was given.
-if test "${enable_gdbm+set}" = set; then
+if test "${enable_gdbm+set}" = set; then :
   enableval=$enable_gdbm; gdbm="$enableval"
 else
   gdbm=yes
@@ -2409,10 +2902,10 @@
 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; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2422,25 +2915,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2449,10 +2942,10 @@
   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; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2462,25 +2955,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2488,12 +2981,8 @@
   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@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@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2506,10 +2995,10 @@
           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; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2519,25 +3008,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2546,10 +3035,10 @@
 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; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2560,18 +3049,18 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -2590,11 +3079,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2605,10 +3094,10 @@
   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; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2618,25 +3107,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2649,10 +3138,10 @@
 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; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2662,25 +3151,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2692,12 +3181,8 @@
   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@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@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2707,98 +3192,82 @@
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (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); }
-{ (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); }
-{ (ac_try="$ac_compiler -V >&5"
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&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
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    rm -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
+#include <stdio.h>
 int
 main ()
 {
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ 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[^ ]*//'`
-#
-# 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 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_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -2808,14 +3277,14 @@
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -2834,78 +3303,75 @@
 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then :
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 fi
-
 ac_exeext=$ac_cv_exeext
 
 # 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; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
+  { { 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_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
 ac_clean_files=$ac_clean_files_save
 # 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 { (ac_try="$ac_link"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2913,37 +3379,31 @@
 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 | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 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; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2955,51 +3415,46 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3013,54 +3468,34 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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 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; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3071,34 +3506,11 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3109,35 +3521,12 @@
   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); } && {
-	 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
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  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
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3148,42 +3537,18 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 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 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3199,18 +3564,14 @@
     CFLAGS=
   fi
 fi
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -3267,31 +3628,9 @@
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; 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 core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -3302,17 +3641,19 @@
 # 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; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     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; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3327,16 +3668,16 @@
 else
 
 # Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then
+if test "${enable_largefile+set}" = set; then :
   enableval=$enable_largefile;
 fi
 
 if test "$enable_largefile" != no; then
 
-  { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
@@ -3344,11 +3685,7 @@
        while :; do
 	 # IRIX 6.2 and later do not support large files by default,
 	 # so use the C compiler's -n32 option if that helps.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3367,58 +3704,14 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+	 if ac_fn_c_try_compile "$LINENO"; then :
   break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
 	 CC="$CC -n32"
-	 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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+	 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_largefile_CC=' -n32'; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
 	 break
        done
@@ -3426,23 +3719,19 @@
        rm -f conftest.$ac_ext
     fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   while :; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3461,37 +3750,11 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_file_offset_bits=no; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core 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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -3511,38 +3774,16 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_file_offset_bits=64; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_cv_sys_file_offset_bits=unknown
   break
 done
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *)
@@ -3551,19 +3792,15 @@
 _ACEOF
 ;;
 esac
-rm -f conftest*
+rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
-    { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test "${ac_cv_sys_large_files+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   while :; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -3582,37 +3819,11 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_large_files=no; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core 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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -3632,38 +3843,16 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sys_large_files=1; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   ac_cv_sys_large_files=unknown
   break
 done
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *)
@@ -3672,7 +3861,7 @@
 _ACEOF
 ;;
 esac
-rm -f conftest*
+rm -rf conftest*
   fi
 fi
 
@@ -3738,15 +3927,15 @@
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3760,11 +3949,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3773,76 +3958,34 @@
 #endif
 		     Syntax error
 _ACEOF
-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 && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-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 && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -3854,8 +3997,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3865,11 +4008,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3878,83 +4017,40 @@
 #endif
 		     Syntax error
 _ACEOF
-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 && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-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 && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -3963,45 +4059,40 @@
 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 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # 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.
+    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"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -4013,77 +4104,61 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
+  done
   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
-
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # 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 test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # 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.
+    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"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -4095,54 +4170,39 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
+  done
   done
-done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-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
-
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
 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; }
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
+$as_echo_n "checking whether $CC needs -traditional... " >&6; }
+if test "${ac_cv_prog_gcc_traditional+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
     ac_pattern="Autoconf.*'x'"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sgtty.h>
 Autoconf TIOCGETP
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
   ac_cv_prog_gcc_traditional=yes
 else
   ac_cv_prog_gcc_traditional=no
@@ -4151,39 +4211,31 @@
 
 
   if test $ac_cv_prog_gcc_traditional = no; then
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <termio.h>
 Autoconf TCGETA
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
   ac_cv_prog_gcc_traditional=yes
 fi
 rm -f conftest*
 
   fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
+$as_echo "$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; }
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4243,40 +4295,18 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
 
 fi
 
@@ -4284,10 +4314,10 @@
   darwin*) CPP="$CPP -traditional-cpp" ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
-echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6; }
-if test "${fp_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${CC-cc} option to accept ANSI C" >&5
+$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; }
+if test "${fp_cv_prog_cc_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   fp_cv_prog_cc_stdc=no
 ac_save_CFLAGS="$CFLAGS"
@@ -4303,11 +4333,7 @@
 for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" -Xc
 do
   CFLAGS="$ac_save_CFLAGS $ac_arg"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __STDC__
 choke me
@@ -4323,45 +4349,23 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   fp_cv_prog_cc_stdc="$ac_arg"; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 CFLAGS="$ac_save_CFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $fp_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$fp_cv_prog_cc_stdc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fp_cv_prog_cc_stdc" >&5
+$as_echo "$fp_cv_prog_cc_stdc" >&6; }
 case "x$fp_cv_prog_cc_stdc" in
   x|xno) ;;
   *) CC="$CC $fp_cv_prog_cc_stdc" ;;
 esac
 
-{ echo "$as_me:$LINENO: checking whether to use prototypes" >&5
-echo $ECHO_N "checking whether to use prototypes... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use prototypes" >&5
+$as_echo_n "checking whether to use prototypes... " >&6; }
 if test ."$ansi2knr" = .yes || test ."$ansi2knr" = .no; then
   msg="(overridden) "
 else
@@ -4373,32 +4377,25 @@
   fi
 fi
 
-
 if test "$ansi2knr" = yes; then
-  { echo "$as_me:$LINENO: result: ${msg}no" >&5
-echo "${ECHO_T}${msg}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${msg}no" >&5
+$as_echo "${msg}no" >&6; }
   U=_
 else
-  { echo "$as_me:$LINENO: result: ${msg}yes" >&5
-echo "${ECHO_T}${msg}yes" >&6; }
-  cat >>confdefs.h <<\_ACEOF
-#define PROTOTYPES 1
-_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${msg}yes" >&5
+$as_echo "${msg}yes" >&6; }
+  $as_echo "#define PROTOTYPES 1" >>confdefs.h
 
   U=
 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4413,47 +4410,23 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -4463,18 +4436,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -4484,14 +4453,10 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -4518,113 +4483,36 @@
   return 0;
 }
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`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 { 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_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); } && {
-	 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"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-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
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4634,16 +4522,12 @@
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
@@ -4655,55 +4539,28 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_working_alloca_h=no
+  ac_cv_working_alloca_h=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -4735,43 +4592,20 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_alloca_works=no
+  ac_cv_func_alloca_works=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -4781,21 +4615,15 @@
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined CRAY && ! defined CRAY2
 webecray
@@ -4805,7 +4633,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  $EGREP "webecray" >/dev/null 2>&1; then :
   ac_cv_os_cray=yes
 else
   ac_cv_os_cray=no
@@ -4813,94 +4641,14 @@
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`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 { 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $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
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 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"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-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
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -4912,19 +4660,15 @@
   done
 fi
 
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -4947,43 +4691,18 @@
   return find_stack_direction () < 0;
 }
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
 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_c_stack_direction=-1
+  ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 _ACEOF
@@ -4991,16 +4710,12 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking if the compiler supports union initialisation" >&5
-echo $ECHO_N "checking if the compiler supports union initialisation... $ECHO_C" >&6; }
-if test "${zsh_cv_c_have_union_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler supports union initialisation" >&5
+$as_echo_n "checking if the compiler supports union initialisation... " >&6; }
+if test "${zsh_cv_c_have_union_init+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 union{void *p;long l;}u={0};
 int
@@ -5011,115 +4726,57 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_c_have_union_init=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_c_have_union_init=no
+  zsh_cv_c_have_union_init=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_c_have_union_init" >&5
-echo "${ECHO_T}$zsh_cv_c_have_union_init" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_c_have_union_init" >&5
+$as_echo "$zsh_cv_c_have_union_init" >&6; }
 
 if test x$zsh_cv_c_have_union_init = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNION_INIT 1
-_ACEOF
+  $as_echo "#define HAVE_UNION_INIT 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking if signed to unsigned casting is broken" >&5
-echo $ECHO_N "checking if signed to unsigned casting is broken... $ECHO_C" >&6; }
-if test "${zsh_cv_c_broken_signed_to_unsigned_casting+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if signed to unsigned casting is broken" >&5
+$as_echo_n "checking if signed to unsigned casting is broken... " >&6; }
+if test "${zsh_cv_c_broken_signed_to_unsigned_casting+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_c_broken_signed_to_unsigned_casting=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main(){return((int)(unsigned char)((char) -1) == 255);}
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_c_broken_signed_to_unsigned_casting=yes
 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 )
-zsh_cv_c_broken_signed_to_unsigned_casting=no
+  zsh_cv_c_broken_signed_to_unsigned_casting=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_c_broken_signed_to_unsigned_casting" >&5
-echo "${ECHO_T}$zsh_cv_c_broken_signed_to_unsigned_casting" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_c_broken_signed_to_unsigned_casting" >&5
+$as_echo "$zsh_cv_c_broken_signed_to_unsigned_casting" >&6; }
 
 if test x$zsh_cv_c_broken_signed_to_unsigned_casting = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define BROKEN_SIGNED_TO_UNSIGNED_CASTING 1
-_ACEOF
+  $as_echo "#define BROKEN_SIGNED_TO_UNSIGNED_CASTING 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking if the compiler supports variable-length arrays" >&5
-echo $ECHO_N "checking if the compiler supports variable-length arrays... $ECHO_C" >&6; }
-if test "${zsh_cv_c_variable_length_arrays+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler supports variable-length arrays" >&5
+$as_echo_n "checking if the compiler supports variable-length arrays... " >&6; }
+if test "${zsh_cv_c_variable_length_arrays+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo(), n;
 int
@@ -5130,49 +4787,27 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_c_variable_length_arrays=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_c_variable_length_arrays=no
+  zsh_cv_c_variable_length_arrays=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_c_variable_length_arrays" >&5
-echo "${ECHO_T}$zsh_cv_c_variable_length_arrays" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_c_variable_length_arrays" >&5
+$as_echo "$zsh_cv_c_variable_length_arrays" >&6; }
 
 if test x$zsh_cv_c_variable_length_arrays = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_VARIABLE_LENGTH_ARRAYS 1
-_ACEOF
+  $as_echo "#define HAVE_VARIABLE_LENGTH_ARRAYS 1" >>confdefs.h
 
 fi
 
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -5189,12 +4824,12 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
             # Find a good install program.  We prefer a C program (faster),
@@ -5210,22 +4845,23 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${ac_cv_path_install+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -5243,17 +4879,29 @@
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
-done
+
+  done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -5266,8 +4914,8 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -5280,10 +4928,10 @@
 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; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -5293,34 +4941,34 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-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; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
-                 { echo "$as_me:$LINENO: checking whether ln works" >&5
-echo $ECHO_N "checking whether ln works... $ECHO_C" >&6; }
-if test "${ac_cv_prog_LN+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln works" >&5
+$as_echo_n "checking whether ln works... " >&6; }
+if test "${ac_cv_prog_LN+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   rm -f conftestdata conftestlink
 echo > conftestdata
@@ -5335,54 +4983,49 @@
 fi
 LN="$ac_cv_prog_LN"
 if test "$ac_cv_prog_LN" = "ln"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-                  { 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
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # 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 test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # 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.
+    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"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -5394,43 +5037,32 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
+  done
   done
-done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-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
-
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
                for ac_prog in yodl
 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; }
-if test "${ac_cv_prog_YODL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_YODL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$YODL"; then
   ac_cv_prog_YODL="$YODL" # Let the user override the test.
@@ -5440,25 +5072,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YODL="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 YODL=$ac_cv_prog_YODL
 if test -n "$YODL"; then
-  { echo "$as_me:$LINENO: result: $YODL" >&5
-echo "${ECHO_T}$YODL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YODL" >&5
+$as_echo "$YODL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5470,10 +5102,10 @@
 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; }
-if test "${ac_cv_prog_PDFETEX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_PDFETEX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$PDFETEX"; then
   ac_cv_prog_PDFETEX="$PDFETEX" # Let the user override the test.
@@ -5483,25 +5115,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_PDFETEX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 PDFETEX=$ac_cv_prog_PDFETEX
 if test -n "$PDFETEX"; then
-  { echo "$as_me:$LINENO: result: $PDFETEX" >&5
-echo "${ECHO_T}$PDFETEX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDFETEX" >&5
+$as_echo "$PDFETEX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5513,10 +5145,10 @@
 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; }
-if test "${ac_cv_prog_TEXI2PDF+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_TEXI2PDF+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$TEXI2PDF"; then
   ac_cv_prog_TEXI2PDF="$TEXI2PDF" # Let the user override the test.
@@ -5526,25 +5158,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_TEXI2PDF="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 TEXI2PDF=$ac_cv_prog_TEXI2PDF
 if test -n "$TEXI2PDF"; then
-  { echo "$as_me:$LINENO: result: $TEXI2PDF" >&5
-echo "${ECHO_T}$TEXI2PDF" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEXI2PDF" >&5
+$as_echo "$TEXI2PDF" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5555,10 +5187,10 @@
 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; }
-if test "${ac_cv_prog_TEXI2HTML+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_TEXI2HTML+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$TEXI2HTML"; then
   ac_cv_prog_TEXI2HTML="$TEXI2HTML" # Let the user override the test.
@@ -5568,25 +5200,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_TEXI2HTML="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 TEXI2HTML=$ac_cv_prog_TEXI2HTML
 if test -n "$TEXI2HTML"; then
-  { echo "$as_me:$LINENO: result: $TEXI2HTML" >&5
-echo "${ECHO_T}$TEXI2HTML" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEXI2HTML" >&5
+$as_echo "$TEXI2HTML" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5597,10 +5229,10 @@
 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; }
-if test "${ac_cv_prog_ANSI2KNR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ANSI2KNR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ANSI2KNR"; then
   ac_cv_prog_ANSI2KNR="$ANSI2KNR" # Let the user override the test.
@@ -5610,25 +5242,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ANSI2KNR="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ANSI2KNR=$ac_cv_prog_ANSI2KNR
 if test -n "$ANSI2KNR"; then
-  { echo "$as_me:$LINENO: result: $ANSI2KNR" >&5
-echo "${ECHO_T}$ANSI2KNR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANSI2KNR" >&5
+$as_echo "$ANSI2KNR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5647,24 +5279,15 @@
     exit 1
 fi
 
-
-
-
-
-
 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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -5678,39 +5301,20 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-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
+eval ac_res=\$$as_ac_Header
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
 
 ac_header_dirent=$ac_hdr; break
@@ -5719,17 +5323,13 @@
 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; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then :
+  $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5754,66 +5354,39 @@
     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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
+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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 else
-  { 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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then :
+  $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -5838,66 +5411,39 @@
     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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
+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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5912,47 +5458,23 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -5962,18 +5484,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -5983,14 +5501,10 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -6017,61 +5531,31 @@
   return 0;
 }
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 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; }
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if test "${ac_cv_header_time+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/time.h>
@@ -6086,53 +5570,27 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
 if test $ac_cv_header_time = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
-echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6; }
-if test "${ac_cv_header_stat_broken+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
+$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+if test "${ac_cv_header_stat_broken+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -6154,53 +5612,27 @@
 #endif
 
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stat_broken=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stat_broken=yes
+  ac_cv_header_stat_broken=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
-echo "${ECHO_T}$ac_cv_header_stat_broken" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
+$as_echo "$ac_cv_header_stat_broken" >&6; }
 if test $ac_cv_header_stat_broken = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STAT_MACROS_BROKEN 1
-_ACEOF
+$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
 
 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; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -6221,40 +5653,18 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; 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 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
 if test $ac_cv_header_sys_wait_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
+$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
 
 fi
 
@@ -6263,10 +5673,10 @@
 if test x$enable_pcre = xyes; then
 # Extract the first word of "pcre-config", so it can be a program name with args.
 set dummy pcre-config; 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_PCRECONF+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_PCRECONF+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$PCRECONF"; then
   ac_cv_prog_PCRECONF="$PCRECONF" # Let the user override the test.
@@ -6276,25 +5686,25 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_PCRECONF="pcre-config"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 PCRECONF=$ac_cv_prog_PCRECONF
 if test -n "$PCRECONF"; then
-  { echo "$as_me:$LINENO: result: $PCRECONF" >&5
-echo "${ECHO_T}$PCRECONF" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRECONF" >&5
+$as_echo "$PCRECONF" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6303,46 +5713,6 @@
 fi
 fi
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 for ac_header in sys/time.h sys/times.h sys/select.h termcap.h termio.h \
 		 termios.h sys/param.h sys/filio.h string.h memory.h \
 		 limits.h fcntl.h libc.h sys/utsname.h sys/resource.h \
@@ -6352,419 +5722,38 @@
 		 netinet/in_systm.h pcre.h langinfo.h wchar.h stddef.h \
 		 sys/stropts.h iconv.h ncurses.h ncursesw/ncurses.h \
 		 ncurses/ncurses.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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 <$ac_header>
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _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); } && {
-	 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
 fi
 
-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; }
+done
 
-# Is the header present?
-{ 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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
+if test x$dynamic = xyes; then
+  for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
 _ACEOF
-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 && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  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; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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;}
-
-    ;;
-esac
-{ 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
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+done
 
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in dl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
+if test "x$ac_cv_header_dl_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-if test x$dynamic = xyes; then
-
-for ac_header in dlfcn.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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 <$ac_header>
-_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); } && {
-	 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
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-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 && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  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; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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;}
-
-    ;;
-esac
-{ 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
-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
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dl.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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 <$ac_header>
-_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); } && {
-	 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
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-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 && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  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; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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;}
-
-    ;;
-esac
-{ 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
-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
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_DL_H 1
 _ACEOF
 
 fi
@@ -6774,18 +5763,13 @@
 fi
 
 
-
 if test x$ac_cv_header_sys_time_h = xyes && test x$ac_cv_header_sys_select_h = xyes; then
-  { echo "$as_me:$LINENO: checking for conflicts in sys/time.h and sys/select.h" >&5
-echo $ECHO_N "checking for conflicts in sys/time.h and sys/select.h... $ECHO_C" >&6; }
-if test "${zsh_cv_header_time_h_select_h_conflicts+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for conflicts in sys/time.h and sys/select.h" >&5
+$as_echo_n "checking for conflicts in sys/time.h and sys/select.h... " >&6; }
+if test "${zsh_cv_header_time_h_select_h_conflicts+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/time.h>
 #include <sys/select.h>
@@ -6797,56 +5781,29 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_header_time_h_select_h_conflicts=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_header_time_h_select_h_conflicts=yes
+  zsh_cv_header_time_h_select_h_conflicts=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_header_time_h_select_h_conflicts" >&5
-echo "${ECHO_T}$zsh_cv_header_time_h_select_h_conflicts" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_header_time_h_select_h_conflicts" >&5
+$as_echo "$zsh_cv_header_time_h_select_h_conflicts" >&6; }
   if test x$zsh_cv_header_time_h_select_h_conflicts = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define TIME_H_SELECT_H_CONFLICTS 1
-_ACEOF
+    $as_echo "#define TIME_H_SELECT_H_CONFLICTS 1" >>confdefs.h
 
   fi
 fi
 
 
-
 if test x$ac_cv_header_termios_h = xyes; then
-  { echo "$as_me:$LINENO: checking TIOCGWINSZ in termios.h" >&5
-echo $ECHO_N "checking TIOCGWINSZ in termios.h... $ECHO_C" >&6; }
-if test "${zsh_cv_header_termios_h_tiocgwinsz+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking TIOCGWINSZ in termios.h" >&5
+$as_echo_n "checking TIOCGWINSZ in termios.h... " >&6; }
+if test "${zsh_cv_header_termios_h_tiocgwinsz+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_SYS_TYPES_H
@@ -6861,51 +5818,26 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   zsh_cv_header_termios_h_tiocgwinsz=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_header_termios_h_tiocgwinsz=no
+  zsh_cv_header_termios_h_tiocgwinsz=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_header_termios_h_tiocgwinsz" >&5
-echo "${ECHO_T}$zsh_cv_header_termios_h_tiocgwinsz" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_header_termios_h_tiocgwinsz" >&5
+$as_echo "$zsh_cv_header_termios_h_tiocgwinsz" >&6; }
 else
   zsh_cv_header_termios_h_tiocgwinsz=no
 fi
 if test x$zsh_cv_header_termios_h_tiocgwinsz = xno; then
-  { echo "$as_me:$LINENO: checking TIOCGWINSZ in sys/ioctl.h" >&5
-echo $ECHO_N "checking TIOCGWINSZ in sys/ioctl.h... $ECHO_C" >&6; }
-if test "${zsh_cv_header_sys_ioctl_h_tiocgwinsz+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking TIOCGWINSZ in sys/ioctl.h" >&5
+$as_echo_n "checking TIOCGWINSZ in sys/ioctl.h... " >&6; }
+if test "${zsh_cv_header_sys_ioctl_h_tiocgwinsz+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_SYS_TYPES_H
@@ -6920,57 +5852,29 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   zsh_cv_header_sys_ioctl_h_tiocgwinsz=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_header_sys_ioctl_h_tiocgwinsz=no
+  zsh_cv_header_sys_ioctl_h_tiocgwinsz=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_header_sys_ioctl_h_tiocgwinsz" >&5
-echo "${ECHO_T}$zsh_cv_header_sys_ioctl_h_tiocgwinsz" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_header_sys_ioctl_h_tiocgwinsz" >&5
+$as_echo "$zsh_cv_header_sys_ioctl_h_tiocgwinsz" >&6; }
   if test x$zsh_cv_header_sys_ioctl_h_tiocgwinsz = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define GWINSZ_IN_SYS_IOCTL 1
-_ACEOF
+    $as_echo "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
 
   fi
 fi
 
 
-
-{ echo "$as_me:$LINENO: checking for streams headers including struct winsize" >&5
-echo $ECHO_N "checking for streams headers including struct winsize... $ECHO_C" >&6; }
-if test "${ac_cv_winsize_in_ptem+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for streams headers including struct winsize" >&5
+$as_echo_n "checking for streams headers including struct winsize... " >&6; }
+if test "${ac_cv_winsize_in_ptem+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stream.h>
 #include <sys/ptem.h>
@@ -6982,55 +5886,29 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_winsize_in_ptem=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_winsize_in_ptem=no
+  ac_cv_winsize_in_ptem=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_winsize_in_ptem" >&5
-echo "${ECHO_T}$ac_cv_winsize_in_ptem" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_winsize_in_ptem" >&5
+$as_echo "$ac_cv_winsize_in_ptem" >&6; }
 if test x$ac_cv_winsize_in_ptem = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define WINSIZE_IN_PTEM 1
-_ACEOF
+  $as_echo "#define WINSIZE_IN_PTEM 1" >>confdefs.h
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking for printf in -lc" >&5
-echo $ECHO_N "checking for printf in -lc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_c_printf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for printf in -lc" >&5
+$as_echo_n "checking for printf in -lc... " >&6; }
+if test "${ac_cv_lib_c_printf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7048,56 +5926,30 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_printf=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_c_printf=no
+  ac_cv_lib_c_printf=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_printf" >&5
-echo "${ECHO_T}$ac_cv_lib_c_printf" >&6; }
-if test $ac_cv_lib_c_printf = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_printf" >&5
+$as_echo "$ac_cv_lib_c_printf" >&6; }
+if test "x$ac_cv_lib_c_printf" = x""yes; then :
   LIBS="$LIBS -lc"
 fi
 
 
-
-{ echo "$as_me:$LINENO: checking for pow in -lm" >&5
-echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_m_pow+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+$as_echo_n "checking for pow in -lm... " >&6; }
+if test "${ac_cv_lib_m_pow+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7115,39 +5967,18 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_pow=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_m_pow=no
+  ac_cv_lib_m_pow=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
-echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; }
-if test $ac_cv_lib_m_pow = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+$as_echo "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -7167,20 +5998,16 @@
 
 
 # Check whether --with-term-lib was given.
-if test "${with_term_lib+set}" = set; then
+if test "${with_term_lib+set}" = set; then :
   withval=$with_term_lib; if test "x$withval" != xno && test "x$withval" != x ; then
   termcap_curses_order="$withval"
-  { echo "$as_me:$LINENO: checking for library containing tigetstr" >&5
-echo $ECHO_N "checking for library containing tigetstr... $ECHO_C" >&6; }
-if test "${ac_cv_search_tigetstr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tigetstr" >&5
+$as_echo_n "checking for library containing tigetstr... " >&6; }
+if test "${ac_cv_search_tigetstr+set}" = set; then :
+  $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7205,50 +6032,27 @@
     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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_tigetstr=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_tigetstr+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_tigetstr+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_tigetstr+set}" = set; then
-  :
+if test "${ac_cv_search_tigetstr+set}" = set; then :
+
 else
   ac_cv_search_tigetstr=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_tigetstr" >&5
-echo "${ECHO_T}$ac_cv_search_tigetstr" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tigetstr" >&5
+$as_echo "$ac_cv_search_tigetstr" >&6; }
 ac_res=$ac_cv_search_tigetstr
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -7269,11 +6073,10 @@
 fi
 
 
-
-{ echo "$as_me:$LINENO: checking if _XOPEN_SOURCE_EXTENDED should not be defined" >&5
-echo $ECHO_N "checking if _XOPEN_SOURCE_EXTENDED should not be defined... $ECHO_C" >&6; }
-if test "${zsh_cv_no_xopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if _XOPEN_SOURCE_EXTENDED should not be defined" >&5
+$as_echo_n "checking if _XOPEN_SOURCE_EXTENDED should not be defined... " >&6; }
+if test "${zsh_cv_no_xopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case "$host_os" in
   *openbsd*|*freebsd5*|*freebsd6.[012]*|*aix*)
@@ -7284,26 +6087,20 @@
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_no_xopen" >&5
-echo "${ECHO_T}$zsh_cv_no_xopen" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_no_xopen" >&5
+$as_echo "$zsh_cv_no_xopen" >&6; }
 if test x$zsh_cv_no_xopen = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define ZSH_NO_XOPEN 1
-_ACEOF
+  $as_echo "#define ZSH_NO_XOPEN 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing tigetflag" >&5
-echo $ECHO_N "checking for library containing tigetflag... $ECHO_C" >&6; }
-if test "${ac_cv_search_tigetflag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tigetflag" >&5
+$as_echo_n "checking for library containing tigetflag... " >&6; }
+if test "${ac_cv_search_tigetflag+set}" = set; then :
+  $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7328,65 +6125,38 @@
     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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_tigetflag=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_tigetflag+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_tigetflag+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_tigetflag+set}" = set; then
-  :
+if test "${ac_cv_search_tigetflag+set}" = set; then :
+
 else
   ac_cv_search_tigetflag=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_tigetflag" >&5
-echo "${ECHO_T}$ac_cv_search_tigetflag" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tigetflag" >&5
+$as_echo "$ac_cv_search_tigetflag" >&6; }
 ac_res=$ac_cv_search_tigetflag
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing tgetent" >&5
-echo $ECHO_N "checking for library containing tgetent... $ECHO_C" >&6; }
-if test "${ac_cv_search_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
+$as_echo_n "checking for library containing tgetent... " >&6; }
+if test "${ac_cv_search_tgetent+set}" = set; then :
+  $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7411,213 +6181,55 @@
     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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_tgetent=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_tgetent+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_tgetent+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_tgetent+set}" = set; then
-  :
+if test "${ac_cv_search_tgetent+set}" = set; then :
+
 else
   ac_cv_search_tgetent=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_tgetent" >&5
-echo "${ECHO_T}$ac_cv_search_tgetent" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5
+$as_echo "$ac_cv_search_tgetent" >&6; }
 ac_res=$ac_cv_search_tgetent
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   true
 else
-  { { echo "$as_me:$LINENO: error: \"No terminal handling library was found on your system.
-This is probably a library called 'curses' or 'ncurses'.  You may
-need to install a package called 'curses-devel' or 'ncurses-devel' on your
-system.\"
-See \`config.log' for more details." >&5
-echo "$as_me: error: \"No terminal handling library was found on your system.
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 255
+as_fn_error "\"No terminal handling library was found on your system.
 This is probably a library called 'curses' or 'ncurses'.  You may
 need to install a package called 'curses-devel' or 'ncurses-devel' on your
 system.\"
-See \`config.log' for more details." >&2;}
-   { (exit 255); exit 255; }; }
+See \`config.log' for more details." "$LINENO" 5; }; }
 fi
 
-
 for ac_header in curses.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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 <$ac_header>
-_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); } && {
-	 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
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-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 && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  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; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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;}
-
-    ;;
-esac
-{ 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
-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
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
+if test "x$ac_cv_header_curses_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CURSES_H 1
 _ACEOF
 
 else
-  { echo "$as_me:$LINENO: checking for Solaris 8 curses.h mistake" >&5
-echo $ECHO_N "checking for Solaris 8 curses.h mistake... $ECHO_C" >&6; }
-if test "${ac_cv_header_curses_solaris+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris 8 curses.h mistake" >&5
+$as_echo_n "checking for Solaris 8 curses.h mistake... " >&6; }
+if test "${ac_cv_header_curses_solaris+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <curses.h>
 int
@@ -7628,41 +6240,19 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_curses_h=yes
 ac_cv_header_curses_solaris=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_curses_h=no
+  ac_cv_header_curses_h=no
 ac_cv_header_curses_solaris=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_solaris" >&5
-echo "${ECHO_T}$ac_cv_header_curses_solaris" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_curses_solaris" >&5
+$as_echo "$ac_cv_header_curses_solaris" >&6; }
 if test x$ac_cv_header_curses_solaris = xyes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURSES_H 1
-_ACEOF
+$as_echo "#define HAVE_CURSES_H 1" >>confdefs.h
 
 fi
 fi
@@ -7670,10 +6260,10 @@
 done
 
 
-{ echo "$as_me:$LINENO: checking if we need to ignore ncurses" >&5
-echo $ECHO_N "checking if we need to ignore ncurses... $ECHO_C" >&6; }
-if test "${zsh_cv_ignore_ncurses+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to ignore ncurses" >&5
+$as_echo_n "checking if we need to ignore ncurses... " >&6; }
+if test "${zsh_cv_ignore_ncurses+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $LIBS in
   *-lncurses*)
@@ -7684,20 +6274,16 @@
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_ignore_ncurses" >&5
-echo "${ECHO_T}$zsh_cv_ignore_ncurses" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_ignore_ncurses" >&5
+$as_echo "$zsh_cv_ignore_ncurses" >&6; }
 
-{ echo "$as_me:$LINENO: checking for library containing getpwnam" >&5
-echo $ECHO_N "checking for library containing getpwnam... $ECHO_C" >&6; }
-if test "${ac_cv_search_getpwnam+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getpwnam" >&5
+$as_echo_n "checking for library containing getpwnam... " >&6; }
+if test "${ac_cv_search_getpwnam+set}" = set; then :
+  $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7722,50 +6308,27 @@
     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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_getpwnam=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_getpwnam+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_getpwnam+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_getpwnam+set}" = set; then
-  :
+if test "${ac_cv_search_getpwnam+set}" = set; then :
+
 else
   ac_cv_search_getpwnam=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_getpwnam" >&5
-echo "${ECHO_T}$ac_cv_search_getpwnam" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getpwnam" >&5
+$as_echo "$ac_cv_search_getpwnam" >&6; }
 ac_res=$ac_cv_search_getpwnam
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -7776,19 +6339,14 @@
 fi
 
 if test "x$dynamic" = xyes; then
-
-{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7806,39 +6364,18 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDL 1
 _ACEOF
@@ -7850,19 +6387,14 @@
 fi
 
 if test x$enable_cap = xyes; then
-
-{ echo "$as_me:$LINENO: checking for cap_get_proc in -lcap" >&5
-echo $ECHO_N "checking for cap_get_proc in -lcap... $ECHO_C" >&6; }
-if test "${ac_cv_lib_cap_cap_get_proc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_get_proc in -lcap" >&5
+$as_echo_n "checking for cap_get_proc in -lcap... " >&6; }
+if test "${ac_cv_lib_cap_cap_get_proc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcap  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7880,39 +6412,18 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_cap_cap_get_proc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_cap_cap_get_proc=no
+  ac_cv_lib_cap_cap_get_proc=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cap_cap_get_proc" >&5
-echo "${ECHO_T}$ac_cv_lib_cap_cap_get_proc" >&6; }
-if test $ac_cv_lib_cap_cap_get_proc = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_get_proc" >&5
+$as_echo "$ac_cv_lib_cap_cap_get_proc" >&6; }
+if test "x$ac_cv_lib_cap_cap_get_proc" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCAP 1
 _ACEOF
@@ -7923,19 +6434,14 @@
 
 fi
 
-
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+$as_echo_n "checking for socket in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_socket+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -7953,39 +6459,18 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    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; }
-if test $ac_cv_lib_socket_socket = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+$as_echo "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSOCKET 1
 _ACEOF
@@ -7994,17 +6479,13 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing gethostbyname2" >&5
-echo $ECHO_N "checking for library containing gethostbyname2... $ECHO_C" >&6; }
-if test "${ac_cv_search_gethostbyname2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname2" >&5
+$as_echo_n "checking for library containing gethostbyname2... " >&6; }
+if test "${ac_cv_search_gethostbyname2+set}" = set; then :
+  $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -8029,50 +6510,27 @@
     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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_gethostbyname2=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_gethostbyname2+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_gethostbyname2+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_gethostbyname2+set}" = set; then
-  :
+if test "${ac_cv_search_gethostbyname2+set}" = set; then :
+
 else
   ac_cv_search_gethostbyname2=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname2" >&5
-echo "${ECHO_T}$ac_cv_search_gethostbyname2" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname2" >&5
+$as_echo "$ac_cv_search_gethostbyname2" >&6; }
 ac_res=$ac_cv_search_gethostbyname2
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -8080,140 +6538,12 @@
 
 case $LIBS in
   *-lbind*)
-
-for ac_header in bind/netdb.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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 <$ac_header>
-_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); } && {
-	 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
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-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 && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  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; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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;}
-
-    ;;
-esac
-{ 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
-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
+  for ac_header in bind/netdb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "bind/netdb.h" "ac_cv_header_bind_netdb_h" "$ac_includes_default"
+if test "x$ac_cv_header_bind_netdb_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_BIND_NETDB_H 1
 _ACEOF
 
 fi
@@ -8225,33 +6555,23 @@
 
 
 if test "x$ac_cv_header_iconv_h" = "xyes"; then
-  { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
-if test "${ac_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv"
+if test "x$ac_cv_func_iconv" = x""yes; then :
+  ac_found_iconv=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define iconv to an innocuous variant, in case <limits.h> declares iconv.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define iconv innocuous_iconv
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char iconv (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+  ac_found_iconv=no
+fi
 
-#undef iconv
+  if test "x$ac_found_iconv" = "xno"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -liconv" >&5
+$as_echo_n "checking for iconv in -liconv... " >&6; }
+if test "${ac_cv_lib_iconv_iconv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-liconv  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -8260,13 +6580,6 @@
 extern "C"
 #endif
 char iconv ();
-/* 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_iconv || defined __stub___iconv
-choke me
-#endif
-
 int
 main ()
 {
@@ -8275,56 +6588,30 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 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_iconv=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_iconv_iconv=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_iconv=no
+  ac_cv_lib_iconv_iconv=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_iconv" >&5
-echo "${ECHO_T}$ac_cv_func_iconv" >&6; }
-if test $ac_cv_func_iconv = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv" >&5
+$as_echo "$ac_cv_lib_iconv_iconv" >&6; }
+if test "x$ac_cv_lib_iconv_iconv" = x""yes; then :
   ac_found_iconv=yes
-else
-  ac_found_iconv=no
 fi
 
-  if test "x$ac_found_iconv" = "xno"; then
-    { echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
-echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_iconv_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if test "x$ac_found_iconv" = "xno"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -liconv" >&5
+$as_echo_n "checking for libiconv in -liconv... " >&6; }
+if test "${ac_cv_lib_iconv_libiconv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -8333,64 +6620,46 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char iconv ();
+char libiconv ();
 int
 main ()
 {
-return iconv ();
+return libiconv ();
   ;
   return 0;
 }
 _ACEOF
-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); } && {
-	 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_iconv_iconv=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_iconv_libiconv=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_iconv_iconv=no
+  ac_cv_lib_iconv_libiconv=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
-echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6; }
-if test $ac_cv_lib_iconv_iconv = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv" >&5
+$as_echo "$ac_cv_lib_iconv_libiconv" >&6; }
+if test "x$ac_cv_lib_iconv_libiconv" = x""yes; then :
   ac_found_iconv=yes
 fi
 
-    if test "x$ac_found_iconv" = "xno"; then
-      { echo "$as_me:$LINENO: checking for libiconv in -liconv" >&5
-echo $ECHO_N "checking for libiconv in -liconv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_iconv_libiconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    fi
+    if test "x$ac_found_iconv" != "xno"; then
+      LIBS="-liconv $LIBS"
+    fi
+  else
+        ac_fn_c_check_decl "$LINENO" "_libiconv_version" "ac_cv_have_decl__libiconv_version" " #include <iconv.h>
+"
+if test "x$ac_cv_have_decl__libiconv_version" = x""yes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -liconv" >&5
+$as_echo_n "checking for libiconv in -liconv... " >&6; }
+if test "${ac_cv_lib_iconv_libiconv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -8408,163 +6677,18 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 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_iconv_libiconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_iconv_libiconv=no
-fi
-
-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_iconv_libiconv" >&5
-echo "${ECHO_T}$ac_cv_lib_iconv_libiconv" >&6; }
-if test $ac_cv_lib_iconv_libiconv = yes; then
-  ac_found_iconv=yes
-fi
-
-    fi
-    if test "x$ac_found_iconv" != "xno"; then
-      LIBS="-liconv $LIBS"
-    fi
-  else
-        { echo "$as_me:$LINENO: checking whether _libiconv_version is declared" >&5
-echo $ECHO_N "checking whether _libiconv_version is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl__libiconv_version+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 <iconv.h>
-
-int
-main ()
-{
-#ifndef _libiconv_version
-  (void) _libiconv_version;
-#endif
-
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl__libiconv_version=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl__libiconv_version=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl__libiconv_version" >&5
-echo "${ECHO_T}$ac_cv_have_decl__libiconv_version" >&6; }
-if test $ac_cv_have_decl__libiconv_version = yes; then
-   { echo "$as_me:$LINENO: checking for libiconv in -liconv" >&5
-echo $ECHO_N "checking for libiconv in -liconv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_iconv_libiconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv  $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 GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char libiconv ();
-int
-main ()
-{
-return libiconv ();
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_iconv_libiconv=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_iconv_libiconv=no
+  ac_cv_lib_iconv_libiconv=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv" >&5
-echo "${ECHO_T}$ac_cv_lib_iconv_libiconv" >&6; }
-if test $ac_cv_lib_iconv_libiconv = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv" >&5
+$as_echo "$ac_cv_lib_iconv_libiconv" >&6; }
+if test "x$ac_cv_lib_iconv_libiconv" = x""yes; then :
   LIBS="-liconv $LIBS"
 fi
 
@@ -8573,18 +6697,11 @@
   fi
 fi
 
-
 if test "x$ac_found_iconv" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
 int
@@ -8595,50 +6712,21 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  cat >>confdefs.h <<\_ACEOF
-#define ICONV_FROM_LIBICONV 1
-_ACEOF
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_link "$LINENO"; then :
+  $as_echo "#define ICONV_FROM_LIBICONV 1" >>confdefs.h
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 
 if test "x$ac_found_iconv" = "xyes"; then
-  { echo "$as_me:$LINENO: checking for iconv declaration" >&5
-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }
-if test "${ac_cv_iconv_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+if test "${ac_cv_iconv_const+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
         #include <iconv.h>
@@ -8657,35 +6745,15 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_iconv_const=
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_iconv_const=const
+  ac_cv_iconv_const=const
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_iconv_const" >&5
-echo "${ECHO_T}$ac_cv_iconv_const" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_iconv_const" >&5
+$as_echo "$ac_cv_iconv_const" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define ICONV_CONST $ac_cv_iconv_const
@@ -8697,16 +6765,12 @@
   LIBS="`pcre-config --libs` $LIBS"
 fi
 
-{ echo "$as_me:$LINENO: checking if an include file defines ospeed" >&5
-echo $ECHO_N "checking if an include file defines ospeed... $ECHO_C" >&6; }
-if test "${zsh_cv_decl_ospeed_include_defines+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if an include file defines ospeed" >&5
+$as_echo_n "checking if an include file defines ospeed... " >&6; }
+if test "${zsh_cv_decl_ospeed_include_defines+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #if HAVE_TERMIOS_H
@@ -8723,49 +6787,24 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   zsh_cv_decl_ospeed_include_defines=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_decl_ospeed_include_defines=no
+  zsh_cv_decl_ospeed_include_defines=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_decl_ospeed_include_defines" >&5
-echo "${ECHO_T}$zsh_cv_decl_ospeed_include_defines" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_decl_ospeed_include_defines" >&5
+$as_echo "$zsh_cv_decl_ospeed_include_defines" >&6; }
 
 if test x$zsh_cv_decl_ospeed_include_defines = xno; then
-  { echo "$as_me:$LINENO: checking if you must define ospeed" >&5
-echo $ECHO_N "checking if you must define ospeed... $ECHO_C" >&6; }
-if test "${zsh_cv_decl_ospeed_must_define+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if you must define ospeed" >&5
+$as_echo_n "checking if you must define ospeed... " >&6; }
+if test "${zsh_cv_decl_ospeed_must_define+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -8776,213 +6815,51 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   zsh_cv_decl_ospeed_must_define=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_decl_ospeed_must_define=no
+  zsh_cv_decl_ospeed_must_define=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_decl_ospeed_must_define" >&5
-echo "${ECHO_T}$zsh_cv_decl_ospeed_must_define" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_decl_ospeed_must_define" >&5
+$as_echo "$zsh_cv_decl_ospeed_must_define" >&6; }
 fi
 
 
 
-
-
 if test x$zsh_cv_decl_ospeed_include_defines = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_OSPEED 1
-_ACEOF
+  $as_echo "#define HAVE_OSPEED 1" >>confdefs.h
 
 elif test x$zsh_cv_decl_ospeed_must_define = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_OSPEED 1
-_ACEOF
+  $as_echo "#define HAVE_OSPEED 1" >>confdefs.h
 
-  cat >>confdefs.h <<\_ACEOF
-#define MUST_DEFINE_OSPEED 1
-_ACEOF
+  $as_echo "#define MUST_DEFINE_OSPEED 1" >>confdefs.h
 
 fi
 
 if test x$gdbm != xno; then
-
-for ac_header in gdbm.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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 <$ac_header>
-_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); } && {
-	 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
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-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 && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  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; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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;}
-
-    ;;
-esac
-{ 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
-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
+  for ac_header in gdbm.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "gdbm.h" "ac_cv_header_gdbm_h" "$ac_includes_default"
+if test "x$ac_cv_header_gdbm_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_GDBM_H 1
 _ACEOF
 
 fi
 
 done
 
-
-{ echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
-echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5
+$as_echo_n "checking for gdbm_open in -lgdbm... " >&6; }
+if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdbm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -9000,39 +6877,18 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gdbm_gdbm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gdbm_gdbm_open=no
+  ac_cv_lib_gdbm_gdbm_open=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6; }
-if test $ac_cv_lib_gdbm_gdbm_open = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5
+$as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; }
+if test "x$ac_cv_lib_gdbm_gdbm_open" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGDBM 1
 _ACEOF
@@ -9043,140 +6899,12 @@
 
 fi
 
-
 for ac_header in sys/xattr.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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 <$ac_header>
-_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); } && {
-	 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
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-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 && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  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; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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;}
-
-    ;;
-esac
-{ 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
-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
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_xattr_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_XATTR_H 1
 _ACEOF
 
 fi
@@ -9185,16 +6913,12 @@
 
 
 
-{ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if test "${ac_cv_type_signal+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <signal.h>
@@ -9207,96 +6931,24 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_type_signal=int
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_signal=void
+  ac_cv_type_signal=void
 fi
-
 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; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define RETSIGTYPE $ac_cv_type_signal
 _ACEOF
 
 
-{ 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
-  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
-typedef pid_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  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); } && {
-	 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
-fi
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
 
-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; }
-if test $ac_cv_type_pid_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -9305,61 +6957,9 @@
 
 fi
 
-{ 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
-  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
-typedef off_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  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); } && {
-	 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
-fi
+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+if test "x$ac_cv_type_off_t" = x""yes; then :
 
-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; }
-if test $ac_cv_type_off_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -9368,61 +6968,9 @@
 
 fi
 
-{ 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
-  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
-typedef ino_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  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); } && {
-	 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
-fi
+ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
+if test "x$ac_cv_type_ino_t" = x""yes; then :
 
-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; }
-if test $ac_cv_type_ino_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -9431,61 +6979,9 @@
 
 fi
 
-{ 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
-  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
-typedef mode_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  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); } && {
-	 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
-fi
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = x""yes; then :
 
-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; }
-if test $ac_cv_type_mode_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -9494,22 +6990,18 @@
 
 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; }
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if test "${ac_cv_type_uid_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
+  $EGREP "uid_t" >/dev/null 2>&1; then :
   ac_cv_type_uid_t=yes
 else
   ac_cv_type_uid_t=no
@@ -9517,76 +7009,20 @@
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
+$as_echo "#define uid_t int" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
+$as_echo "#define gid_t int" >>confdefs.h
 
 fi
 
-{ 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
-  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
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  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); } && {
-	 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
-fi
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
-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; }
-if test $ac_cv_type_size_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -9596,64 +7032,30 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking if long is 64 bits" >&5
-echo $ECHO_N "checking if long is 64 bits... $ECHO_C" >&6; }
-if test "${zsh_cv_long_is_64_bit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if long is 64 bits" >&5
+$as_echo_n "checking if long is 64 bits... " >&6; }
+if test "${zsh_cv_long_is_64_bit+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_long_is_64_bit=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main() { return sizeof(long) < 8; }
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_long_is_64_bit=yes
 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 )
-zsh_cv_long_is_64_bit=no
+  zsh_cv_long_is_64_bit=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_long_is_64_bit" >&5
-echo "${ECHO_T}$zsh_cv_long_is_64_bit" >&6; }
-
-
-
-
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_long_is_64_bit" >&5
+$as_echo "$zsh_cv_long_is_64_bit" >&6; }
 
 
 
@@ -9662,24 +7064,18 @@
 
 
 if test x$zsh_cv_long_is_64_bit = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define LONG_IS_64_BIT 1
-_ACEOF
+  $as_echo "#define LONG_IS_64_BIT 1" >>confdefs.h
 
 else
-  { echo "$as_me:$LINENO: checking if off_t is 64 bit" >&5
-echo $ECHO_N "checking if off_t is 64 bit... $ECHO_C" >&6; }
-if test "${zsh_cv_off_t_is_64_bit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if off_t is 64 bit" >&5
+$as_echo_n "checking if off_t is 64 bit... " >&6; }
+if test "${zsh_cv_off_t_is_64_bit+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_off_t_is_64_bit=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -9687,62 +7083,32 @@
 main() { return sizeof(off_t) < 8; }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_off_t_is_64_bit=yes
 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 )
-zsh_cv_off_t_is_64_bit=no
+  zsh_cv_off_t_is_64_bit=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_off_t_is_64_bit" >&5
-echo "${ECHO_T}$zsh_cv_off_t_is_64_bit" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_off_t_is_64_bit" >&5
+$as_echo "$zsh_cv_off_t_is_64_bit" >&6; }
   if test x$zsh_cv_off_t_is_64_bit = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define OFF_T_IS_64_BIT 1
-_ACEOF
+    $as_echo "#define OFF_T_IS_64_BIT 1" >>confdefs.h
 
   fi
 
-  { echo "$as_me:$LINENO: checking if ino_t is 64 bit" >&5
-echo $ECHO_N "checking if ino_t is 64 bit... $ECHO_C" >&6; }
-if test "${zsh_cv_ino_t_is_64_bit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ino_t is 64 bit" >&5
+$as_echo_n "checking if ino_t is 64 bit... " >&6; }
+if test "${zsh_cv_ino_t_is_64_bit+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_ino_t_is_64_bit=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -9750,68 +7116,38 @@
 main() { return sizeof(ino_t) < 8; }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_ino_t_is_64_bit=yes
 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 )
-zsh_cv_ino_t_is_64_bit=no
+  zsh_cv_ino_t_is_64_bit=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_ino_t_is_64_bit" >&5
-echo "${ECHO_T}$zsh_cv_ino_t_is_64_bit" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_ino_t_is_64_bit" >&5
+$as_echo "$zsh_cv_ino_t_is_64_bit" >&6; }
   if test x$zsh_cv_ino_t_is_64_bit = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define INO_T_IS_64_BIT 1
-_ACEOF
+    $as_echo "#define INO_T_IS_64_BIT 1" >>confdefs.h
 
   fi
 
   if test x$enable_largefile != xno -o x$zsh_cv_off_t_is_64_bit = xyes \
   -o $zsh_cv_ino_t_is_64_bit = yes; then
-    { echo "$as_me:$LINENO: checking if compiler has a 64 bit type" >&5
-echo $ECHO_N "checking if compiler has a 64 bit type... $ECHO_C" >&6; }
-if test "${zsh_cv_64_bit_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler has a 64 bit type" >&5
+$as_echo_n "checking if compiler has a 64 bit type... " >&6; }
+if test "${zsh_cv_64_bit_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   if test x != x ; then
     zsh_cv_64_bit_type="long long"
   else
     zsh_cv_64_bit_type=no
   fi
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_SYS_TYPES_H
@@ -9826,53 +7162,25 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_64_bit_type="long long"
 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 )
-zsh_cv_64_bit_type=no
+  zsh_cv_64_bit_type=no
 fi
-rm -f core *.core core.conftest.* 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 "$zsh_cv_64_bit_type" = no; then
-       if test "$cross_compiling" = yes; then
+       if test "$cross_compiling" = yes; then :
   if test x != x ; then
     zsh_cv_64_bit_type="quad_t"
   else
     zsh_cv_64_bit_type=no
   fi
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_SYS_TYPES_H
@@ -9887,54 +7195,26 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_64_bit_type="quad_t"
 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 )
-zsh_cv_64_bit_type=no
+  zsh_cv_64_bit_type=no
 fi
-rm -f core *.core core.conftest.* 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
 
 
-
      fi
      if test "$zsh_cv_64_bit_type" = no; then
-       if test "$cross_compiling" = yes; then
+       if test "$cross_compiling" = yes; then :
   if test x != x ; then
     zsh_cv_64_bit_type="__int64_t"
   else
     zsh_cv_64_bit_type=no
   fi
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_SYS_TYPES_H
@@ -9949,55 +7229,27 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_64_bit_type="__int64_t"
 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 )
-zsh_cv_64_bit_type=no
+  zsh_cv_64_bit_type=no
 fi
-rm -f core *.core core.conftest.* 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
 
 
-
      fi
                     if test "$zsh_cv_64_bit_type" = no &&
         test "$zsh_cv_off_t_is_64_bit" = yes; then
-       if test "$cross_compiling" = yes; then
+       if test "$cross_compiling" = yes; then :
   if test x != x ; then
     zsh_cv_64_bit_type="off_t"
   else
     zsh_cv_64_bit_type=no
   fi
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_SYS_TYPES_H
@@ -10012,67 +7264,39 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_64_bit_type="off_t"
 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 )
-zsh_cv_64_bit_type=no
+  zsh_cv_64_bit_type=no
 fi
-rm -f core *.core core.conftest.* 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
 
 
-
      fi
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_64_bit_type" >&5
-echo "${ECHO_T}$zsh_cv_64_bit_type" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_64_bit_type" >&5
+$as_echo "$zsh_cv_64_bit_type" >&6; }
     if test "$zsh_cv_64_bit_type" != no; then
       cat >>confdefs.h <<_ACEOF
 #define ZSH_64_BIT_TYPE $zsh_cv_64_bit_type
 _ACEOF
 
 
-                  { echo "$as_me:$LINENO: checking for a corresponding unsigned 64 bit type" >&5
-echo $ECHO_N "checking for a corresponding unsigned 64 bit type... $ECHO_C" >&6; }
-if test "${zsh_cv_64_bit_utype+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a corresponding unsigned 64 bit type" >&5
+$as_echo_n "checking for a corresponding unsigned 64 bit type... " >&6; }
+if test "${zsh_cv_64_bit_utype+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   if test xforce != x ; then
     zsh_cv_64_bit_utype="unsigned $zsh_cv_64_bit_type"
   else
     zsh_cv_64_bit_utype=no
   fi
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_SYS_TYPES_H
@@ -10087,53 +7311,25 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_64_bit_utype="unsigned $zsh_cv_64_bit_type"
 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 )
-zsh_cv_64_bit_utype=no
+  zsh_cv_64_bit_utype=no
 fi
-rm -f core *.core core.conftest.* 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 "$zsh_cv_64_bit_utype" = no; then
-         if test "$cross_compiling" = yes; then
+         if test "$cross_compiling" = yes; then :
   if test x != x ; then
     zsh_cv_64_bit_utype="__uint64_t"
   else
     zsh_cv_64_bit_utype=no
   fi
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_SYS_TYPES_H
@@ -10148,44 +7344,20 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_64_bit_utype="__uint64_t"
 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 )
-zsh_cv_64_bit_utype=no
+  zsh_cv_64_bit_utype=no
 fi
-rm -f core *.core core.conftest.* 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
 
 
-
        fi
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_64_bit_utype" >&5
-echo "${ECHO_T}$zsh_cv_64_bit_utype" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_64_bit_utype" >&5
+$as_echo "$zsh_cv_64_bit_utype" >&6; }
       if test "$zsh_cv_64_bit_utype" != no; then
         cat >>confdefs.h <<_ACEOF
 #define ZSH_64_BIT_UTYPE $zsh_cv_64_bit_utype
@@ -10196,16 +7368,12 @@
   fi
 fi
 
-{ echo "$as_me:$LINENO: checking for sigset_t" >&5
-echo $ECHO_N "checking for sigset_t... $ECHO_C" >&6; }
-if test "${zsh_cv_type_sigset_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigset_t" >&5
+$as_echo_n "checking for sigset_t... " >&6; }
+if test "${zsh_cv_type_sigset_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <signal.h>
@@ -10217,7054 +7385,2669 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_type_sigset_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_type_sigset_t=no
+  zsh_cv_type_sigset_t=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_type_sigset_t" >&5
-echo "${ECHO_T}$zsh_cv_type_sigset_t" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_type_sigset_t" >&5
+$as_echo "$zsh_cv_type_sigset_t" >&6; }
 
 if test x$zsh_cv_type_sigset_t = xno; then
-  cat >>confdefs.h <<\_ACEOF
-#define sigset_t unsigned int
+  $as_echo "#define sigset_t unsigned int" >>confdefs.h
+
+fi
+
+ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.tv_nsec" "ac_cv_member_struct_stat_st_atim_tv_nsec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
 _ACEOF
 
+
 fi
+ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = x""yes; then :
 
-{ echo "$as_me:$LINENO: checking for struct stat.st_atim.tv_nsec" >&5
-echo $ECHO_N "checking for struct stat.st_atim.tv_nsec... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_atim_tv_nsec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_atim.tv_nsec)
-return 0;
-  ;
-  return 0;
-}
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_atimensec" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_atim_tv_nsec=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+
+fi
+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim.tv_nsec" "ac_cv_member_struct_stat_st_mtim_tv_nsec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_atim.tv_nsec)
-return 0;
-  ;
-  return 0;
-}
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimespec.tv_nsec" "ac_cv_member_struct_stat_st_mtimespec_tv_nsec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_atim_tv_nsec=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_member_struct_stat_st_atim_tv_nsec=no
+
 fi
+ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimensec" "ac_cv_member_struct_stat_st_mtimensec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
+_ACEOF
+
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+ac_fn_c_check_member "$LINENO" "struct stat" "st_ctim.tv_nsec" "ac_cv_member_struct_stat_st_ctim_tv_nsec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_ctim_tv_nsec" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC 1
+_ACEOF
+
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atim_tv_nsec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_atim_tv_nsec" >&6; }
-if test $ac_cv_member_struct_stat_st_atim_tv_nsec = yes; then
+ac_fn_c_check_member "$LINENO" "struct stat" "st_ctimespec.tv_nsec" "ac_cv_member_struct_stat_st_ctimespec_tv_nsec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_ctimespec_tv_nsec" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
+#define HAVE_STRUCT_STAT_ST_CTIMESPEC_TV_NSEC 1
 _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_atimespec.tv_nsec" >&5
-echo $ECHO_N "checking for struct stat.st_atimespec.tv_nsec... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_atimespec_tv_nsec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+ac_fn_c_check_member "$LINENO" "struct stat" "st_ctimensec" "ac_cv_member_struct_stat_st_ctimensec" "$ac_includes_default"
+if test "x$ac_cv_member_struct_stat_st_ctimensec" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_CTIMENSEC 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timezone" >&5
+$as_echo_n "checking for struct timezone... " >&6; }
+if test "${zsh_cv_type_exists_struct_timezone+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (ac_aggr.st_atimespec.tv_nsec)
-return 0;
+struct timezone testvar;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_atimespec_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_type_exists_struct_timezone=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_type_exists_struct_timezone=no
+fi
+rm -f core 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
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_type_exists_struct_timezone" >&5
+$as_echo "$zsh_cv_type_exists_struct_timezone" >&6; }
+
+if test $zsh_cv_type_exists_struct_timezone = yes; then
+  $as_echo "#define HAVE_STRUCT_TIMEZONE 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utmp" >&5
+$as_echo_n "checking for struct utmp... " >&6; }
+if test "${zsh_cv_type_exists_struct_utmp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_UTMP_H
+# include <utmp.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_atimespec.tv_nsec)
-return 0;
+struct utmp testvar;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_atimespec_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_type_exists_struct_utmp=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_atimespec_tv_nsec=no
+  zsh_cv_type_exists_struct_utmp=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
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atimespec_tv_nsec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_atimespec_tv_nsec" >&6; }
-if test $ac_cv_member_struct_stat_st_atimespec_tv_nsec = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_type_exists_struct_utmp" >&5
+$as_echo "$zsh_cv_type_exists_struct_utmp" >&6; }
 
+if test $zsh_cv_type_exists_struct_utmp = yes; then
+  $as_echo "#define HAVE_STRUCT_UTMP 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_atimensec" >&5
-echo $ECHO_N "checking for struct stat.st_atimensec... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_atimensec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utmpx" >&5
+$as_echo_n "checking for struct utmpx... " >&6; }
+if test "${zsh_cv_type_exists_struct_utmpx+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_UTMPX_H
+# include <utmpx.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (ac_aggr.st_atimensec)
-return 0;
+struct utmpx testvar;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_atimensec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_type_exists_struct_utmpx=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_type_exists_struct_utmpx=no
+fi
+rm -f core 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
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_type_exists_struct_utmpx" >&5
+$as_echo "$zsh_cv_type_exists_struct_utmpx" >&6; }
+
+if test $zsh_cv_type_exists_struct_utmpx = yes; then
+  $as_echo "#define HAVE_STRUCT_UTMPX 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_host in struct utmp" >&5
+$as_echo_n "checking for ut_host in struct utmp... " >&6; }
+if test "${zsh_cv_struct_member_struct_utmp_ut_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_UTMP_H
+# include <utmp.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_atimensec)
-return 0;
+struct utmp testvar; testvar.ut_host;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_atimensec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_struct_member_struct_utmp_ut_host=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_atimensec=no
+  zsh_cv_struct_member_struct_utmp_ut_host=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
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atimensec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_atimensec" >&6; }
-if test $ac_cv_member_struct_stat_st_atimensec = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_struct_member_struct_utmp_ut_host" >&5
+$as_echo "$zsh_cv_struct_member_struct_utmp_ut_host" >&6; }
 
+if test $zsh_cv_struct_member_struct_utmp_ut_host = yes; then
+  $as_echo "#define HAVE_STRUCT_UTMP_UT_HOST 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
-echo $ECHO_N "checking for struct stat.st_mtim.tv_nsec... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_mtim_tv_nsec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_host in struct utmpx" >&5
+$as_echo_n "checking for ut_host in struct utmpx... " >&6; }
+if test "${zsh_cv_struct_member_struct_utmpx_ut_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_UTMPX_H
+# include <utmpx.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (ac_aggr.st_mtim.tv_nsec)
-return 0;
+struct utmpx testvar; testvar.ut_host;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_struct_member_struct_utmpx_ut_host=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_struct_member_struct_utmpx_ut_host=no
+fi
+rm -f core 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
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_struct_member_struct_utmpx_ut_host" >&5
+$as_echo "$zsh_cv_struct_member_struct_utmpx_ut_host" >&6; }
+
+if test $zsh_cv_struct_member_struct_utmpx_ut_host = yes; then
+  $as_echo "#define HAVE_STRUCT_UTMPX_UT_HOST 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_xtime in struct utmpx" >&5
+$as_echo_n "checking for ut_xtime in struct utmpx... " >&6; }
+if test "${zsh_cv_struct_member_struct_utmpx_ut_xtime+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_UTMPX_H
+# include <utmpx.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_mtim.tv_nsec)
-return 0;
+struct utmpx testvar; testvar.ut_xtime;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_struct_member_struct_utmpx_ut_xtime=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_mtim_tv_nsec=no
+  zsh_cv_struct_member_struct_utmpx_ut_xtime=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
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim_tv_nsec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim_tv_nsec" >&6; }
-if test $ac_cv_member_struct_stat_st_mtim_tv_nsec = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_struct_member_struct_utmpx_ut_xtime" >&5
+$as_echo "$zsh_cv_struct_member_struct_utmpx_ut_xtime" >&6; }
 
+if test $zsh_cv_struct_member_struct_utmpx_ut_xtime = yes; then
+  $as_echo "#define HAVE_STRUCT_UTMPX_UT_XTIME 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_mtimespec.tv_nsec" >&5
-echo $ECHO_N "checking for struct stat.st_mtimespec.tv_nsec... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_mtimespec_tv_nsec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_tv in struct utmpx" >&5
+$as_echo_n "checking for ut_tv in struct utmpx... " >&6; }
+if test "${zsh_cv_struct_member_struct_utmpx_ut_tv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_UTMPX_H
+# include <utmpx.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (ac_aggr.st_mtimespec.tv_nsec)
-return 0;
+struct utmpx testvar; testvar.ut_tv;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_struct_member_struct_utmpx_ut_tv=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_struct_member_struct_utmpx_ut_tv=no
+fi
+rm -f core 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
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_struct_member_struct_utmpx_ut_tv" >&5
+$as_echo "$zsh_cv_struct_member_struct_utmpx_ut_tv" >&6; }
+
+if test $zsh_cv_struct_member_struct_utmpx_ut_tv = yes; then
+  $as_echo "#define HAVE_STRUCT_UTMPX_UT_TV 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_ino in struct dirent" >&5
+$as_echo_n "checking for d_ino in struct dirent... " >&6; }
+if test "${zsh_cv_struct_member_struct_dirent_d_ino+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_mtimespec.tv_nsec)
-return 0;
+struct dirent testvar; testvar.d_ino;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_struct_member_struct_dirent_d_ino=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
+  zsh_cv_struct_member_struct_dirent_d_ino=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
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&6; }
-if test $ac_cv_member_struct_stat_st_mtimespec_tv_nsec = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_struct_member_struct_dirent_d_ino" >&5
+$as_echo "$zsh_cv_struct_member_struct_dirent_d_ino" >&6; }
 
+if test $zsh_cv_struct_member_struct_dirent_d_ino = yes; then
+  $as_echo "#define HAVE_STRUCT_DIRENT_D_INO 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
-echo $ECHO_N "checking for struct stat.st_mtimensec... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_mtimensec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_stat in struct dirent" >&5
+$as_echo_n "checking for d_stat in struct dirent... " >&6; }
+if test "${zsh_cv_struct_member_struct_dirent_d_stat+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (ac_aggr.st_mtimensec)
-return 0;
+struct dirent testvar; testvar.d_stat;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_mtimensec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_struct_member_struct_dirent_d_stat=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_struct_member_struct_dirent_d_stat=no
+fi
+rm -f core 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
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_struct_member_struct_dirent_d_stat" >&5
+$as_echo "$zsh_cv_struct_member_struct_dirent_d_stat" >&6; }
+
+if test $zsh_cv_struct_member_struct_dirent_d_stat = yes; then
+  $as_echo "#define HAVE_STRUCT_DIRENT_D_STAT 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_ino in struct direct" >&5
+$as_echo_n "checking for d_ino in struct direct... " >&6; }
+if test "${zsh_cv_struct_member_struct_direct_d_ino+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_NDIR_H
+# include <sys/ndir.h>
+#endif
+#ifdef HAVE_SYS_DIR_H
+# include <sys/dir.h>
+#endif
+#ifdef HAVE_NDIR_H
+# include <ndir.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_mtimensec)
-return 0;
+struct direct testvar; testvar.d_ino;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_mtimensec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_struct_member_struct_direct_d_ino=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_mtimensec=no
+  zsh_cv_struct_member_struct_direct_d_ino=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
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtimensec" >&6; }
-if test $ac_cv_member_struct_stat_st_mtimensec = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_struct_member_struct_direct_d_ino" >&5
+$as_echo "$zsh_cv_struct_member_struct_direct_d_ino" >&6; }
 
+if test $zsh_cv_struct_member_struct_direct_d_ino = yes; then
+  $as_echo "#define HAVE_STRUCT_DIRECT_D_INO 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_ctim.tv_nsec" >&5
-echo $ECHO_N "checking for struct stat.st_ctim.tv_nsec... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_ctim_tv_nsec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_stat in struct direct" >&5
+$as_echo_n "checking for d_stat in struct direct... " >&6; }
+if test "${zsh_cv_struct_member_struct_direct_d_stat+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_NDIR_H
+# include <sys/ndir.h>
+#endif
+#ifdef HAVE_SYS_DIR_H
+# include <sys/dir.h>
+#endif
+#ifdef HAVE_NDIR_H
+# include <ndir.h>
+#endif
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (ac_aggr.st_ctim.tv_nsec)
-return 0;
+struct direct testvar; testvar.d_stat;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_ctim_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_struct_member_struct_direct_d_stat=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_struct_member_struct_direct_d_stat=no
+fi
+rm -f core 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
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_struct_member_struct_direct_d_stat" >&5
+$as_echo "$zsh_cv_struct_member_struct_direct_d_stat" >&6; }
+
+if test $zsh_cv_struct_member_struct_direct_d_stat = yes; then
+  $as_echo "#define HAVE_STRUCT_DIRECT_D_STAT 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin6_scope_id in struct sockaddr_in6" >&5
+$as_echo_n "checking for sin6_scope_id in struct sockaddr_in6... " >&6; }
+if test "${zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <netinet/in.h>
+
 int
 main ()
 {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_ctim.tv_nsec)
-return 0;
+struct sockaddr_in6 testvar; testvar.sin6_scope_id;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_ctim_tv_nsec=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_ctim_tv_nsec=no
+  zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id" >&5
+$as_echo "$zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id" >&6; }
+
+if test $zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id = yes; then
+  $as_echo "#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1" >>confdefs.h
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctim_tv_nsec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_ctim_tv_nsec" >&6; }
-if test $ac_cv_member_struct_stat_st_ctim_tv_nsec = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC 1
-_ACEOF
 
 
-fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_ctimespec.tv_nsec" >&5
-echo $ECHO_N "checking for struct stat.st_ctimespec.tv_nsec... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_ctimespec_tv_nsec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need our own h_errno" >&5
+$as_echo_n "checking if we need our own h_errno... " >&6; }
+if test "${zsh_cv_decl_h_errno_use_local+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_ctimespec.tv_nsec)
-return 0;
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_ctimespec_tv_nsec=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	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
 int
 main ()
 {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_ctimespec.tv_nsec)
-return 0;
+extern int h_errno; h_errno = 0;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_ctimespec_tv_nsec=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  zsh_cv_decl_h_errno_use_local=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_ctimespec_tv_nsec=no
+  zsh_cv_decl_h_errno_use_local=yes
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_decl_h_errno_use_local" >&5
+$as_echo "$zsh_cv_decl_h_errno_use_local" >&6; }
+
+if test x$zsh_cv_decl_h_errno_use_local = xyes; then
+  $as_echo "#define USE_LOCAL_H_ERRNO 1" >>confdefs.h
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctimespec_tv_nsec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_ctimespec_tv_nsec" >&6; }
-if test $ac_cv_member_struct_stat_st_ctimespec_tv_nsec = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_CTIMESPEC_TV_NSEC 1
-_ACEOF
 
 
+for ac_func in strftime strptime mktime timelocal \
+	       difftime gettimeofday \
+	       select poll \
+	       readlink faccessx fchdir ftruncate \
+	       fstat lstat lchown fchown fchmod \
+	       fseeko ftello \
+	       mkfifo _mktemp mkstemp \
+	       waitpid wait3 \
+	       sigaction sigblock sighold sigrelse sigsetmask sigprocmask \
+	       killpg setpgid setpgrp tcsetpgrp tcgetattr nice \
+	       gethostname gethostbyname2 getipnodebyname \
+	       inet_aton inet_pton inet_ntop \
+	       getlogin getpwent getpwnam getpwuid getgrgid getgrnam \
+	       initgroups nis_list \
+	       setuid seteuid setreuid setresuid setsid \
+	       memcpy memmove strstr strerror strtoul \
+	       getrlimit getrusage \
+	       setlocale \
+	       uname \
+	       signgam \
+	       putenv getenv setenv unsetenv xw\
+	       brk sbrk \
+	       pathconf sysconf \
+	       tgetent tigetflag tigetnum tigetstr setupterm initscr \
+	       getcchar setcchar waddwstr wget_wch win_wch use_default_colors \
+	       pcre_compile pcre_study pcre_exec \
+	       nl_langinfo \
+	       erand48 open_memstream \
+	       wctomb iconv \
+	       grantpt unlockpt ptsname \
+	       htons ntohs \
+	       regcomp regexec regerror regfree \
+	       gdbm_open getxattr \
+	       realpath canonicalize_file_name
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_ctimensec" >&5
-echo $ECHO_N "checking for struct stat.st_ctimensec... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_ctimensec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
+$as_echo_n "checking for working strcoll... " >&6; }
+if test "${ac_cv_func_strcoll_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  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
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_ctimensec)
-return 0;
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_ctimensec=yes
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_strcoll_works=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_ctimensec)
-return 0;
+return (strcoll ("abc", "def") >= 0 ||
+	 strcoll ("ABC", "DEF") >= 0 ||
+	 strcoll ("123", "456") >= 0)
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_ctimensec=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_strcoll_works=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_ctimensec=no
+  ac_cv_func_strcoll_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5
+$as_echo "$ac_cv_func_strcoll_works" >&6; }
+if test $ac_cv_func_strcoll_works = yes; then
+
+$as_echo "#define HAVE_STRCOLL 1" >>confdefs.h
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctimensec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_ctimensec" >&6; }
-if test $ac_cv_member_struct_stat_st_ctimensec = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_CTIMENSEC 1
+
+if test x$enable_cap = xyes; then
+  for ac_func in cap_get_proc
+do :
+  ac_fn_c_check_func "$LINENO" "cap_get_proc" "ac_cv_func_cap_get_proc"
+if test "x$ac_cv_func_cap_get_proc" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CAP_GET_PROC 1
 _ACEOF
 
+fi
+done
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking for struct timezone" >&5
-echo $ECHO_N "checking for struct timezone... $ECHO_C" >&6; }
-if test "${zsh_cv_type_exists_struct_timezone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tgetent accepts NULL" >&5
+$as_echo_n "checking if tgetent accepts NULL... " >&6; }
+if test "${zsh_cv_func_tgetent_accepts_null+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then :
+  zsh_cv_func_tgetent_accepts_null=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-int
-main ()
+main()
 {
-struct timezone testvar;
-  ;
-  return 0;
+    char buf[4096];
+    int r1 = tgetent(buf, "vt100");
+    int r2 = tgetent((char*)0,"vt100");
+    if (r1 >= 0 && r1 == r2) {
+        char tbuf[1024], *u;
+        u = tbuf;
+    	tgetstr("cl", &u);
+	creat("conftest.tgetent", 0640);
+    }
+    exit((r1 != r2) || r2 == -1);
 }
+
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_type_exists_struct_timezone=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  if test -f conftest.tgetent; then
+    zsh_cv_func_tgetent_accepts_null=yes
+  else
+    zsh_cv_func_tgetent_accepts_null=no
+  fi
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_type_exists_struct_timezone=no
+  zsh_cv_func_tgetent_accepts_null=no
 fi
-
-rm -f core conftest.err 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
-{ echo "$as_me:$LINENO: result: $zsh_cv_type_exists_struct_timezone" >&5
-echo "${ECHO_T}$zsh_cv_type_exists_struct_timezone" >&6; }
-
-
-if test $zsh_cv_type_exists_struct_timezone = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_TIMEZONE 1
-_ACEOF
 
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_func_tgetent_accepts_null" >&5
+$as_echo "$zsh_cv_func_tgetent_accepts_null" >&6; }
+if test x$zsh_cv_func_tgetent_accepts_null = xyes; then
+  $as_echo "#define TGETENT_ACCEPTS_NULL 1" >>confdefs.h
 
-
-{ echo "$as_me:$LINENO: checking for struct utmp" >&5
-echo $ECHO_N "checking for struct utmp... $ECHO_C" >&6; }
-if test "${zsh_cv_type_exists_struct_utmp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tgetent returns 0 on success" >&5
+$as_echo_n "checking if tgetent returns 0 on success... " >&6; }
+if test "${zsh_cv_func_tgetent_zero_success+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then :
+  zsh_cv_func_tgetent_zero_success=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_UTMP_H
-# include <utmp.h>
-#endif
-
-int
-main ()
+main()
 {
-struct utmp testvar;
-  ;
-  return 0;
+    char buf[4096];
+    int r1 = tgetent(buf, "!@#$%^&*");
+    int r2 = tgetent(buf, "vt100");
+    if (r1 < 0 && r2 == 0) {
+        char tbuf[1024], *u;
+        u = tbuf;
+    	tgetstr("cl", &u);
+	creat("conftest.tgetent0", 0640);
+    }
+    exit(r1 == r2);
 }
+
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_type_exists_struct_utmp=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  if test -f conftest.tgetent0; then
+    zsh_cv_func_tgetent_zero_success=yes
+  else
+    zsh_cv_func_tgetent_zero_success=no
+  fi
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_func_tgetent_zero_success=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
-	zsh_cv_type_exists_struct_utmp=no
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_func_tgetent_zero_success" >&5
+$as_echo "$zsh_cv_func_tgetent_zero_success" >&6; }
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test x$zsh_cv_func_tgetent_zero_success = xyes; then
+  $as_echo "#define TGETENT_SUCCESS 0" >>confdefs.h
+
+else
+  $as_echo "#define TGETENT_SUCCESS 1" >>confdefs.h
+
+fi
+
+for ac_header in stdlib.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_type_exists_struct_utmp" >&5
-echo "${ECHO_T}$zsh_cv_type_exists_struct_utmp" >&6; }
 
+done
 
-if test $zsh_cv_type_exists_struct_utmp = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_UTMP 1
+for ac_func in getpagesize
+do :
+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPAGESIZE 1
 _ACEOF
 
 fi
+done
 
-{ echo "$as_me:$LINENO: checking for struct utmpx" >&5
-echo $ECHO_N "checking for struct utmpx... $ECHO_C" >&6; }
-if test "${zsh_cv_type_exists_struct_utmpx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_mmap_fixed_mapped=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+$ac_includes_default
+/* malloc might have been renamed as rpl_malloc. */
+#undef malloc
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_UTMPX_H
-# include <utmpx.h>
-#endif
-
-int
-main ()
-{
-struct utmpx testvar;
-  ;
+/* Thanks to Mike Haertel and Jim Avera for this test.
+   Here is a matrix of mmap possibilities:
+	mmap private not fixed
+	mmap private fixed at somewhere currently unmapped
+	mmap private fixed at somewhere already mapped
+	mmap shared not fixed
+	mmap shared fixed at somewhere currently unmapped
+	mmap shared fixed at somewhere already mapped
+   For private mappings, we should verify that changes cannot be read()
+   back from the file, nor mmap's back from the file at a different
+   address.  (There have been systems where private was not correctly
+   implemented like the infamous i386 svr4.0, and systems where the
+   VM page cache was not coherent with the file system buffer cache
+   like early versions of FreeBSD and possibly contemporary NetBSD.)
+   For shared mappings, we should conversely verify that changes get
+   propagated back to all the places they're supposed to be.
+
+   Grep wants private fixed already mapped.
+   The main things grep needs to know about mmap are:
+   * does it exist and is it safe to write into the mmap'd area
+   * how to use it (BSD variants)  */
+
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+char *malloc ();
+#endif
+
+/* This mess was copied from the GNU getpagesize.h.  */
+#ifndef HAVE_GETPAGESIZE
+/* Assume that all systems that can run configure have sys/param.h.  */
+# ifndef HAVE_SYS_PARAM_H
+#  define HAVE_SYS_PARAM_H 1
+# endif
+
+# ifdef _SC_PAGESIZE
+#  define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+#  ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else /* no EXEC_PAGESIZE */
+#    ifdef NBPG
+#     define getpagesize() NBPG * CLSIZE
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif /* no CLSIZE */
+#    else /* no NBPG */
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     else /* no NBPC */
+#      ifdef PAGESIZE
+#       define getpagesize() PAGESIZE
+#      endif /* PAGESIZE */
+#     endif /* no NBPC */
+#    endif /* no NBPG */
+#   endif /* no EXEC_PAGESIZE */
+#  else /* no HAVE_SYS_PARAM_H */
+#   define getpagesize() 8192	/* punt totally */
+#  endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
+
+int
+main ()
+{
+  char *data, *data2, *data3;
+  int i, pagesize;
+  int fd;
+
+  pagesize = getpagesize ();
+
+  /* First, make a file with some known garbage in it. */
+  data = (char *) malloc (pagesize);
+  if (!data)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    *(data + i) = rand ();
+  umask (0);
+  fd = creat ("conftest.mmap", 0600);
+  if (fd < 0)
+    return 1;
+  if (write (fd, data, pagesize) != pagesize)
+    return 1;
+  close (fd);
+
+  /* Next, try to mmap the file at a fixed address which already has
+     something else allocated at it.  If we can, also make sure that
+     we see the same garbage.  */
+  fd = open ("conftest.mmap", O_RDWR);
+  if (fd < 0)
+    return 1;
+  data2 = (char *) malloc (2 * pagesize);
+  if (!data2)
+    return 1;
+  data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data2 + i))
+      return 1;
+
+  /* Finally, make sure that changes to the mapped area do not
+     percolate back to the file as seen by read().  (This is a bug on
+     some variants of i386 svr4.0.)  */
+  for (i = 0; i < pagesize; ++i)
+    *(data2 + i) = *(data2 + i) + 1;
+  data3 = (char *) malloc (pagesize);
+  if (!data3)
+    return 1;
+  if (read (fd, data3, pagesize) != pagesize)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data3 + i))
+      return 1;
+  close (fd);
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_type_exists_struct_utmpx=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_mmap_fixed_mapped=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_func_mmap_fixed_mapped=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
-	zsh_cv_type_exists_struct_utmpx=no
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_type_exists_struct_utmpx" >&5
-echo "${ECHO_T}$zsh_cv_type_exists_struct_utmpx" >&6; }
-
+rm -f conftest.mmap
 
-if test $zsh_cv_type_exists_struct_utmpx = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_UTMPX 1
+if test x$ac_cv_func_mmap_fixed_mapped = xyes; then
+  for ac_func in munmap msync
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
+done
 
+fi
 
-{ echo "$as_me:$LINENO: checking for ut_host in struct utmp" >&5
-echo $ECHO_N "checking for ut_host in struct utmp... $ECHO_C" >&6; }
-if test "${zsh_cv_struct_member_struct_utmp_ut_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test x$ac_cv_func_setpgrp = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5
+$as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
+if test "${ac_cv_func_getpgrp_void+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  # Use it with a single arg.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_UTMP_H
-# include <utmp.h>
-#endif
-
+$ac_includes_default
 int
 main ()
 {
-struct utmp testvar; testvar.ut_host;
+getpgrp (0);
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_struct_member_struct_utmp_ut_host=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getpgrp_void=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_cv_func_getpgrp_void=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-	zsh_cv_struct_member_struct_utmp_ut_host=no
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getpgrp_void" >&5
+$as_echo "$ac_cv_func_getpgrp_void" >&6; }
+if test $ac_cv_func_getpgrp_void = yes; then
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+$as_echo "#define GETPGRP_VOID 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_struct_member_struct_utmp_ut_host" >&5
-echo "${ECHO_T}$zsh_cv_struct_member_struct_utmp_ut_host" >&6; }
 
+else
+          ac_cv_func_getpgrp_void=yes
+  $as_echo "#define GETPGRP_VOID 1" >>confdefs.h
 
-if test $zsh_cv_struct_member_struct_utmp_ut_host = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_UTMP_UT_HOST 1
+fi
+
+if test x$dynamic = xyes; then
+  for ac_func in dlopen dlerror dlsym dlclose load loadquery loadbind unload \
+		shl_load shl_unload shl_findsym
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
+done
 
-{ echo "$as_me:$LINENO: checking for ut_host in struct utmpx" >&5
-echo $ECHO_N "checking for ut_host in struct utmpx... $ECHO_C" >&6; }
-if test "${zsh_cv_struct_member_struct_utmpx_ut_host+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.  */
+fi
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_UTMPX_H
-# include <utmpx.h>
-#endif
 
+if test x$ac_cv_func_getxattr = xyes && test x$ac_cv_header_sys_xattr_h = xyes
+then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getxattr etc. are Linux-like" >&5
+$as_echo_n "checking if getxattr etc. are Linux-like... " >&6; }
+if test "${zsh_cv_getxattr_linux+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/xattr.h>
 int
 main ()
 {
-struct utmpx testvar; testvar.ut_host;
+
+  (void)listxattr("", 0, 0);
+  (void)getxattr("", "", 0, 0);
+  (void)setxattr("", "", "", 0, 0);
+  (void)removexattr("", "");
+
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_struct_member_struct_utmpx_ut_host=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_getxattr_linux=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_struct_member_struct_utmpx_ut_host=no
+  zsh_cv_getxattr_linux=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_struct_member_struct_utmpx_ut_host" >&5
-echo "${ECHO_T}$zsh_cv_struct_member_struct_utmpx_ut_host" >&6; }
-
-
-if test $zsh_cv_struct_member_struct_utmpx_ut_host = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_UTMPX_UT_HOST 1
-_ACEOF
-
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_getxattr_linux" >&5
+$as_echo "$zsh_cv_getxattr_linux" >&6; }
 
-{ echo "$as_me:$LINENO: checking for ut_xtime in struct utmpx" >&5
-echo $ECHO_N "checking for ut_xtime in struct utmpx... $ECHO_C" >&6; }
-if test "${zsh_cv_struct_member_struct_utmpx_ut_xtime+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test x$zsh_cv_getxattr_linux != xyes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getxattr etc. are MAC-like" >&5
+$as_echo_n "checking if getxattr etc. are MAC-like... " >&6; }
+if test "${zsh_cv_getxattr_mac+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_UTMPX_H
-# include <utmpx.h>
-#endif
-
+#include <sys/types.h>
+#include <sys/xattr.h>
 int
 main ()
 {
-struct utmpx testvar; testvar.ut_xtime;
+(void)listxattr("", 0, 0, 0);
+    (void)getxattr("", "", 0, 0, 0, 0);
+    (void)setxattr("", "", "", 0, 0, 0);
+    (void)removexattr("", "", 0);
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_struct_member_struct_utmpx_ut_xtime=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_getxattr_mac=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_struct_member_struct_utmpx_ut_xtime=no
+  zsh_cv_getxattr_mac=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_struct_member_struct_utmpx_ut_xtime" >&5
-echo "${ECHO_T}$zsh_cv_struct_member_struct_utmpx_ut_xtime" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_getxattr_mac" >&5
+$as_echo "$zsh_cv_getxattr_mac" >&6; }
 
+    if test x$zsh_cv_getxattr_mac = xyes; then
+      $as_echo "#define XATTR_EXTRA_ARGS 1" >>confdefs.h
 
-if test $zsh_cv_struct_member_struct_utmpx_ut_xtime = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_UTMPX_UT_XTIME 1
-_ACEOF
-
+    fi
+  fi
 fi
 
-{ echo "$as_me:$LINENO: checking for ut_tv in struct utmpx" >&5
-echo $ECHO_N "checking for ut_tv in struct utmpx... $ECHO_C" >&6; }
-if test "${zsh_cv_struct_member_struct_utmpx_ut_tv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if getxattr etc. are usable" >&5
+$as_echo_n "checking if getxattr etc. are usable... " >&6; }
+if test "${zsh_cv_use_xattr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 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_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_UTMPX_H
-# include <utmpx.h>
-#endif
-
-int
-main ()
-{
-struct utmpx testvar; testvar.ut_tv;
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_struct_member_struct_utmpx_ut_tv=yes
+  if test x$zsh_cv_getxattr_linux = xyes || test x$zsh_cv_getxattr_mac = xyes
+then
+zsh_cv_use_xattr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_struct_member_struct_utmpx_ut_tv=no
+zsh_cv_use_xattr=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_struct_member_struct_utmpx_ut_tv" >&5
-echo "${ECHO_T}$zsh_cv_struct_member_struct_utmpx_ut_tv" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_use_xattr" >&5
+$as_echo "$zsh_cv_use_xattr" >&6; }
 
 
-if test $zsh_cv_struct_member_struct_utmpx_ut_tv = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_UTMPX_UT_TV 1
-_ACEOF
 
-fi
 
 
-{ echo "$as_me:$LINENO: checking for d_ino in struct dirent" >&5
-echo $ECHO_N "checking for d_ino in struct dirent... $ECHO_C" >&6; }
-if test "${zsh_cv_struct_member_struct_dirent_d_ino+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.  */
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what style of signals to use" >&5
+$as_echo_n "checking what style of signals to use... " >&6; }
+if test x$ac_cv_func_sigaction = xyes && test x$ac_cv_func_sigprocmask = xyes; then
+  signals_style=POSIX_SIGNALS
+  $as_echo "#define POSIX_SIGNALS 1" >>confdefs.h
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
+elif test x$ac_cv_func_sigblock = xyes && test x$ac_cv_func_sigsetmask = xyes; then
+  signals_style=BSD_SIGNALS
+  $as_echo "#define BSD_SIGNALS 1" >>confdefs.h
+
+elif test x$ac_cv_func_sighold = xyes && test x$ac_cv_func_sigrelse = xyes; then
+  signals_style=SYSV_SIGNALS
+  $as_echo "#define SYSV_SIGNALS 1" >>confdefs.h
 
-int
-main ()
-{
-struct dirent testvar; testvar.d_ino;
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_struct_member_struct_dirent_d_ino=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  signals_style=NO_SIGNAL_BLOCKING
+  $as_echo "#define NO_SIGNAL_BLOCKING 1" >>confdefs.h
 
-	zsh_cv_struct_member_struct_dirent_d_ino=no
 fi
+cat >>confdefs.h <<_ACEOF
+#define $signals_style 1
+_ACEOF
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $signals_style" >&5
+$as_echo "$signals_style" >&6; }
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where signal.h is located" >&5
+$as_echo_n "checking where signal.h is located... " >&6; }
+if test "${zsh_cv_path_signal_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  echo "#include <signal.h>" > nametmp.c
+sigfile_list="`$CPP nametmp.c |
+sed -n -e 's/^#line[ 	].*\"\(.*\)\"/\1/p' \
+       -e 's/^#[ 	].*\"\(.*\)\"/\1/p' |
+sed 's/\\\\\\\\/\//g' |
+$AWK '{ if ($1 ~ /sig/) files[$1] = $1 }
+  END { for (var in files) print var }'`"
+rm -f nametmp.c
+if test -z "$sigfile_list"; then
+      sigfile_list="/usr/include/sys/iso/signal_iso.h
+/usr/include/bsd/sys/signal.h
+/usr/include/signum.h
+/usr/include/asm/signum.h
+/usr/include/asm/signal.h
+/usr/include/linux/signal.h
+/usr/include/sys/signal.h
+/usr/include/bits/signum.h
+/dev/null"
+fi
+for SIGNAL_H in $sigfile_list
+do
+        nsigs=`test -f $SIGNAL_H && \
+  grep '#[ 	]*define[ 	][ 	]*SIG[0-9A-Z]*[ 	]*[0-9][0-9]*' $SIGNAL_H | \
+  wc -l | sed 's/ 	//g'`
+  test "x$nsigs" != x && test "$nsigs" -ge 7 && break
+done
+if test x$SIGNAL_H = x"/dev/null"; then
+  as_fn_error "SIGNAL MACROS NOT FOUND:  please report to developers" "$LINENO" 5
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_struct_member_struct_dirent_d_ino" >&5
-echo "${ECHO_T}$zsh_cv_struct_member_struct_dirent_d_ino" >&6; }
+zsh_cv_path_signal_h=$SIGNAL_H
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_path_signal_h" >&5
+$as_echo "$zsh_cv_path_signal_h" >&6; }
+SIGNAL_H=$zsh_cv_path_signal_h
 
-if test $zsh_cv_struct_member_struct_dirent_d_ino = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_DIRENT_D_INO 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where error names are located" >&5
+$as_echo_n "checking where error names are located... " >&6; }
+if test "${zsh_cv_path_errno_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  echo "#include <errno.h>" > nametmp.c
+errfile_list="`$CPP nametmp.c |
+sed -n -e 's/^#line[ 	].*\"\(.*\)\"/\1/p' \
+       -e 's/^#[ 	0-9].*\"\(.*\)\"/\1/p' |
+sed 's/\\\\\\\\/\//g' |
+$AWK '{ if ($1 ~ /err/) files[$1] = $1 }
+  END { for (var in files) print var }'`"
+rm -f nametmp.c
+for ERRNO_TRY_H in $errfile_list /dev/null
+do
+              nerrs=`test -f $ERRNO_TRY_H && \
+  $EGREP '#[ 	]*define[ 	][ 	]*E[0-9A-Z]*[ 	]*(_HURD_ERRNO )?\(?[_A-Z0-9]' $ERRNO_TRY_H | \
+  wc -l | sed 's/ 	//g'`
+  if test "x$nerrs" != x && test "$nerrs" -ge 1
+  then
+    ERRNO_H="$ERRNO_H $ERRNO_TRY_H"
+  fi
+done
+if test x"$ERRNO_H" = x; then
+  as_fn_error "ERROR MACROS NOT FOUND:  please report to developers" "$LINENO" 5
+fi
+zsh_cv_path_errno_h="$ERRNO_H"
 
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_path_errno_h" >&5
+$as_echo "$zsh_cv_path_errno_h" >&6; }
+ERRNO_H="$zsh_cv_path_errno_h"
 
-{ echo "$as_me:$LINENO: checking for d_stat in struct dirent" >&5
-echo $ECHO_N "checking for d_stat in struct dirent... $ECHO_C" >&6; }
-if test "${zsh_cv_struct_member_struct_dirent_d_stat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking location of curses header" >&5
+$as_echo_n "checking location of curses header... " >&6; }
+if test "${zsh_cv_path_curses_header+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  if test x$zsh_cv_ignore_ncurses = xyes; then
+  if test x$ac_cv_header_curses_h = xyes; then
+    zsh_cv_path_curses_header=curses.h
+  else
+    zsh_cv_path_curses_header=none
+  fi
+elif test x$ac_cv_header_ncursesw_ncurses_h = xyes; then
+  zsh_cv_path_curses_header=ncursesw/ncurses.h
+elif test x$ac_cv_header_ncurses_ncurses_h = xyes; then
+  zsh_cv_path_curses_header=ncurses/ncurses.h
+elif test x$ac_cv_header_ncurses_h = xyes; then
+  zsh_cv_path_curses_header=ncurses.h
+elif test x$ac_cv_header_curses_h = xyes; then
+  zsh_cv_path_curses_header=curses.h
+else
+  zsh_cv_path_curses_header=none
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_path_curses_header" >&5
+$as_echo "$zsh_cv_path_curses_header" >&6; }
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#endif
+if test x$zsh_cv_path_curses_header != xnone; then
+  $as_echo "#define ZSH_HAVE_CURSES_H 1" >>confdefs.h
 
-int
-main ()
-{
-struct dirent testvar; testvar.d_stat;
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_struct_member_struct_dirent_d_stat=yes
+  ZSH_CURSES_H=$zsh_cv_path_curses_header
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_struct_member_struct_dirent_d_stat=no
+  ZSH_CURSES_H=
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where curses key definitions are located" >&5
+$as_echo_n "checking where curses key definitions are located... " >&6; }
+if test "${zsh_cv_path_curses_keys_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test x$zsh_cv_path_curses_header = xnone; then
+  echo >nametmp.c
+else
+  echo "#include <$zsh_cv_path_curses_header>" >nametmp.c
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_struct_member_struct_dirent_d_stat" >&5
-echo "${ECHO_T}$zsh_cv_struct_member_struct_dirent_d_stat" >&6; }
 
-
-if test $zsh_cv_struct_member_struct_dirent_d_stat = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_DIRENT_D_STAT 1
-_ACEOF
+curses_list="`$CPP nametmp.c |
+sed -n -e 's/^#line[ 	].*\"\(.*\)\"/\1/p' \
+       -e 's/^#[ 	0-9].*\"\(.*\)\"/\1/p' |
+sed 's/\\\\\\\\/\//g' |
+$AWK '{ if ($1 ~ /\.h/) files[$1] = $1 }
+  END { for (var in files) print var }'`"
+rm -f nametmp.c
+for CURSES_TRY_H in $curses_list /dev/null
+do
+  nkeys=`test -f $CURSES_TRY_H && \
+  $EGREP '#[ 	]*define[ 	][ 	]*KEY_' $CURSES_TRY_H | \
+  wc -l | sed 's/ 	//g'`
+  if test "x$nkeys" != x && test "$nkeys" -ge 10
+  then
+    CURSES_KEYS_H=$CURSES_TRY_H
+    break
+  fi
+done
+zsh_cv_path_curses_keys_h="$CURSES_KEYS_H"
 
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_path_curses_keys_h" >&5
+$as_echo "$zsh_cv_path_curses_keys_h" >&6; }
+CURSES_KEYS_H="$zsh_cv_path_curses_keys_h"
 
-{ echo "$as_me:$LINENO: checking for d_ino in struct direct" >&5
-echo $ECHO_N "checking for d_ino in struct direct... $ECHO_C" >&6; }
-if test "${zsh_cv_struct_member_struct_direct_d_ino+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+for ac_header in ncursesw/term.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "ncursesw/term.h" "ac_cv_header_ncursesw_term_h" "#include <ncursesw/ncurses.h>
+"
+if test "x$ac_cv_header_ncursesw_term_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NCURSESW_TERM_H 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+ true
+else
+  true
+fi
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-#endif
-#ifdef HAVE_SYS_DIR_H
-# include <sys/dir.h>
-#endif
-#ifdef HAVE_NDIR_H
-# include <ndir.h>
-#endif
+done
 
-int
-main ()
-{
-struct direct testvar; testvar.d_ino;
-  ;
-  return 0;
-}
+for ac_header in ncurses/term.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "ncurses/term.h" "ac_cv_header_ncurses_term_h" "#include <ncurses/ncurses.h>
+"
+if test "x$ac_cv_header_ncurses_term_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NCURSES_TERM_H 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_struct_member_struct_direct_d_ino=yes
+ true
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_struct_member_struct_direct_d_ino=no
+  true
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_struct_member_struct_direct_d_ino" >&5
-echo "${ECHO_T}$zsh_cv_struct_member_struct_direct_d_ino" >&6; }
-
-
-if test $zsh_cv_struct_member_struct_direct_d_ino = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_DIRECT_D_INO 1
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for d_stat in struct direct" >&5
-echo $ECHO_N "checking for d_stat in struct direct... $ECHO_C" >&6; }
-if test "${zsh_cv_struct_member_struct_direct_d_stat+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.  */
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-#endif
-#ifdef HAVE_SYS_DIR_H
-# include <sys/dir.h>
-#endif
-#ifdef HAVE_NDIR_H
-# include <ndir.h>
-#endif
-
-int
-main ()
-{
-struct direct testvar; testvar.d_stat;
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_struct_member_struct_direct_d_stat=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_struct_member_struct_direct_d_stat=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_struct_member_struct_direct_d_stat" >&5
-echo "${ECHO_T}$zsh_cv_struct_member_struct_direct_d_stat" >&6; }
-
-
-if test $zsh_cv_struct_member_struct_direct_d_stat = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_DIRECT_D_STAT 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for sin6_scope_id in struct sockaddr_in6" >&5
-echo $ECHO_N "checking for sin6_scope_id in struct sockaddr_in6... $ECHO_C" >&6; }
-if test "${zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id+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.  */
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <netinet/in.h>
-
-int
-main ()
-{
-struct sockaddr_in6 testvar; testvar.sin6_scope_id;
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id" >&5
-echo "${ECHO_T}$zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id" >&6; }
-
-
-if test $zsh_cv_struct_member_struct_sockaddr_in6_sin6_scope_id = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-_ACEOF
-
-fi
-
-
-
-
-{ echo "$as_me:$LINENO: checking if we need our own h_errno" >&5
-echo $ECHO_N "checking if we need our own h_errno... $ECHO_C" >&6; }
-if test "${zsh_cv_decl_h_errno_use_local+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.  */
-
-int
-main ()
-{
-extern int h_errno; h_errno = 0;
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  zsh_cv_decl_h_errno_use_local=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_decl_h_errno_use_local=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_decl_h_errno_use_local" >&5
-echo "${ECHO_T}$zsh_cv_decl_h_errno_use_local" >&6; }
-
-if test x$zsh_cv_decl_h_errno_use_local = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define USE_LOCAL_H_ERRNO 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in strftime strptime mktime timelocal \
-	       difftime gettimeofday \
-	       select poll \
-	       readlink faccessx fchdir ftruncate \
-	       fstat lstat lchown fchown fchmod \
-	       fseeko ftello \
-	       mkfifo _mktemp mkstemp \
-	       waitpid wait3 \
-	       sigaction sigblock sighold sigrelse sigsetmask sigprocmask \
-	       killpg setpgid setpgrp tcsetpgrp tcgetattr nice \
-	       gethostname gethostbyname2 getipnodebyname \
-	       inet_aton inet_pton inet_ntop \
-	       getlogin getpwent getpwnam getpwuid getgrgid getgrnam \
-	       initgroups nis_list \
-	       setuid seteuid setreuid setresuid setsid \
-	       memcpy memmove strstr strerror strtoul \
-	       getrlimit getrusage \
-	       setlocale \
-	       uname \
-	       signgam \
-	       putenv getenv setenv unsetenv xw\
-	       brk sbrk \
-	       pathconf sysconf \
-	       tgetent tigetflag tigetnum tigetstr setupterm initscr \
-	       getcchar setcchar waddwstr wget_wch win_wch use_default_colors \
-	       pcre_compile pcre_study pcre_exec \
-	       nl_langinfo \
-	       erand48 open_memstream \
-	       wctomb iconv \
-	       grantpt unlockpt ptsname \
-	       htons ntohs \
-	       regcomp regexec regerror regfree \
-	       gdbm_open getxattr \
-	       realpath canonicalize_file_name
-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 { 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $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
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 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"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-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
-_ACEOF
-
-fi
-done
-
-{ echo "$as_me:$LINENO: checking for working strcoll" >&5
-echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6; }
-if test "${ac_cv_func_strcoll_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_strcoll_works=no
-else
-  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
-int
-main ()
-{
-return (strcoll ("abc", "def") >= 0 ||
-	 strcoll ("ABC", "DEF") >= 0 ||
-	 strcoll ("123", "456") >= 0)
-  ;
-  return 0;
-}
-_ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  ac_cv_func_strcoll_works=yes
-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_func_strcoll_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
-echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6; }
-if test $ac_cv_func_strcoll_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRCOLL 1
-_ACEOF
-
-fi
-
-
-if test x$enable_cap = xyes; then
-
-for ac_func in cap_get_proc
-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 { 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $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
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 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"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-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
-_ACEOF
-
-fi
-done
-
-fi
-
-
-
-{ echo "$as_me:$LINENO: checking if tgetent accepts NULL" >&5
-echo $ECHO_N "checking if tgetent accepts NULL... $ECHO_C" >&6; }
-if test "${zsh_cv_func_tgetent_accepts_null+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  zsh_cv_func_tgetent_accepts_null=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-main()
-{
-    char buf[4096];
-    int r1 = tgetent(buf, "vt100");
-    int r2 = tgetent((char*)0,"vt100");
-    if (r1 >= 0 && r1 == r2) {
-        char tbuf[1024], *u;
-        u = tbuf;
-    	tgetstr("cl", &u);
-	creat("conftest.tgetent", 0640);
-    }
-    exit((r1 != r2) || r2 == -1);
-}
-
-_ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  if test -f conftest.tgetent; then
-    zsh_cv_func_tgetent_accepts_null=yes
-  else
-    zsh_cv_func_tgetent_accepts_null=no
-  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 )
-zsh_cv_func_tgetent_accepts_null=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_func_tgetent_accepts_null" >&5
-echo "${ECHO_T}$zsh_cv_func_tgetent_accepts_null" >&6; }
-if test x$zsh_cv_func_tgetent_accepts_null = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define TGETENT_ACCEPTS_NULL 1
-_ACEOF
-
-fi
-{ echo "$as_me:$LINENO: checking if tgetent returns 0 on success" >&5
-echo $ECHO_N "checking if tgetent returns 0 on success... $ECHO_C" >&6; }
-if test "${zsh_cv_func_tgetent_zero_success+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  zsh_cv_func_tgetent_zero_success=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-main()
-{
-    char buf[4096];
-    int r1 = tgetent(buf, "!@#$%^&*");
-    int r2 = tgetent(buf, "vt100");
-    if (r1 < 0 && r2 == 0) {
-        char tbuf[1024], *u;
-        u = tbuf;
-    	tgetstr("cl", &u);
-	creat("conftest.tgetent0", 0640);
-    }
-    exit(r1 == r2);
-}
-
-_ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  if test -f conftest.tgetent0; then
-    zsh_cv_func_tgetent_zero_success=yes
-  else
-    zsh_cv_func_tgetent_zero_success=no
-  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 )
-zsh_cv_func_tgetent_zero_success=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_func_tgetent_zero_success" >&5
-echo "${ECHO_T}$zsh_cv_func_tgetent_zero_success" >&6; }
-
-
-if test x$zsh_cv_func_tgetent_zero_success = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define TGETENT_SUCCESS 0
-_ACEOF
-
-else
-  cat >>confdefs.h <<\_ACEOF
-#define TGETENT_SUCCESS 1
-_ACEOF
-
-fi
-
-
-
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-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
-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; }
-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 <$ac_header>
-_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); } && {
-	 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
-fi
-
-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; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-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 && {
-	 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  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; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-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;}
-
-    ;;
-esac
-{ 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
-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
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_func in getpagesize
-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 { 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $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
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 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"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-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
-_ACEOF
-
-fi
-done
-
-{ echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  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
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the file system buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propagated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-int
-main ()
-{
-  char *data, *data2, *data3;
-  int i, pagesize;
-  int fd;
-
-  pagesize = getpagesize ();
-
-  /* First, make a file with some known garbage in it. */
-  data = (char *) malloc (pagesize);
-  if (!data)
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    *(data + i) = rand ();
-  umask (0);
-  fd = creat ("conftest.mmap", 0600);
-  if (fd < 0)
-    return 1;
-  if (write (fd, data, pagesize) != pagesize)
-    return 1;
-  close (fd);
-
-  /* Next, try to mmap the file at a fixed address which already has
-     something else allocated at it.  If we can, also make sure that
-     we see the same garbage.  */
-  fd = open ("conftest.mmap", O_RDWR);
-  if (fd < 0)
-    return 1;
-  data2 = (char *) malloc (2 * pagesize);
-  if (!data2)
-    return 1;
-  data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
-  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data2 + i))
-      return 1;
-
-  /* Finally, make sure that changes to the mapped area do not
-     percolate back to the file as seen by read().  (This is a bug on
-     some variants of i386 svr4.0.)  */
-  for (i = 0; i < pagesize; ++i)
-    *(data2 + i) = *(data2 + i) + 1;
-  data3 = (char *) malloc (pagesize);
-  if (!data3)
-    return 1;
-  if (read (fd, data3, pagesize) != pagesize)
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data3 + i))
-      return 1;
-  close (fd);
-  return 0;
-}
-_ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  ac_cv_func_mmap_fixed_mapped=yes
-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_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
-
-fi
-rm -f conftest.mmap
-
-if test x$ac_cv_func_mmap_fixed_mapped = xyes; then
-
-
-for ac_func in munmap msync
-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 { 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $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
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 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"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-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
-_ACEOF
-
-fi
-done
-
-fi
-
-if test x$ac_cv_func_setpgrp = xyes; then
-  { echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
-echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6; }
-if test "${ac_cv_func_getpgrp_void+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Use it with a single arg.
-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
-int
-main ()
-{
-getpgrp (0);
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_func_getpgrp_void=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_getpgrp_void=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
-echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6; }
-if test $ac_cv_func_getpgrp_void = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define GETPGRP_VOID 1
-_ACEOF
-
-fi
-
-else
-          ac_cv_func_getpgrp_void=yes
-  cat >>confdefs.h <<\_ACEOF
-#define GETPGRP_VOID 1
-_ACEOF
-
-fi
-
-if test x$dynamic = xyes; then
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in dlopen dlerror dlsym dlclose load loadquery loadbind unload \
-		shl_load shl_unload shl_findsym
-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 { 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $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
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 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"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-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
-_ACEOF
-
-fi
-done
-
-fi
-
-
-
-if test x$ac_cv_func_getxattr = xyes && test x$ac_cv_header_sys_xattr_h = xyes
-then
-  { echo "$as_me:$LINENO: checking if getxattr etc. are Linux-like" >&5
-echo $ECHO_N "checking if getxattr etc. are Linux-like... $ECHO_C" >&6; }
-if test "${zsh_cv_getxattr_linux+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 <sys/types.h>
-#include <sys/xattr.h>
-int
-main ()
-{
-
-  (void)listxattr("", 0, 0);
-  (void)getxattr("", "", 0, 0);
-  (void)setxattr("", "", "", 0, 0);
-  (void)removexattr("", "");
-
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_getxattr_linux=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_getxattr_linux=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_getxattr_linux" >&5
-echo "${ECHO_T}$zsh_cv_getxattr_linux" >&6; }
-
-  if test x$zsh_cv_getxattr_linux != xyes; then
-    { echo "$as_me:$LINENO: checking if getxattr etc. are MAC-like" >&5
-echo $ECHO_N "checking if getxattr etc. are MAC-like... $ECHO_C" >&6; }
-if test "${zsh_cv_getxattr_mac+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 <sys/types.h>
-#include <sys/xattr.h>
-int
-main ()
-{
-(void)listxattr("", 0, 0, 0);
-    (void)getxattr("", "", 0, 0, 0, 0);
-    (void)setxattr("", "", "", 0, 0, 0);
-    (void)removexattr("", "", 0);
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_getxattr_mac=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_getxattr_mac=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_getxattr_mac" >&5
-echo "${ECHO_T}$zsh_cv_getxattr_mac" >&6; }
-
-    if test x$zsh_cv_getxattr_mac = xyes; then
-      cat >>confdefs.h <<\_ACEOF
-#define XATTR_EXTRA_ARGS 1
-_ACEOF
-
-    fi
-  fi
-fi
-
-{ echo "$as_me:$LINENO: checking if getxattr etc. are usable" >&5
-echo $ECHO_N "checking if getxattr etc. are usable... $ECHO_C" >&6; }
-if test "${zsh_cv_use_xattr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test x$zsh_cv_getxattr_linux = xyes || test x$zsh_cv_getxattr_mac = xyes
-then
-zsh_cv_use_xattr=yes
-else
-zsh_cv_use_xattr=no
-fi
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_use_xattr" >&5
-echo "${ECHO_T}$zsh_cv_use_xattr" >&6; }
-
-
-
-
-
-
-
-
-
-{ echo "$as_me:$LINENO: checking what style of signals to use" >&5
-echo $ECHO_N "checking what style of signals to use... $ECHO_C" >&6; }
-if test x$ac_cv_func_sigaction = xyes && test x$ac_cv_func_sigprocmask = xyes; then
-  signals_style=POSIX_SIGNALS
-  cat >>confdefs.h <<\_ACEOF
-#define POSIX_SIGNALS 1
-_ACEOF
-
-elif test x$ac_cv_func_sigblock = xyes && test x$ac_cv_func_sigsetmask = xyes; then
-  signals_style=BSD_SIGNALS
-  cat >>confdefs.h <<\_ACEOF
-#define BSD_SIGNALS 1
-_ACEOF
-
-elif test x$ac_cv_func_sighold = xyes && test x$ac_cv_func_sigrelse = xyes; then
-  signals_style=SYSV_SIGNALS
-  cat >>confdefs.h <<\_ACEOF
-#define SYSV_SIGNALS 1
-_ACEOF
-
-else
-  signals_style=NO_SIGNAL_BLOCKING
-  cat >>confdefs.h <<\_ACEOF
-#define NO_SIGNAL_BLOCKING 1
-_ACEOF
-
-fi
-cat >>confdefs.h <<_ACEOF
-#define $signals_style 1
-_ACEOF
-
-{ echo "$as_me:$LINENO: result: $signals_style" >&5
-echo "${ECHO_T}$signals_style" >&6; }
-
-{ echo "$as_me:$LINENO: checking where signal.h is located" >&5
-echo $ECHO_N "checking where signal.h is located... $ECHO_C" >&6; }
-if test "${zsh_cv_path_signal_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  echo "#include <signal.h>" > nametmp.c
-sigfile_list="`$CPP nametmp.c |
-sed -n -e 's/^#line[ 	].*\"\(.*\)\"/\1/p' \
-       -e 's/^#[ 	].*\"\(.*\)\"/\1/p' |
-sed 's/\\\\\\\\/\//g' |
-$AWK '{ if ($1 ~ /sig/) files[$1] = $1 }
-  END { for (var in files) print var }'`"
-rm -f nametmp.c
-if test -z "$sigfile_list"; then
-      sigfile_list="/usr/include/sys/iso/signal_iso.h
-/usr/include/bsd/sys/signal.h
-/usr/include/signum.h
-/usr/include/asm/signum.h
-/usr/include/asm/signal.h
-/usr/include/linux/signal.h
-/usr/include/sys/signal.h
-/usr/include/bits/signum.h
-/dev/null"
-fi
-for SIGNAL_H in $sigfile_list
-do
-        nsigs=`test -f $SIGNAL_H && \
-  grep '#[ 	]*define[ 	][ 	]*SIG[0-9A-Z]*[ 	]*[0-9][0-9]*' $SIGNAL_H | \
-  wc -l | sed 's/ 	//g'`
-  test "x$nsigs" != x && test "$nsigs" -ge 7 && break
-done
-if test x$SIGNAL_H = x"/dev/null"; then
-  { { echo "$as_me:$LINENO: error: SIGNAL MACROS NOT FOUND:  please report to developers" >&5
-echo "$as_me: error: SIGNAL MACROS NOT FOUND:  please report to developers" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-zsh_cv_path_signal_h=$SIGNAL_H
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_path_signal_h" >&5
-echo "${ECHO_T}$zsh_cv_path_signal_h" >&6; }
-SIGNAL_H=$zsh_cv_path_signal_h
-
-{ echo "$as_me:$LINENO: checking where error names are located" >&5
-echo $ECHO_N "checking where error names are located... $ECHO_C" >&6; }
-if test "${zsh_cv_path_errno_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  echo "#include <errno.h>" > nametmp.c
-errfile_list="`$CPP nametmp.c |
-sed -n -e 's/^#line[ 	].*\"\(.*\)\"/\1/p' \
-       -e 's/^#[ 	0-9].*\"\(.*\)\"/\1/p' |
-sed 's/\\\\\\\\/\//g' |
-$AWK '{ if ($1 ~ /err/) files[$1] = $1 }
-  END { for (var in files) print var }'`"
-rm -f nametmp.c
-for ERRNO_TRY_H in $errfile_list /dev/null
-do
-              nerrs=`test -f $ERRNO_TRY_H && \
-  $EGREP '#[ 	]*define[ 	][ 	]*E[0-9A-Z]*[ 	]*(_HURD_ERRNO )?\(?[_A-Z0-9]' $ERRNO_TRY_H | \
-  wc -l | sed 's/ 	//g'`
-  if test "x$nerrs" != x && test "$nerrs" -ge 1
-  then
-    ERRNO_H="$ERRNO_H $ERRNO_TRY_H"
-  fi
-done
-if test x"$ERRNO_H" = x; then
-  { { echo "$as_me:$LINENO: error: ERROR MACROS NOT FOUND:  please report to developers" >&5
-echo "$as_me: error: ERROR MACROS NOT FOUND:  please report to developers" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-zsh_cv_path_errno_h="$ERRNO_H"
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_path_errno_h" >&5
-echo "${ECHO_T}$zsh_cv_path_errno_h" >&6; }
-ERRNO_H="$zsh_cv_path_errno_h"
-
-{ echo "$as_me:$LINENO: checking location of curses header" >&5
-echo $ECHO_N "checking location of curses header... $ECHO_C" >&6; }
-if test "${zsh_cv_path_curses_header+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test x$zsh_cv_ignore_ncurses = xyes; then
-  if test x$ac_cv_header_curses_h = xyes; then
-    zsh_cv_path_curses_header=curses.h
-  else
-    zsh_cv_path_curses_header=none
-  fi
-elif test x$ac_cv_header_ncursesw_ncurses_h = xyes; then
-  zsh_cv_path_curses_header=ncursesw/ncurses.h
-elif test x$ac_cv_header_ncurses_ncurses_h = xyes; then
-  zsh_cv_path_curses_header=ncurses/ncurses.h
-elif test x$ac_cv_header_ncurses_h = xyes; then
-  zsh_cv_path_curses_header=ncurses.h
-elif test x$ac_cv_header_curses_h = xyes; then
-  zsh_cv_path_curses_header=curses.h
-else
-  zsh_cv_path_curses_header=none
-fi
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_path_curses_header" >&5
-echo "${ECHO_T}$zsh_cv_path_curses_header" >&6; }
-
-
-if test x$zsh_cv_path_curses_header != xnone; then
-  cat >>confdefs.h <<\_ACEOF
-#define ZSH_HAVE_CURSES_H 1
-_ACEOF
-
-  ZSH_CURSES_H=$zsh_cv_path_curses_header
-else
-  ZSH_CURSES_H=
-fi
-
-
-{ echo "$as_me:$LINENO: checking where curses key definitions are located" >&5
-echo $ECHO_N "checking where curses key definitions are located... $ECHO_C" >&6; }
-if test "${zsh_cv_path_curses_keys_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test x$zsh_cv_path_curses_header = xnone; then
-  echo >nametmp.c
-else
-  echo "#include <$zsh_cv_path_curses_header>" >nametmp.c
-fi
-
-curses_list="`$CPP nametmp.c |
-sed -n -e 's/^#line[ 	].*\"\(.*\)\"/\1/p' \
-       -e 's/^#[ 	0-9].*\"\(.*\)\"/\1/p' |
-sed 's/\\\\\\\\/\//g' |
-$AWK '{ if ($1 ~ /\.h/) files[$1] = $1 }
-  END { for (var in files) print var }'`"
-rm -f nametmp.c
-for CURSES_TRY_H in $curses_list /dev/null
-do
-  nkeys=`test -f $CURSES_TRY_H && \
-  $EGREP '#[ 	]*define[ 	][ 	]*KEY_' $CURSES_TRY_H | \
-  wc -l | sed 's/ 	//g'`
-  if test "x$nkeys" != x && test "$nkeys" -ge 10
-  then
-    CURSES_KEYS_H=$CURSES_TRY_H
-    break
-  fi
-done
-zsh_cv_path_curses_keys_h="$CURSES_KEYS_H"
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_path_curses_keys_h" >&5
-echo "${ECHO_T}$zsh_cv_path_curses_keys_h" >&6; }
-CURSES_KEYS_H="$zsh_cv_path_curses_keys_h"
-
-
-for ac_header in ncursesw/term.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 { 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ncursesw/ncurses.h>
-
-#include <$ac_header>
-_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); } && {
-	 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"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-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
-_ACEOF
- true
-else
-  true
-fi
-
-done
-
-
-for ac_header in ncurses/term.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 { 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ncurses/ncurses.h>
-
-#include <$ac_header>
-_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); } && {
-	 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"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-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
-_ACEOF
- true
-else
-  true
-fi
-
-done
-
-
-for ac_header in term.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 { 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <curses.h>
-
-#include <$ac_header>
-_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); } && {
-	 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"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-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
-_ACEOF
- true
-else
-  true
-fi
-
-done
-
-
-{ echo "$as_me:$LINENO: checking where term.h is located" >&5
-echo $ECHO_N "checking where term.h is located... $ECHO_C" >&6; }
-if test "${zsh_cv_path_term_header+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case x$zsh_cv_path_curses_header in
-  xncursesw/*)
-  if test x$ac_cv_header_ncursesw_term_h = xyes; then
-    zsh_cv_path_term_header=ncursesw/term.h
-  fi
-  ;;
-  xncurses/*)
-  if test x$ac_cv_header_ncurses_term_h = xyes; then
-    zsh_cv_path_term_header=ncurses/term.h
-  fi
-  ;;
-esac
-if test x$zsh_cv_path_term_header = x; then
-  if test x$ac_cv_header_term_h = xyes; then
-    zsh_cv_path_term_header=term.h
-  else
-    zsh_cv_path_term_header=none
-  fi
-fi
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_path_term_header" >&5
-echo "${ECHO_T}$zsh_cv_path_term_header" >&6; }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test x$zsh_cv_path_term_header != xnone; then
-  cat >>confdefs.h <<\_ACEOF
-#define ZSH_HAVE_TERM_H 1
-_ACEOF
-
-  ZSH_TERM_H=$zsh_cv_path_term_header
-  if test x$zsh_cv_path_curses_header != xnone; then
-    term_includes="#include <$zsh_cv_path_curses_header>
-#include <$zsh_cv_path_term_header>"
-  else
-    term_includes="#include <$zsh_cv_path_term_header>"
-  fi
-
-  { echo "$as_me:$LINENO: checking if boolcodes is available" >&5
-echo $ECHO_N "checking if boolcodes is available... $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.  */
-$term_includes
-int
-main ()
-{
-char **test = boolcodes; puts(*test);
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_BOOLCODES 1
-_ACEOF
- boolcodes=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	boolcodes=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  { echo "$as_me:$LINENO: result: $boolcodes" >&5
-echo "${ECHO_T}$boolcodes" >&6; }
-  { echo "$as_me:$LINENO: checking if numcodes is available" >&5
-echo $ECHO_N "checking if numcodes is available... $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.  */
-$term_includes
-int
-main ()
-{
-char **test = numcodes; puts(*test);
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_NUMCODES 1
-_ACEOF
- numcodes=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	numcodes=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  { echo "$as_me:$LINENO: result: $numcodes" >&5
-echo "${ECHO_T}$numcodes" >&6; }
-  { echo "$as_me:$LINENO: checking if strcodes is available" >&5
-echo $ECHO_N "checking if strcodes is available... $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.  */
-$term_includes
-int
-main ()
-{
-char **test = strcodes; puts(*test);
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRCODES 1
-_ACEOF
- strcodes=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	strcodes=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  { echo "$as_me:$LINENO: result: $strcodes" >&5
-echo "${ECHO_T}$strcodes" >&6; }
-  { echo "$as_me:$LINENO: checking if boolnames is available" >&5
-echo $ECHO_N "checking if boolnames is available... $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.  */
-$term_includes
-int
-main ()
-{
-char **test = boolnames; puts(*test);
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_BOOLNAMES 1
-_ACEOF
- boolnames=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	boolnames=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  { echo "$as_me:$LINENO: result: $boolnames" >&5
-echo "${ECHO_T}$boolnames" >&6; }
-  { echo "$as_me:$LINENO: checking if numnames is available" >&5
-echo $ECHO_N "checking if numnames is available... $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.  */
-$term_includes
-int
-main ()
-{
-char **test = numnames; puts(*test);
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_NUMNAMES 1
-_ACEOF
- numnames=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	numnames=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  { echo "$as_me:$LINENO: result: $numnames" >&5
-echo "${ECHO_T}$numnames" >&6; }
-  { echo "$as_me:$LINENO: checking if strnames is available" >&5
-echo $ECHO_N "checking if strnames is available... $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.  */
-$term_includes
-int
-main ()
-{
-char **test = strnames; puts(*test);
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRNAMES 1
-_ACEOF
- strnames=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	strnames=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  { echo "$as_me:$LINENO: result: $strnames" >&5
-echo "${ECHO_T}$strnames" >&6; }
-else
-  ZSH_TERM_H=
-fi
-
-
-
-{ echo "$as_me:$LINENO: checking where the RLIMIT macros are located" >&5
-echo $ECHO_N "checking where the RLIMIT macros are located... $ECHO_C" >&6; }
-if test "${zsh_cv_path_rlimit_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  echo "#include <sys/resource.h>" >restmp.c
-resourcefile_list="`$CPP restmp.c |
-sed -n -e 's/^#line[ 	].*\"\(.*\)\"/\1/p' \
-       -e 's/^#[ 	].*\"\(.*\)\"/\1/p' |
-sed 's/\\\\\\\\/\//g' |
-$AWK '{ if ($1 ~ /resource/) files[$1] = $1 }
-  END { for (var in files) print var }'`"
-rm -f restmp.c
-if test -z "$resourcefile_list"; then
-    resourcefile_list="/usr/include/bsd/sys/resource.h
-/usr/include/asm/resource.h
-/usr/include/linux/resource.h
-/usr/include/sys/resource.h
-/usr/include/bits/resource.h
-/usr/include/resourcebits.h"
-fi
-for RESOURCE_H in $resourcefile_list /dev/null;
-do
-  test -f $RESOURCE_H && \
-  grep '#[ 	]*define[ 	][ 	]*RLIMIT_[A-Z]*[ 	]*[0-9A-Z][0-9]*' $RESOURCE_H > /dev/null && \
-  break
-done
-zsh_cv_path_rlimit_h=$RESOURCE_H
-if test x$RESOURCE_H = x"/dev/null" && test x$ac_cv_func_getrlimit = xyes; then
-  { echo "$as_me:$LINENO: WARNING: RLIMIT MACROS NOT FOUND:  please report to developers" >&5
-echo "$as_me: WARNING: RLIMIT MACROS NOT FOUND:  please report to developers" >&2;}
-fi
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_path_rlimit_h" >&5
-echo "${ECHO_T}$zsh_cv_path_rlimit_h" >&6; }
-RLIMITS_INC_H=$zsh_cv_path_rlimit_h
-if test "$RLIMITS_INC_H" = "/dev/null"; then
-  RLIMITS_INC_H=''
-fi
-
-
-
-
-
-
-
-
-
-DEFAULT_RLIM_T=long
-{ echo "$as_me:$LINENO: checking if rlim_t is longer than a long" >&5
-echo $ECHO_N "checking if rlim_t is longer than a long... $ECHO_C" >&6; }
-if test "${zsh_cv_rlim_t_is_longer+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  zsh_cv_rlim_t_is_longer=yes
-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_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-main(){struct rlimit r;exit(sizeof(r.rlim_cur) <= sizeof(long));}
-_ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  zsh_cv_rlim_t_is_longer=yes
-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 )
-zsh_cv_rlim_t_is_longer=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_rlim_t_is_longer" >&5
-echo "${ECHO_T}$zsh_cv_rlim_t_is_longer" >&6; }
-if test x$zsh_cv_rlim_t_is_longer = xyes; then
-  { echo "$as_me:$LINENO: checking if rlim_t is a quad" >&5
-echo $ECHO_N "checking if rlim_t is a quad... $ECHO_C" >&6; }
-if test "${zsh_cv_rlim_t_is_quad_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  zsh_cv_rlim_t_is_quad_t=no
-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_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <stdio.h>
-#include <sys/resource.h>
-main() {
-  struct rlimit r;
-  char buf[20];
-  r.rlim_cur = 0;
-  sprintf(buf, "%qd", r.rlim_cur);
-  exit(strcmp(buf, "0"));
-}
-_ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  zsh_cv_rlim_t_is_quad_t=yes
-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 )
-zsh_cv_rlim_t_is_quad_t=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_rlim_t_is_quad_t" >&5
-echo "${ECHO_T}$zsh_cv_rlim_t_is_quad_t" >&6; }
-  if test x$zsh_cv_rlim_t_is_quad_t = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define RLIM_T_IS_QUAD_T 1
-_ACEOF
-
-    DEFAULT_RLIM_T=quad_t
-  else
-    cat >>confdefs.h <<\_ACEOF
-#define RLIM_T_IS_LONG_LONG 1
-_ACEOF
-
-    DEFAULT_RLIM_T='long long'
-  fi
-else
-  { echo "$as_me:$LINENO: checking if the rlim_t is unsigned" >&5
-echo $ECHO_N "checking if the rlim_t is unsigned... $ECHO_C" >&6; }
-if test "${zsh_cv_type_rlim_t_is_unsigned+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  zsh_cv_type_rlim_t_is_unsigned=no
-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_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-  main(){struct rlimit r;r.rlim_cur=-1;exit(r.rlim_cur<0);}
-_ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  zsh_cv_type_rlim_t_is_unsigned=yes
-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 )
-zsh_cv_type_rlim_t_is_unsigned=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_type_rlim_t_is_unsigned" >&5
-echo "${ECHO_T}$zsh_cv_type_rlim_t_is_unsigned" >&6; }
-  if test x$zsh_cv_type_rlim_t_is_unsigned = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define RLIM_T_IS_UNSIGNED 1
-_ACEOF
-
-    DEFAULT_RLIM_T="unsigned $DEFAULT_RLIM_T"
-  fi
-fi
-
-{ echo "$as_me:$LINENO: checking for rlim_t" >&5
-echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6; }
-if test "${zsh_cv_type_rlim_t+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 <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-rlim_t l;
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_type_rlim_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_type_rlim_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_type_rlim_t" >&5
-echo "${ECHO_T}$zsh_cv_type_rlim_t" >&6; }
-if test x$zsh_cv_type_rlim_t = xno; then
-  cat >>confdefs.h <<_ACEOF
-#define rlim_t $DEFAULT_RLIM_T
-_ACEOF
-
-fi
-
-
-
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_AIO_MEM" >&5
-echo $ECHO_N "checking for limit RLIMIT_AIO_MEM... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_AIO_MEM+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 <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-RLIMIT_AIO_MEM
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_AIO_MEM=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_AIO_MEM=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_AIO_MEM" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_AIO_MEM" >&6; }
-
-if test $zsh_cv_have_RLIMIT_AIO_MEM = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_AIO_MEM 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_AIO_OPS" >&5
-echo $ECHO_N "checking for limit RLIMIT_AIO_OPS... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_AIO_OPS+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 <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-RLIMIT_AIO_OPS
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_AIO_OPS=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_AIO_OPS=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_AIO_OPS" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_AIO_OPS" >&6; }
-
-if test $zsh_cv_have_RLIMIT_AIO_OPS = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_AIO_OPS 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_AS" >&5
-echo $ECHO_N "checking for limit RLIMIT_AS... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_AS+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 <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-RLIMIT_AS
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_AS=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_AS=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_AS" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_AS" >&6; }
-
-if test $zsh_cv_have_RLIMIT_AS = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_AS 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_LOCKS" >&5
-echo $ECHO_N "checking for limit RLIMIT_LOCKS... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_LOCKS+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 <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-RLIMIT_LOCKS
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_LOCKS=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_LOCKS=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_LOCKS" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_LOCKS" >&6; }
-
-if test $zsh_cv_have_RLIMIT_LOCKS = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_LOCKS 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_MEMLOCK" >&5
-echo $ECHO_N "checking for limit RLIMIT_MEMLOCK... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_MEMLOCK+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 <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-RLIMIT_MEMLOCK
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_MEMLOCK=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_MEMLOCK=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_MEMLOCK" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_MEMLOCK" >&6; }
-
-if test $zsh_cv_have_RLIMIT_MEMLOCK = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_MEMLOCK 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_NPROC" >&5
-echo $ECHO_N "checking for limit RLIMIT_NPROC... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_NPROC+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 <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-RLIMIT_NPROC
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_NPROC=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_NPROC=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_NPROC" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_NPROC" >&6; }
-
-if test $zsh_cv_have_RLIMIT_NPROC = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_NPROC 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_NOFILE" >&5
-echo $ECHO_N "checking for limit RLIMIT_NOFILE... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_NOFILE+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 <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-RLIMIT_NOFILE
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_NOFILE=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_NOFILE=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_NOFILE" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_NOFILE" >&6; }
-
-if test $zsh_cv_have_RLIMIT_NOFILE = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_NOFILE 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_PTHREAD" >&5
-echo $ECHO_N "checking for limit RLIMIT_PTHREAD... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_PTHREAD+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.  */
+done
 
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-RLIMIT_PTHREAD
-  ;
-  return 0;
-}
+for ac_header in term.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "#include <curses.h>
+"
+if test "x$ac_cv_header_term_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_TERM_H 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_PTHREAD=yes
+ true
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_PTHREAD=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  true
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_PTHREAD" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_PTHREAD" >&6; }
-
-if test $zsh_cv_have_RLIMIT_PTHREAD = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_PTHREAD 1
-_ACEOF
 
-fi
+done
 
 
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_RSS" >&5
-echo $ECHO_N "checking for limit RLIMIT_RSS... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_RSS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where term.h is located" >&5
+$as_echo_n "checking where term.h is located... " >&6; }
+if test "${zsh_cv_path_term_header+set}" = set; then :
+  $as_echo_n "(cached) " >&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 <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-RLIMIT_RSS
-  ;
-  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;;
+  case x$zsh_cv_path_curses_header in
+  xncursesw/*)
+  if test x$ac_cv_header_ncursesw_term_h = xyes; then
+    zsh_cv_path_term_header=ncursesw/term.h
+  fi
+  ;;
+  xncurses/*)
+  if test x$ac_cv_header_ncurses_term_h = xyes; then
+    zsh_cv_path_term_header=ncurses/term.h
+  fi
+  ;;
 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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_RSS=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_RSS=no
+if test x$zsh_cv_path_term_header = x; then
+  if test x$ac_cv_header_term_h = xyes; then
+    zsh_cv_path_term_header=term.h
+  else
+    zsh_cv_path_term_header=none
+  fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_RSS" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_RSS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_path_term_header" >&5
+$as_echo "$zsh_cv_path_term_header" >&6; }
 
-if test $zsh_cv_have_RLIMIT_RSS = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_RSS 1
-_ACEOF
 
-fi
 
 
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_SBSIZE" >&5
-echo $ECHO_N "checking for limit RLIMIT_SBSIZE... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_SBSIZE+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 <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-int
-main ()
-{
-RLIMIT_SBSIZE
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_SBSIZE=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	zsh_cv_have_RLIMIT_SBSIZE=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_SBSIZE" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_SBSIZE" >&6; }
 
-if test $zsh_cv_have_RLIMIT_SBSIZE = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_SBSIZE 1
-_ACEOF
 
-fi
+if test x$zsh_cv_path_term_header != xnone; then
+  $as_echo "#define ZSH_HAVE_TERM_H 1" >>confdefs.h
 
+  ZSH_TERM_H=$zsh_cv_path_term_header
+  if test x$zsh_cv_path_curses_header != xnone; then
+    term_includes="#include <$zsh_cv_path_curses_header>
+#include <$zsh_cv_path_term_header>"
+  else
+    term_includes="#include <$zsh_cv_path_term_header>"
+  fi
 
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_TCACHE" >&5
-echo $ECHO_N "checking for limit RLIMIT_TCACHE... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_TCACHE+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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if boolcodes is available" >&5
+$as_echo_n "checking if boolcodes is available... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
+$term_includes
 int
 main ()
 {
-RLIMIT_TCACHE
+char **test = boolcodes; puts(*test);
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_TCACHE=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  $as_echo "#define HAVE_BOOLCODES 1" >>confdefs.h
+ boolcodes=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_TCACHE=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_TCACHE" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_TCACHE" >&6; }
-
-if test $zsh_cv_have_RLIMIT_TCACHE = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_TCACHE 1
-_ACEOF
-
+  boolcodes=no
 fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_VMEM" >&5
-echo $ECHO_N "checking for limit RLIMIT_VMEM... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_VMEM+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
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boolcodes" >&5
+$as_echo "$boolcodes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if numcodes is available" >&5
+$as_echo_n "checking if numcodes is available... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
+$term_includes
 int
 main ()
 {
-RLIMIT_VMEM
+char **test = numcodes; puts(*test);
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_VMEM=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  $as_echo "#define HAVE_NUMCODES 1" >>confdefs.h
+ numcodes=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_VMEM=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_VMEM" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_VMEM" >&6; }
-
-if test $zsh_cv_have_RLIMIT_VMEM = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_VMEM 1
-_ACEOF
-
+  numcodes=no
 fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_SIGPENDING" >&5
-echo $ECHO_N "checking for limit RLIMIT_SIGPENDING... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_SIGPENDING+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
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $numcodes" >&5
+$as_echo "$numcodes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if strcodes is available" >&5
+$as_echo_n "checking if strcodes is available... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
+$term_includes
 int
 main ()
 {
-RLIMIT_SIGPENDING
+char **test = strcodes; puts(*test);
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_SIGPENDING=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  $as_echo "#define HAVE_STRCODES 1" >>confdefs.h
+ strcodes=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_SIGPENDING=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_SIGPENDING" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_SIGPENDING" >&6; }
-
-if test $zsh_cv_have_RLIMIT_SIGPENDING = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_SIGPENDING 1
-_ACEOF
-
+  strcodes=no
 fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_MSGQUEUE" >&5
-echo $ECHO_N "checking for limit RLIMIT_MSGQUEUE... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_MSGQUEUE+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
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $strcodes" >&5
+$as_echo "$strcodes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if boolnames is available" >&5
+$as_echo_n "checking if boolnames is available... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
+$term_includes
 int
 main ()
 {
-RLIMIT_MSGQUEUE
+char **test = boolnames; puts(*test);
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_MSGQUEUE=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  $as_echo "#define HAVE_BOOLNAMES 1" >>confdefs.h
+ boolnames=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_MSGQUEUE=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_MSGQUEUE" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_MSGQUEUE" >&6; }
-
-if test $zsh_cv_have_RLIMIT_MSGQUEUE = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_MSGQUEUE 1
-_ACEOF
-
+  boolnames=no
 fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_NICE" >&5
-echo $ECHO_N "checking for limit RLIMIT_NICE... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_NICE+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
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boolnames" >&5
+$as_echo "$boolnames" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if numnames is available" >&5
+$as_echo_n "checking if numnames is available... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
+$term_includes
 int
 main ()
 {
-RLIMIT_NICE
+char **test = numnames; puts(*test);
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_NICE=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  $as_echo "#define HAVE_NUMNAMES 1" >>confdefs.h
+ numnames=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_have_RLIMIT_NICE=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_NICE" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_NICE" >&6; }
-
-if test $zsh_cv_have_RLIMIT_NICE = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_NICE 1
-_ACEOF
-
+  numnames=no
 fi
-
-
-{ echo "$as_me:$LINENO: checking for limit RLIMIT_RTPRIO" >&5
-echo $ECHO_N "checking for limit RLIMIT_RTPRIO... $ECHO_C" >&6; }
-if test "${zsh_cv_have_RLIMIT_RTPRIO+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
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $numnames" >&5
+$as_echo "$numnames" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if strnames is available" >&5
+$as_echo_n "checking if strnames is available... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
+$term_includes
 int
 main ()
 {
-RLIMIT_RTPRIO
+char **test = strnames; puts(*test);
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  zsh_cv_have_RLIMIT_RTPRIO=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  $as_echo "#define HAVE_STRNAMES 1" >>confdefs.h
+ strnames=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  strnames=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $strnames" >&5
+$as_echo "$strnames" >&6; }
+else
+  ZSH_TERM_H=
+fi
 
-	zsh_cv_have_RLIMIT_RTPRIO=no
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where the RLIMIT macros are located" >&5
+$as_echo_n "checking where the RLIMIT macros are located... " >&6; }
+if test "${zsh_cv_path_rlimit_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  echo "#include <sys/resource.h>" >restmp.c
+resourcefile_list="`$CPP restmp.c |
+sed -n -e 's/^#line[ 	].*\"\(.*\)\"/\1/p' \
+       -e 's/^#[ 	].*\"\(.*\)\"/\1/p' |
+sed 's/\\\\\\\\/\//g' |
+$AWK '{ if ($1 ~ /resource/) files[$1] = $1 }
+  END { for (var in files) print var }'`"
+rm -f restmp.c
+if test -z "$resourcefile_list"; then
+    resourcefile_list="/usr/include/bsd/sys/resource.h
+/usr/include/asm/resource.h
+/usr/include/linux/resource.h
+/usr/include/sys/resource.h
+/usr/include/bits/resource.h
+/usr/include/resourcebits.h"
+fi
+for RESOURCE_H in $resourcefile_list /dev/null;
+do
+  test -f $RESOURCE_H && \
+  grep '#[ 	]*define[ 	][ 	]*RLIMIT_[A-Z]*[ 	]*[0-9A-Z][0-9]*' $RESOURCE_H > /dev/null && \
+  break
+done
+zsh_cv_path_rlimit_h=$RESOURCE_H
+if test x$RESOURCE_H = x"/dev/null" && test x$ac_cv_func_getrlimit = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: RLIMIT MACROS NOT FOUND:  please report to developers" >&5
+$as_echo "$as_me: WARNING: RLIMIT MACROS NOT FOUND:  please report to developers" >&2;}
+fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_path_rlimit_h" >&5
+$as_echo "$zsh_cv_path_rlimit_h" >&6; }
+RLIMITS_INC_H=$zsh_cv_path_rlimit_h
+if test "$RLIMITS_INC_H" = "/dev/null"; then
+  RLIMITS_INC_H=''
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_have_RLIMIT_RTPRIO" >&5
-echo "${ECHO_T}$zsh_cv_have_RLIMIT_RTPRIO" >&6; }
 
-if test $zsh_cv_have_RLIMIT_RTPRIO = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_RLIMIT_RTPRIO 1
-_ACEOF
 
-fi
 
 
 
-{ echo "$as_me:$LINENO: checking if RLIMIT_VMEM and RLIMIT_RSS are the same" >&5
-echo $ECHO_N "checking if RLIMIT_VMEM and RLIMIT_RSS are the same... $ECHO_C" >&6; }
-if test "${zsh_cv_rlimit_vmem_is_rss+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+DEFAULT_RLIM_T=long
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if rlim_t is longer than a long" >&5
+$as_echo_n "checking if rlim_t is longer than a long... " >&6; }
+if test "${zsh_cv_rlim_t_is_longer+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  zsh_cv_rlimit_vmem_is_rss=no
+  if test "$cross_compiling" = yes; then :
+  zsh_cv_rlim_t_is_longer=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-int main()
-{
-int ret = 1;
-#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_RSS)
-if (RLIMIT_RSS == RLIMIT_VMEM) ret = 0;
-#endif
-return ret;
-}
+main(){struct rlimit r;exit(sizeof(r.rlim_cur) <= sizeof(long));}
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  zsh_cv_rlimit_vmem_is_rss=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  zsh_cv_rlim_t_is_longer=yes
 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 )
-zsh_cv_rlimit_vmem_is_rss=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+  zsh_cv_rlim_t_is_longer=no
 fi
-
-
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_rlimit_vmem_is_rss" >&5
-echo "${ECHO_T}$zsh_cv_rlimit_vmem_is_rss" >&6; }
-
-if test x$zsh_cv_rlimit_vmem_is_rss = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define RLIMIT_VMEM_IS_RSS 1
-_ACEOF
 
 fi
-
-
-
-
-{ echo "$as_me:$LINENO: checking if RLIMIT_VMEM and RLIMIT_AS are the same" >&5
-echo $ECHO_N "checking if RLIMIT_VMEM and RLIMIT_AS are the same... $ECHO_C" >&6; }
-if test "${zsh_cv_rlimit_vmem_is_as+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlim_t_is_longer" >&5
+$as_echo "$zsh_cv_rlim_t_is_longer" >&6; }
+if test x$zsh_cv_rlim_t_is_longer = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if rlim_t is a quad" >&5
+$as_echo_n "checking if rlim_t is a quad... " >&6; }
+if test "${zsh_cv_rlim_t_is_quad_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  zsh_cv_rlimit_vmem_is_as=no
+  if test "$cross_compiling" = yes; then :
+  zsh_cv_rlim_t_is_quad_t=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+#include <stdio.h>
 #include <sys/resource.h>
-int main()
-{
-int ret = 1;
-#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_AS)
-if (RLIMIT_AS == RLIMIT_VMEM) ret = 0;
-#endif
-return ret;
+main() {
+  struct rlimit r;
+  char buf[20];
+  r.rlim_cur = 0;
+  sprintf(buf, "%qd", r.rlim_cur);
+  exit(strcmp(buf, "0"));
 }
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  zsh_cv_rlimit_vmem_is_as=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  zsh_cv_rlim_t_is_quad_t=yes
 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 )
-zsh_cv_rlimit_vmem_is_as=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+  zsh_cv_rlim_t_is_quad_t=no
 fi
-
-
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_rlimit_vmem_is_as" >&5
-echo "${ECHO_T}$zsh_cv_rlimit_vmem_is_as" >&6; }
-
-if test x$zsh_cv_rlimit_vmem_is_as = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define RLIMIT_VMEM_IS_AS 1
-_ACEOF
 
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlim_t_is_quad_t" >&5
+$as_echo "$zsh_cv_rlim_t_is_quad_t" >&6; }
+  if test x$zsh_cv_rlim_t_is_quad_t = xyes; then
+    $as_echo "#define RLIM_T_IS_QUAD_T 1" >>confdefs.h
 
+    DEFAULT_RLIM_T=quad_t
+  else
+    $as_echo "#define RLIM_T_IS_LONG_LONG 1" >>confdefs.h
 
-
-
-{ echo "$as_me:$LINENO: checking if RLIMIT_RSS and RLIMIT_AS are the same" >&5
-echo $ECHO_N "checking if RLIMIT_RSS and RLIMIT_AS are the same... $ECHO_C" >&6; }
-if test "${zsh_cv_rlimit_rss_is_as+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    DEFAULT_RLIM_T='long long'
+  fi
 else
-  if test "$cross_compiling" = yes; then
-  zsh_cv_rlimit_rss_is_as=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the rlim_t is unsigned" >&5
+$as_echo_n "checking if the rlim_t is unsigned... " >&6; }
+if test "${zsh_cv_type_rlim_t_is_unsigned+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then :
+  zsh_cv_type_rlim_t_is_unsigned=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-int main()
-{
-int ret = 1;
-#if defined(HAVE_RLIMIT_RSS) && defined(HAVE_RLIMIT_AS)
-if (RLIMIT_AS == RLIMIT_RSS) ret = 0;
-#endif
-return ret;
-}
+  main(){struct rlimit r;r.rlim_cur=-1;exit(r.rlim_cur<0);}
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
-  zsh_cv_rlimit_rss_is_as=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  zsh_cv_type_rlim_t_is_unsigned=yes
 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 )
-zsh_cv_rlimit_rss_is_as=no
+  zsh_cv_type_rlim_t_is_unsigned=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_rlimit_rss_is_as" >&5
-echo "${ECHO_T}$zsh_cv_rlimit_rss_is_as" >&6; }
-
-if test x$zsh_cv_rlimit_rss_is_as = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define RLIMIT_RSS_IS_AS 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_type_rlim_t_is_unsigned" >&5
+$as_echo "$zsh_cv_type_rlim_t_is_unsigned" >&6; }
+  if test x$zsh_cv_type_rlim_t_is_unsigned = xyes; then
+    $as_echo "#define RLIM_T_IS_UNSIGNED 1" >>confdefs.h
 
+    DEFAULT_RLIM_T="unsigned $DEFAULT_RLIM_T"
+  fi
 fi
 
-
-if test x$ac_cv_func_getrusage = xyes; then
-  { echo "$as_me:$LINENO: checking for struct rusage.ru_maxrss" >&5
-echo $ECHO_N "checking for struct rusage.ru_maxrss... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_maxrss+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rlim_t" >&5
+$as_echo_n "checking for rlim_t... " >&6; }
+if test "${zsh_cv_type_rlim_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/resource.h>
-
-int
-main ()
-{
-static struct rusage ac_aggr;
-if (ac_aggr.ru_maxrss)
-return 0;
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_maxrss=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	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>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_maxrss)
-return 0;
+rlim_t l;
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_maxrss=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_type_rlim_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_rusage_ru_maxrss=no
+  zsh_cv_type_rlim_t=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_type_rlim_t" >&5
+$as_echo "$zsh_cv_type_rlim_t" >&6; }
+if test x$zsh_cv_type_rlim_t = xno; then
+  cat >>confdefs.h <<_ACEOF
+#define rlim_t $DEFAULT_RLIM_T
+_ACEOF
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_maxrss" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_maxrss" >&6; }
-if test $ac_cv_member_struct_rusage_ru_maxrss = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
-_ACEOF
 
 
-fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_ixrss" >&5
-echo $ECHO_N "checking for struct rusage.ru_ixrss... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_ixrss+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_AIO_MEM" >&5
+$as_echo_n "checking for limit RLIMIT_AIO_MEM... " >&6; }
+if test "${zsh_cv_have_RLIMIT_AIO_MEM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (ac_aggr.ru_ixrss)
-return 0;
+RLIMIT_AIO_MEM
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_ixrss=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_AIO_MEM=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_have_RLIMIT_AIO_MEM=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_AIO_MEM" >&5
+$as_echo "$zsh_cv_have_RLIMIT_AIO_MEM" >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test $zsh_cv_have_RLIMIT_AIO_MEM = yes; then
+  $as_echo "#define HAVE_RLIMIT_AIO_MEM 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_AIO_OPS" >&5
+$as_echo_n "checking for limit RLIMIT_AIO_OPS... " >&6; }
+if test "${zsh_cv_have_RLIMIT_AIO_OPS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_ixrss)
-return 0;
+RLIMIT_AIO_OPS
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_ixrss=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_AIO_OPS=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_rusage_ru_ixrss=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  zsh_cv_have_RLIMIT_AIO_OPS=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_ixrss" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_ixrss" >&6; }
-if test $ac_cv_member_struct_rusage_ru_ixrss = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_IXRSS 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_AIO_OPS" >&5
+$as_echo "$zsh_cv_have_RLIMIT_AIO_OPS" >&6; }
 
+if test $zsh_cv_have_RLIMIT_AIO_OPS = yes; then
+  $as_echo "#define HAVE_RLIMIT_AIO_OPS 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_idrss" >&5
-echo $ECHO_N "checking for struct rusage.ru_idrss... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_idrss+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_AS" >&5
+$as_echo_n "checking for limit RLIMIT_AS... " >&6; }
+if test "${zsh_cv_have_RLIMIT_AS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (ac_aggr.ru_idrss)
-return 0;
+RLIMIT_AS
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_idrss=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_AS=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_have_RLIMIT_AS=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_AS" >&5
+$as_echo "$zsh_cv_have_RLIMIT_AS" >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test $zsh_cv_have_RLIMIT_AS = yes; then
+  $as_echo "#define HAVE_RLIMIT_AS 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_LOCKS" >&5
+$as_echo_n "checking for limit RLIMIT_LOCKS... " >&6; }
+if test "${zsh_cv_have_RLIMIT_LOCKS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_idrss)
-return 0;
+RLIMIT_LOCKS
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_idrss=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_LOCKS=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_rusage_ru_idrss=no
+  zsh_cv_have_RLIMIT_LOCKS=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
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_idrss" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_idrss" >&6; }
-if test $ac_cv_member_struct_rusage_ru_idrss = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_IDRSS 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_LOCKS" >&5
+$as_echo "$zsh_cv_have_RLIMIT_LOCKS" >&6; }
 
+if test $zsh_cv_have_RLIMIT_LOCKS = yes; then
+  $as_echo "#define HAVE_RLIMIT_LOCKS 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_isrss" >&5
-echo $ECHO_N "checking for struct rusage.ru_isrss... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_isrss+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_MEMLOCK" >&5
+$as_echo_n "checking for limit RLIMIT_MEMLOCK... " >&6; }
+if test "${zsh_cv_have_RLIMIT_MEMLOCK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (ac_aggr.ru_isrss)
-return 0;
+RLIMIT_MEMLOCK
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_isrss=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_MEMLOCK=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_have_RLIMIT_MEMLOCK=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_MEMLOCK" >&5
+$as_echo "$zsh_cv_have_RLIMIT_MEMLOCK" >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test $zsh_cv_have_RLIMIT_MEMLOCK = yes; then
+  $as_echo "#define HAVE_RLIMIT_MEMLOCK 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NPROC" >&5
+$as_echo_n "checking for limit RLIMIT_NPROC... " >&6; }
+if test "${zsh_cv_have_RLIMIT_NPROC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_isrss)
-return 0;
+RLIMIT_NPROC
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_isrss=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_NPROC=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_rusage_ru_isrss=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  zsh_cv_have_RLIMIT_NPROC=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_isrss" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_isrss" >&6; }
-if test $ac_cv_member_struct_rusage_ru_isrss = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_ISRSS 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_NPROC" >&5
+$as_echo "$zsh_cv_have_RLIMIT_NPROC" >&6; }
 
+if test $zsh_cv_have_RLIMIT_NPROC = yes; then
+  $as_echo "#define HAVE_RLIMIT_NPROC 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_minflt" >&5
-echo $ECHO_N "checking for struct rusage.ru_minflt... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_minflt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NOFILE" >&5
+$as_echo_n "checking for limit RLIMIT_NOFILE... " >&6; }
+if test "${zsh_cv_have_RLIMIT_NOFILE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (ac_aggr.ru_minflt)
-return 0;
+RLIMIT_NOFILE
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_minflt=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_NOFILE=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_have_RLIMIT_NOFILE=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_NOFILE" >&5
+$as_echo "$zsh_cv_have_RLIMIT_NOFILE" >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test $zsh_cv_have_RLIMIT_NOFILE = yes; then
+  $as_echo "#define HAVE_RLIMIT_NOFILE 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_PTHREAD" >&5
+$as_echo_n "checking for limit RLIMIT_PTHREAD... " >&6; }
+if test "${zsh_cv_have_RLIMIT_PTHREAD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_minflt)
-return 0;
+RLIMIT_PTHREAD
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_minflt=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_PTHREAD=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_rusage_ru_minflt=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  zsh_cv_have_RLIMIT_PTHREAD=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_minflt" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_minflt" >&6; }
-if test $ac_cv_member_struct_rusage_ru_minflt = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_MINFLT 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_PTHREAD" >&5
+$as_echo "$zsh_cv_have_RLIMIT_PTHREAD" >&6; }
 
+if test $zsh_cv_have_RLIMIT_PTHREAD = yes; then
+  $as_echo "#define HAVE_RLIMIT_PTHREAD 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_majflt" >&5
-echo $ECHO_N "checking for struct rusage.ru_majflt... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_majflt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_RSS" >&5
+$as_echo_n "checking for limit RLIMIT_RSS... " >&6; }
+if test "${zsh_cv_have_RLIMIT_RSS+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (ac_aggr.ru_majflt)
-return 0;
+RLIMIT_RSS
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_majflt=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_RSS=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_have_RLIMIT_RSS=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_RSS" >&5
+$as_echo "$zsh_cv_have_RLIMIT_RSS" >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test $zsh_cv_have_RLIMIT_RSS = yes; then
+  $as_echo "#define HAVE_RLIMIT_RSS 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_SBSIZE" >&5
+$as_echo_n "checking for limit RLIMIT_SBSIZE... " >&6; }
+if test "${zsh_cv_have_RLIMIT_SBSIZE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_majflt)
-return 0;
+RLIMIT_SBSIZE
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_majflt=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_SBSIZE=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_rusage_ru_majflt=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  zsh_cv_have_RLIMIT_SBSIZE=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_majflt" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_majflt" >&6; }
-if test $ac_cv_member_struct_rusage_ru_majflt = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_MAJFLT 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_SBSIZE" >&5
+$as_echo "$zsh_cv_have_RLIMIT_SBSIZE" >&6; }
 
+if test $zsh_cv_have_RLIMIT_SBSIZE = yes; then
+  $as_echo "#define HAVE_RLIMIT_SBSIZE 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_nswap" >&5
-echo $ECHO_N "checking for struct rusage.ru_nswap... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_nswap+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_TCACHE" >&5
+$as_echo_n "checking for limit RLIMIT_TCACHE... " >&6; }
+if test "${zsh_cv_have_RLIMIT_TCACHE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (ac_aggr.ru_nswap)
-return 0;
+RLIMIT_TCACHE
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_nswap=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_TCACHE=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_have_RLIMIT_TCACHE=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_TCACHE" >&5
+$as_echo "$zsh_cv_have_RLIMIT_TCACHE" >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test $zsh_cv_have_RLIMIT_TCACHE = yes; then
+  $as_echo "#define HAVE_RLIMIT_TCACHE 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_VMEM" >&5
+$as_echo_n "checking for limit RLIMIT_VMEM... " >&6; }
+if test "${zsh_cv_have_RLIMIT_VMEM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_nswap)
-return 0;
+RLIMIT_VMEM
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_nswap=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_VMEM=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_rusage_ru_nswap=no
+  zsh_cv_have_RLIMIT_VMEM=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
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_nswap" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_nswap" >&6; }
-if test $ac_cv_member_struct_rusage_ru_nswap = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_NSWAP 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_VMEM" >&5
+$as_echo "$zsh_cv_have_RLIMIT_VMEM" >&6; }
 
+if test $zsh_cv_have_RLIMIT_VMEM = yes; then
+  $as_echo "#define HAVE_RLIMIT_VMEM 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_inblock" >&5
-echo $ECHO_N "checking for struct rusage.ru_inblock... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_inblock+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_SIGPENDING" >&5
+$as_echo_n "checking for limit RLIMIT_SIGPENDING... " >&6; }
+if test "${zsh_cv_have_RLIMIT_SIGPENDING+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (ac_aggr.ru_inblock)
-return 0;
+RLIMIT_SIGPENDING
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_inblock=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_SIGPENDING=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_have_RLIMIT_SIGPENDING=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_SIGPENDING" >&5
+$as_echo "$zsh_cv_have_RLIMIT_SIGPENDING" >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test $zsh_cv_have_RLIMIT_SIGPENDING = yes; then
+  $as_echo "#define HAVE_RLIMIT_SIGPENDING 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_MSGQUEUE" >&5
+$as_echo_n "checking for limit RLIMIT_MSGQUEUE... " >&6; }
+if test "${zsh_cv_have_RLIMIT_MSGQUEUE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_inblock)
-return 0;
+RLIMIT_MSGQUEUE
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_inblock=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_MSGQUEUE=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_rusage_ru_inblock=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  zsh_cv_have_RLIMIT_MSGQUEUE=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_inblock" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_inblock" >&6; }
-if test $ac_cv_member_struct_rusage_ru_inblock = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_INBLOCK 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_MSGQUEUE" >&5
+$as_echo "$zsh_cv_have_RLIMIT_MSGQUEUE" >&6; }
 
+if test $zsh_cv_have_RLIMIT_MSGQUEUE = yes; then
+  $as_echo "#define HAVE_RLIMIT_MSGQUEUE 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_oublock" >&5
-echo $ECHO_N "checking for struct rusage.ru_oublock... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_oublock+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_NICE" >&5
+$as_echo_n "checking for limit RLIMIT_NICE... " >&6; }
+if test "${zsh_cv_have_RLIMIT_NICE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (ac_aggr.ru_oublock)
-return 0;
+RLIMIT_NICE
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_oublock=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_NICE=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_have_RLIMIT_NICE=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_NICE" >&5
+$as_echo "$zsh_cv_have_RLIMIT_NICE" >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if test $zsh_cv_have_RLIMIT_NICE = yes; then
+  $as_echo "#define HAVE_RLIMIT_NICE 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for limit RLIMIT_RTPRIO" >&5
+$as_echo_n "checking for limit RLIMIT_RTPRIO... " >&6; }
+if test "${zsh_cv_have_RLIMIT_RTPRIO+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
 int
 main ()
 {
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_oublock)
-return 0;
+RLIMIT_RTPRIO
   ;
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_oublock=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  zsh_cv_have_RLIMIT_RTPRIO=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_rusage_ru_oublock=no
+  zsh_cv_have_RLIMIT_RTPRIO=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_have_RLIMIT_RTPRIO" >&5
+$as_echo "$zsh_cv_have_RLIMIT_RTPRIO" >&6; }
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_oublock" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_oublock" >&6; }
-if test $ac_cv_member_struct_rusage_ru_oublock = yes; then
+if test $zsh_cv_have_RLIMIT_RTPRIO = yes; then
+  $as_echo "#define HAVE_RLIMIT_RTPRIO 1" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_OUBLOCK 1
-_ACEOF
+fi
 
 
-fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_msgsnd" >&5
-echo $ECHO_N "checking for struct rusage.ru_msgsnd... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_msgsnd+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if RLIMIT_VMEM and RLIMIT_RSS are the same" >&5
+$as_echo_n "checking if RLIMIT_VMEM and RLIMIT_RSS are the same... " >&6; }
+if test "${zsh_cv_rlimit_vmem_is_rss+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then :
+  zsh_cv_rlimit_vmem_is_rss=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
-int
-main ()
+int main()
 {
-static struct rusage ac_aggr;
-if (ac_aggr.ru_msgsnd)
-return 0;
-  ;
-  return 0;
+int ret = 1;
+#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_RSS)
+if (RLIMIT_RSS == RLIMIT_VMEM) ret = 0;
+#endif
+return ret;
 }
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_msgsnd=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  zsh_cv_rlimit_vmem_is_rss=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_rlimit_vmem_is_rss=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_vmem_is_rss" >&5
+$as_echo "$zsh_cv_rlimit_vmem_is_rss" >&6; }
+
+if test x$zsh_cv_rlimit_vmem_is_rss = xyes; then
+  $as_echo "#define RLIMIT_VMEM_IS_RSS 1" >>confdefs.h
+
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if RLIMIT_VMEM and RLIMIT_AS are the same" >&5
+$as_echo_n "checking if RLIMIT_VMEM and RLIMIT_AS are the same... " >&6; }
+if test "${zsh_cv_rlimit_vmem_is_as+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  zsh_cv_rlimit_vmem_is_as=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
-int
-main ()
+int main()
 {
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_msgsnd)
-return 0;
-  ;
-  return 0;
+int ret = 1;
+#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_AS)
+if (RLIMIT_AS == RLIMIT_VMEM) ret = 0;
+#endif
+return ret;
 }
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_msgsnd=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  zsh_cv_rlimit_vmem_is_as=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_rusage_ru_msgsnd=no
+  zsh_cv_rlimit_vmem_is_as=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_vmem_is_as" >&5
+$as_echo "$zsh_cv_rlimit_vmem_is_as" >&6; }
+
+if test x$zsh_cv_rlimit_vmem_is_as = xyes; then
+  $as_echo "#define RLIMIT_VMEM_IS_AS 1" >>confdefs.h
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_msgsnd" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_msgsnd" >&6; }
-if test $ac_cv_member_struct_rusage_ru_msgsnd = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_MSGSND 1
-_ACEOF
 
 
-fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_msgrcv" >&5
-echo $ECHO_N "checking for struct rusage.ru_msgrcv... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_msgrcv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if RLIMIT_RSS and RLIMIT_AS are the same" >&5
+$as_echo_n "checking if RLIMIT_RSS and RLIMIT_AS are the same... " >&6; }
+if test "${zsh_cv_rlimit_rss_is_as+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then :
+  zsh_cv_rlimit_rss_is_as=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
-
-int
-main ()
+int main()
 {
-static struct rusage ac_aggr;
-if (ac_aggr.ru_msgrcv)
-return 0;
-  ;
-  return 0;
+int ret = 1;
+#if defined(HAVE_RLIMIT_RSS) && defined(HAVE_RLIMIT_AS)
+if (RLIMIT_AS == RLIMIT_RSS) ret = 0;
+#endif
+return ret;
 }
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_msgrcv=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  zsh_cv_rlimit_rss_is_as=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  zsh_cv_rlimit_rss_is_as=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
-	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>
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rlimit_rss_is_as" >&5
+$as_echo "$zsh_cv_rlimit_rss_is_as" >&6; }
+
+if test x$zsh_cv_rlimit_rss_is_as = xyes; then
+  $as_echo "#define RLIMIT_RSS_IS_AS 1" >>confdefs.h
+
+fi
+
+
+if test x$ac_cv_func_getrusage = xyes; then
+  ac_fn_c_check_member "$LINENO" "struct rusage" "ru_maxrss" "ac_cv_member_struct_rusage_ru_maxrss" "#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_maxrss" = x""yes; then :
 
-int
-main ()
-{
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_msgrcv)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_msgrcv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_member_struct_rusage_ru_msgrcv=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_ixrss" "ac_cv_member_struct_rusage_ru_ixrss" "#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_ixrss" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RUSAGE_RU_IXRSS 1
+_ACEOF
+
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_msgrcv" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_msgrcv" >&6; }
-if test $ac_cv_member_struct_rusage_ru_msgrcv = yes; then
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_idrss" "ac_cv_member_struct_rusage_ru_idrss" "#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_idrss" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_MSGRCV 1
+#define HAVE_STRUCT_RUSAGE_RU_IDRSS 1
 _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_nsignals" >&5
-echo $ECHO_N "checking for struct rusage.ru_nsignals... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_nsignals+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 <sys/types.h>
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_isrss" "ac_cv_member_struct_rusage_ru_isrss" "#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_isrss" = x""yes; then :
 
-int
-main ()
-{
-static struct rusage ac_aggr;
-if (ac_aggr.ru_nsignals)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RUSAGE_RU_ISRSS 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_nsignals=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	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>
+
+fi
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_minflt" "ac_cv_member_struct_rusage_ru_minflt" "#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_minflt" = x""yes; then :
 
-int
-main ()
-{
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_nsignals)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RUSAGE_RU_MINFLT 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_nsignals=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_member_struct_rusage_ru_nsignals=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_majflt" "ac_cv_member_struct_rusage_ru_majflt" "#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_majflt" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RUSAGE_RU_MAJFLT 1
+_ACEOF
+
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_nsignals" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_nsignals" >&6; }
-if test $ac_cv_member_struct_rusage_ru_nsignals = yes; then
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_nswap" "ac_cv_member_struct_rusage_ru_nswap" "#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_nswap" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_NSIGNALS 1
+#define HAVE_STRUCT_RUSAGE_RU_NSWAP 1
 _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_nvcsw" >&5
-echo $ECHO_N "checking for struct rusage.ru_nvcsw... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_nvcsw+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 <sys/types.h>
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_inblock" "ac_cv_member_struct_rusage_ru_inblock" "#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_inblock" = x""yes; then :
 
-int
-main ()
-{
-static struct rusage ac_aggr;
-if (ac_aggr.ru_nvcsw)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RUSAGE_RU_INBLOCK 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_nvcsw=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	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>
+
+fi
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_oublock" "ac_cv_member_struct_rusage_ru_oublock" "#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_oublock" = x""yes; then :
 
-int
-main ()
-{
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_nvcsw)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RUSAGE_RU_OUBLOCK 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_nvcsw=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_member_struct_rusage_ru_nvcsw=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
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_nvcsw" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_nvcsw" >&6; }
-if test $ac_cv_member_struct_rusage_ru_nvcsw = yes; then
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_msgsnd" "ac_cv_member_struct_rusage_ru_msgsnd" "#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_msgsnd" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_RUSAGE_RU_NVCSW 1
+#define HAVE_STRUCT_RUSAGE_RU_MSGSND 1
 _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct rusage.ru_nivcsw" >&5
-echo $ECHO_N "checking for struct rusage.ru_nivcsw... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_rusage_ru_nivcsw+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 <sys/types.h>
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_msgrcv" "ac_cv_member_struct_rusage_ru_msgrcv" "#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_msgrcv" = x""yes; then :
 
-int
-main ()
-{
-static struct rusage ac_aggr;
-if (ac_aggr.ru_nivcsw)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RUSAGE_RU_MSGRCV 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_nivcsw=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	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>
+
+fi
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_nsignals" "ac_cv_member_struct_rusage_ru_nsignals" "#include <sys/types.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
 #include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_nsignals" = x""yes; then :
 
-int
-main ()
-{
-static struct rusage ac_aggr;
-if (sizeof ac_aggr.ru_nivcsw)
-return 0;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RUSAGE_RU_NSIGNALS 1
 _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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_rusage_ru_nivcsw=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_member_struct_rusage_ru_nivcsw=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_nvcsw" "ac_cv_member_struct_rusage_ru_nvcsw" "#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_nvcsw" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_RUSAGE_RU_NVCSW 1
+_ACEOF
+
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_rusage_ru_nivcsw" >&5
-echo "${ECHO_T}$ac_cv_member_struct_rusage_ru_nivcsw" >&6; }
-if test $ac_cv_member_struct_rusage_ru_nivcsw = yes; then
+ac_fn_c_check_member "$LINENO" "struct rusage" "ru_nivcsw" "ac_cv_member_struct_rusage_ru_nivcsw" "#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/resource.h>
+"
+if test "x$ac_cv_member_struct_rusage_ru_nivcsw" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_RUSAGE_RU_NIVCSW 1
@@ -17276,8 +10059,8 @@
 fi
 
 
-if test "${zsh_cv_cs_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${zsh_cv_cs_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if getconf _CS_PATH >/dev/null 2>&1; then
   zsh_cv_cs_path=`getconf _CS_PATH`
@@ -17296,11 +10079,10 @@
 
 
 
-
-{ echo "$as_me:$LINENO: checking for /dev/fd filesystem" >&5
-echo $ECHO_N "checking for /dev/fd filesystem... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_path_dev_fd+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/fd filesystem" >&5
+$as_echo_n "checking for /dev/fd filesystem... " >&6; }
+if test "${zsh_cv_sys_path_dev_fd+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "$host_os" = cygwin; then
 zsh_cv_sys_path_dev_fd=no
@@ -17310,8 +10092,8 @@
  done
 fi
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_path_dev_fd" >&5
-echo "${ECHO_T}$zsh_cv_sys_path_dev_fd" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_path_dev_fd" >&5
+$as_echo "$zsh_cv_sys_path_dev_fd" >&6; }
 if test x$zsh_cv_sys_path_dev_fd != xno; then
   cat >>confdefs.h <<_ACEOF
 #define PATH_DEV_FD "$zsh_cv_sys_path_dev_fd"
@@ -17319,145 +10101,52 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for RFS superroot directory" >&5
-echo $ECHO_N "checking for RFS superroot directory... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_superroot+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RFS superroot directory" >&5
+$as_echo_n "checking for RFS superroot directory... " >&6; }
+if test "${zsh_cv_sys_superroot+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   test -d /../.LOCALROOT && zsh_cv_sys_superroot=yes || zsh_cv_sys_superroot=no
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_superroot" >&5
-echo "${ECHO_T}$zsh_cv_sys_superroot" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_superroot" >&5
+$as_echo "$zsh_cv_sys_superroot" >&6; }
 
 if test x$zsh_cv_sys_superroot = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_SUPERROOT 1
-_ACEOF
+  $as_echo "#define HAVE_SUPERROOT 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether we should use the native getcwd" >&5
-echo $ECHO_N "checking whether we should use the native getcwd... $ECHO_C" >&6; }
-if test "${zsh_cv_use_getcwd+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we should use the native getcwd" >&5
+$as_echo_n "checking whether we should use the native getcwd... " >&6; }
+if test "${zsh_cv_use_getcwd+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case "${host_cpu}-${host_vendor}-${host_os}" in
     *QNX*) zsh_cv_use_getcwd=yes ;;
     *) zsh_cv_use_getcwd=no ;;
  esac
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_use_getcwd" >&5
-echo "${ECHO_T}$zsh_cv_use_getcwd" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_use_getcwd" >&5
+$as_echo "$zsh_cv_use_getcwd" >&6; }
 
 if test x$zsh_cv_use_getcwd = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define USE_GETCWD 1
-_ACEOF
+  $as_echo "#define USE_GETCWD 1" >>confdefs.h
 
 fi
 
 
-
-{ echo "$as_me:$LINENO: checking for setproctitle" >&5
-echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6; }
-if test "${ac_cv_func_setproctitle+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.  */
-/* Define setproctitle to an innocuous variant, in case <limits.h> declares setproctitle.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define setproctitle innocuous_setproctitle
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char setproctitle (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef setproctitle
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char setproctitle ();
-/* 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_setproctitle || defined __stub___setproctitle
-choke me
-#endif
-
-int
-main ()
-{
-return setproctitle ();
-  ;
-  return 0;
-}
-_ACEOF
-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); } && {
-	 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_setproctitle=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_setproctitle=no
-fi
-
-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_setproctitle" >&5
-echo "${ECHO_T}$ac_cv_func_setproctitle" >&6; }
-if test $ac_cv_func_setproctitle = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_SETPROCTITLE 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
+if test "x$ac_cv_func_setproctitle" = x""yes; then :
+  $as_echo "#define HAVE_SETPROCTITLE 1" >>confdefs.h
 
 else
-  { echo "$as_me:$LINENO: checking for library containing setproctitle" >&5
-echo $ECHO_N "checking for library containing setproctitle... $ECHO_C" >&6; }
-if test "${ac_cv_search_setproctitle+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setproctitle" >&5
+$as_echo_n "checking for library containing setproctitle... " >&6; }
+if test "${ac_cv_search_setproctitle+set}" = set; then :
+  $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17482,54 +10171,29 @@
     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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_setproctitle=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_setproctitle+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_setproctitle+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_setproctitle+set}" = set; then
-  :
+if test "${ac_cv_search_setproctitle+set}" = set; then :
+
 else
   ac_cv_search_setproctitle=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_setproctitle" >&5
-echo "${ECHO_T}$ac_cv_search_setproctitle" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_setproctitle" >&5
+$as_echo "$ac_cv_search_setproctitle" >&6; }
 ac_res=$ac_cv_search_setproctitle
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_SETPROCTITLE 1
-_ACEOF
+  $as_echo "#define HAVE_SETPROCTITLE 1" >>confdefs.h
 
 fi
 
@@ -17537,33 +10201,26 @@
 
 
 
-
-{ echo "$as_me:$LINENO: checking for NIS" >&5
-echo $ECHO_N "checking for NIS... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_nis+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NIS" >&5
+$as_echo_n "checking for NIS... " >&6; }
+if test "${zsh_cv_sys_nis+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   test -f /usr/bin/ypcat && /usr/bin/ypcat passwd.byname > /dev/null 2>&1 && \
 zsh_cv_sys_nis=yes || zsh_cv_sys_nis=no
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_nis" >&5
-echo "${ECHO_T}$zsh_cv_sys_nis" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_nis" >&5
+$as_echo "$zsh_cv_sys_nis" >&6; }
 if test x$zsh_cv_sys_nis = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_NIS 1
-_ACEOF
+  $as_echo "#define HAVE_NIS 1" >>confdefs.h
 
-  { echo "$as_me:$LINENO: checking for library containing yp_all" >&5
-echo $ECHO_N "checking for library containing yp_all... $ECHO_C" >&6; }
-if test "${ac_cv_search_yp_all+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_all" >&5
+$as_echo_n "checking for library containing yp_all... " >&6; }
+if test "${ac_cv_search_yp_all+set}" = set; then :
+  $as_echo_n "(cached) " >&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
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17588,50 +10245,27 @@
     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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_yp_all=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_yp_all+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_yp_all+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_yp_all+set}" = set; then
-  :
+if test "${ac_cv_search_yp_all+set}" = set; then :
+
 else
   ac_cv_search_yp_all=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_yp_all" >&5
-echo "${ECHO_T}$ac_cv_search_yp_all" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_yp_all" >&5
+$as_echo "$ac_cv_search_yp_all" >&6; }
 ac_res=$ac_cv_search_yp_all
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -17639,29 +10273,26 @@
 fi
 
 
-
-{ echo "$as_me:$LINENO: checking for NIS+" >&5
-echo $ECHO_N "checking for NIS+... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_nis_plus+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NIS+" >&5
+$as_echo_n "checking for NIS+... " >&6; }
+if test "${zsh_cv_sys_nis_plus+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   test x$ac_cv_func_nis_list = xyes && test -f /usr/bin/nisls && \
  /usr/bin/nisls > /dev/null 2>&1 && \
 zsh_cv_sys_nis_plus=yes || zsh_cv_sys_nis_plus=no
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_nis_plus" >&5
-echo "${ECHO_T}$zsh_cv_sys_nis_plus" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_nis_plus" >&5
+$as_echo "$zsh_cv_sys_nis_plus" >&6; }
 if test x$zsh_cv_sys_nis_plus = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_NIS_PLUS 1
-_ACEOF
+  $as_echo "#define HAVE_NIS_PLUS 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for utmp file" >&5
-echo $ECHO_N "checking for utmp file... $ECHO_C" >&6; }
-if test "${zsh_cv_path_utmp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utmp file" >&5
+$as_echo_n "checking for utmp file... " >&6; }
+if test "${zsh_cv_path_utmp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   for dir in /etc /usr/etc /var/adm /usr/adm /var/run /var/log ./conftest; do
   zsh_cv_path_utmp=${dir}/utmp
@@ -17670,9 +10301,8 @@
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_path_utmp" >&5
-echo "${ECHO_T}$zsh_cv_path_utmp" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_path_utmp" >&5
+$as_echo "$zsh_cv_path_utmp" >&6; }
 
 if test $zsh_cv_path_utmp != no; then
   cat >>confdefs.h <<_ACEOF
@@ -17681,10 +10311,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for wtmp file" >&5
-echo $ECHO_N "checking for wtmp file... $ECHO_C" >&6; }
-if test "${zsh_cv_path_wtmp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wtmp file" >&5
+$as_echo_n "checking for wtmp file... " >&6; }
+if test "${zsh_cv_path_wtmp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   for dir in /etc /usr/etc /var/adm /usr/adm /var/run /var/log ./conftest; do
   zsh_cv_path_wtmp=${dir}/wtmp
@@ -17693,9 +10323,8 @@
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_path_wtmp" >&5
-echo "${ECHO_T}$zsh_cv_path_wtmp" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_path_wtmp" >&5
+$as_echo "$zsh_cv_path_wtmp" >&6; }
 
 if test $zsh_cv_path_wtmp != no; then
   cat >>confdefs.h <<_ACEOF
@@ -17704,10 +10333,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for utmpx file" >&5
-echo $ECHO_N "checking for utmpx file... $ECHO_C" >&6; }
-if test "${zsh_cv_path_utmpx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utmpx file" >&5
+$as_echo_n "checking for utmpx file... " >&6; }
+if test "${zsh_cv_path_utmpx+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   for dir in /etc /usr/etc /var/adm /usr/adm /var/run /var/log ./conftest; do
   zsh_cv_path_utmpx=${dir}/utmpx
@@ -17716,9 +10345,8 @@
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_path_utmpx" >&5
-echo "${ECHO_T}$zsh_cv_path_utmpx" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_path_utmpx" >&5
+$as_echo "$zsh_cv_path_utmpx" >&6; }
 
 if test $zsh_cv_path_utmpx != no; then
   cat >>confdefs.h <<_ACEOF
@@ -17727,10 +10355,10 @@
 
 fi
 
-{ echo "$as_me:$LINENO: checking for wtmpx file" >&5
-echo $ECHO_N "checking for wtmpx file... $ECHO_C" >&6; }
-if test "${zsh_cv_path_wtmpx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wtmpx file" >&5
+$as_echo_n "checking for wtmpx file... " >&6; }
+if test "${zsh_cv_path_wtmpx+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   for dir in /etc /usr/etc /var/adm /usr/adm /var/run /var/log ./conftest; do
   zsh_cv_path_wtmpx=${dir}/wtmpx
@@ -17739,9 +10367,8 @@
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_path_wtmpx" >&5
-echo "${ECHO_T}$zsh_cv_path_wtmpx" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_path_wtmpx" >&5
+$as_echo "$zsh_cv_path_wtmpx" >&6; }
 
 if test $zsh_cv_path_wtmpx != no; then
   cat >>confdefs.h <<_ACEOF
@@ -17751,16 +10378,12 @@
 fi
 
 
-{ echo "$as_me:$LINENO: checking for brk() prototype in <unistd.h>" >&5
-echo $ECHO_N "checking for brk() prototype in <unistd.h>... $ECHO_C" >&6; }
-if test "${zsh_cv_header_unistd_h_brk_proto+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for brk() prototype in <unistd.h>" >&5
+$as_echo_n "checking for brk() prototype in <unistd.h>... " >&6; }
+if test "${zsh_cv_header_unistd_h_brk_proto+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 double brk();
@@ -17772,54 +10395,27 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_header_unistd_h_brk_proto=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_header_unistd_h_brk_proto=yes
+  zsh_cv_header_unistd_h_brk_proto=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_header_unistd_h_brk_proto" >&5
-echo "${ECHO_T}$zsh_cv_header_unistd_h_brk_proto" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_header_unistd_h_brk_proto" >&5
+$as_echo "$zsh_cv_header_unistd_h_brk_proto" >&6; }
 
 if test x$zsh_cv_header_unistd_h_brk_proto = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_BRK_PROTO 1
-_ACEOF
+  $as_echo "#define HAVE_BRK_PROTO 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for sbrk() prototype in <unistd.h>" >&5
-echo $ECHO_N "checking for sbrk() prototype in <unistd.h>... $ECHO_C" >&6; }
-if test "${zsh_cv_header_unistd_h_sbrk_proto+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sbrk() prototype in <unistd.h>" >&5
+$as_echo_n "checking for sbrk() prototype in <unistd.h>... " >&6; }
+if test "${zsh_cv_header_unistd_h_sbrk_proto+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 double sbrk();
@@ -17827,61 +10423,33 @@
 main ()
 {
 int i;
-  ;
-  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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_header_unistd_h_sbrk_proto=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_header_unistd_h_sbrk_proto=yes
+  zsh_cv_header_unistd_h_sbrk_proto=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_header_unistd_h_sbrk_proto" >&5
-echo "${ECHO_T}$zsh_cv_header_unistd_h_sbrk_proto" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_header_unistd_h_sbrk_proto" >&5
+$as_echo "$zsh_cv_header_unistd_h_sbrk_proto" >&6; }
 
 if test x$zsh_cv_header_unistd_h_sbrk_proto = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_SBRK_PROTO 1
-_ACEOF
+  $as_echo "#define HAVE_SBRK_PROTO 1" >>confdefs.h
 
 fi
 
 
-
 if test "$ac_cv_prog_cc_stdc" != no; then
-  { echo "$as_me:$LINENO: checking for mknod prototype in <sys/stat.h>" >&5
-echo $ECHO_N "checking for mknod prototype in <sys/stat.h>... $ECHO_C" >&6; }
-if test "${zsh_cv_header_sys_stat_h_mknod_proto+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mknod prototype in <sys/stat.h>" >&5
+$as_echo_n "checking for mknod prototype in <sys/stat.h>... " >&6; }
+if test "${zsh_cv_header_sys_stat_h_mknod_proto+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
    int mknod(double x);
@@ -17893,53 +10461,27 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_header_sys_stat_h_mknod_proto=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_header_sys_stat_h_mknod_proto=yes
+  zsh_cv_header_sys_stat_h_mknod_proto=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_header_sys_stat_h_mknod_proto" >&5
-echo "${ECHO_T}$zsh_cv_header_sys_stat_h_mknod_proto" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_header_sys_stat_h_mknod_proto" >&5
+$as_echo "$zsh_cv_header_sys_stat_h_mknod_proto" >&6; }
   if test x$zsh_cv_header_sys_stat_h_mknod_proto = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_MKNOD_PROTO 1
-_ACEOF
+    $as_echo "#define HAVE_MKNOD_PROTO 1" >>confdefs.h
 
   fi
 fi
 
-{ echo "$as_me:$LINENO: checking for ioctl prototype in <unistd.h> or <termios.h>" >&5
-echo $ECHO_N "checking for ioctl prototype in <unistd.h> or <termios.h>... $ECHO_C" >&6; }
-if test "${zsh_cv_header_unistd_h_termios_h_ioctl_proto+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ioctl prototype in <unistd.h> or <termios.h>" >&5
+$as_echo_n "checking for ioctl prototype in <unistd.h> or <termios.h>... " >&6; }
+if test "${zsh_cv_header_unistd_h_termios_h_ioctl_proto+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_UNISTD_H
@@ -17957,47 +10499,23 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_header_unistd_h_termios_h_ioctl_proto=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_header_unistd_h_termios_h_ioctl_proto=yes
+  zsh_cv_header_unistd_h_termios_h_ioctl_proto=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_header_unistd_h_termios_h_ioctl_proto" >&5
-echo "${ECHO_T}$zsh_cv_header_unistd_h_termios_h_ioctl_proto" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_header_unistd_h_termios_h_ioctl_proto" >&5
+$as_echo "$zsh_cv_header_unistd_h_termios_h_ioctl_proto" >&6; }
 
 if test x$zsh_cv_header_unistd_h_termios_h_ioctl_proto = xno; then
-  { echo "$as_me:$LINENO: checking for ioctl prototype in <sys/ioctl.h>" >&5
-echo $ECHO_N "checking for ioctl prototype in <sys/ioctl.h>... $ECHO_C" >&6; }
-if test "${zsh_cv_header_sys_ioctl_h_ioctl_proto+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ioctl prototype in <sys/ioctl.h>" >&5
+$as_echo_n "checking for ioctl prototype in <sys/ioctl.h>... " >&6; }
+if test "${zsh_cv_header_sys_ioctl_h_ioctl_proto+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/ioctl.h>
   double ioctl();
@@ -18009,70 +10527,39 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_header_sys_ioctl_h_ioctl_proto=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_header_sys_ioctl_h_ioctl_proto=yes
+  zsh_cv_header_sys_ioctl_h_ioctl_proto=yes
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_header_sys_ioctl_h_ioctl_proto" >&5
-echo "${ECHO_T}$zsh_cv_header_sys_ioctl_h_ioctl_proto" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_header_sys_ioctl_h_ioctl_proto" >&5
+$as_echo "$zsh_cv_header_sys_ioctl_h_ioctl_proto" >&6; }
 else
   zsh_cv_header_sys_ioctl_h_ioctl_proto=no
 fi
 
 
-
 if test x$zsh_cv_header_unistd_h_termios_h_ioctl_proto = xyes || \
    test x$zsh_cv_header_sys_ioctl_h_ioctl_proto = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_IOCTL_PROTO 1
-_ACEOF
+  $as_echo "#define HAVE_IOCTL_PROTO 1" >>confdefs.h
 
 fi
 
-
 if test x$zsh_cv_header_sys_ioctl_h_ioctl_proto = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define IOCTL_IN_SYS_IOCTL 1
-_ACEOF
+  $as_echo "#define IOCTL_IN_SYS_IOCTL 1" >>confdefs.h
 
 fi
 
 
-
 if test x$ac_cv_header_sys_select_h != xyes; then
-  { echo "$as_me:$LINENO: checking for select() in <sys/socket.h>" >&5
-echo $ECHO_N "checking for select() in <sys/socket.h>... $ECHO_C" >&6; }
-if test "${zsh_cv_header_socket_h_select_proto+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for select() in <sys/socket.h>" >&5
+$as_echo_n "checking for select() in <sys/socket.h>... " >&6; }
+if test "${zsh_cv_header_socket_h_select_proto+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/socket.h>
 int
@@ -18083,59 +10570,33 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_header_socket_h_select_proto=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cv_header_socket_h_select_proto=no
+  zsh_cv_header_socket_h_select_proto=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_header_socket_h_select_proto" >&5
-echo "${ECHO_T}$zsh_cv_header_socket_h_select_proto" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_header_socket_h_select_proto" >&5
+$as_echo "$zsh_cv_header_socket_h_select_proto" >&6; }
   if test x$zsh_cv_header_socket_h_select_proto = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define SELECT_IN_SYS_SOCKET_H 1
-_ACEOF
+    $as_echo "#define SELECT_IN_SYS_SOCKET_H 1" >>confdefs.h
 
   fi
 fi
 
-{ echo "$as_me:$LINENO: checking if named FIFOs work" >&5
-echo $ECHO_N "checking if named FIFOs work... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_fifo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if named FIFOs work" >&5
+$as_echo_n "checking if named FIFOs work... " >&6; }
+if test "${zsh_cv_sys_fifo+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "$host_os" = cygwin; then
 zsh_cv_sys_fifo=yes
 else
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
   zsh_cv_sys_fifo=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <fcntl.h>
@@ -18166,55 +10627,28 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_fifo=yes
 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 )
-zsh_cv_sys_fifo=no
+  zsh_cv_sys_fifo=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_fifo" >&5
-echo "${ECHO_T}$zsh_cv_sys_fifo" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_fifo" >&5
+$as_echo "$zsh_cv_sys_fifo" >&6; }
 
 if test x$zsh_cv_sys_fifo = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_FIFOS 1
-_ACEOF
+  $as_echo "#define HAVE_FIFOS 1" >>confdefs.h
 
 fi
-{ echo "$as_me:$LINENO: checking if echo in /bin/sh interprets escape sequences" >&5
-echo $ECHO_N "checking if echo in /bin/sh interprets escape sequences... $ECHO_C" >&6; }
-if test "${zsh_cv_prog_sh_echo_escape+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if echo in /bin/sh interprets escape sequences" >&5
+$as_echo_n "checking if echo in /bin/sh interprets escape sequences... " >&6; }
+if test "${zsh_cv_prog_sh_echo_escape+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "`/bin/sh -c \"echo '\\n'\"`" = "\\n"; then
   zsh_cv_prog_sh_echo_escape=no
@@ -18222,30 +10656,23 @@
   zsh_cv_prog_sh_echo_escape=yes
 fi
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_prog_sh_echo_escape" >&5
-echo "${ECHO_T}$zsh_cv_prog_sh_echo_escape" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_prog_sh_echo_escape" >&5
+$as_echo "$zsh_cv_prog_sh_echo_escape" >&6; }
 
 if test x$zsh_cv_prog_sh_echo_escape = xno; then
-  cat >>confdefs.h <<\_ACEOF
-#define SH_USE_BSD_ECHO 1
-_ACEOF
+  $as_echo "#define SH_USE_BSD_ECHO 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking if link() works" >&5
-echo $ECHO_N "checking if link() works... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if link() works" >&5
+$as_echo_n "checking if link() works... " >&6; }
+if test "${zsh_cv_sys_link+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_sys_link=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -18267,64 +10694,33 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_link=yes
 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 )
-zsh_cv_sys_link=no
+  zsh_cv_sys_link=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_link" >&5
-echo "${ECHO_T}$zsh_cv_sys_link" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_link" >&5
+$as_echo "$zsh_cv_sys_link" >&6; }
 
 if test x$zsh_cv_sys_link = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_LINK 1
-_ACEOF
+  $as_echo "#define HAVE_LINK 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking if kill(pid, 0) returns ESRCH correctly" >&5
-echo $ECHO_N "checking if kill(pid, 0) returns ESRCH correctly... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_killesrch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if kill(pid, 0) returns ESRCH correctly" >&5
+$as_echo_n "checking if kill(pid, 0) returns ESRCH correctly... " >&6; }
+if test "${zsh_cv_sys_killesrch+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_sys_killesrch=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -18338,67 +10734,35 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_killesrch=yes
 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 )
-zsh_cv_sys_killesrch=no
+  zsh_cv_sys_killesrch=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_killesrch" >&5
-echo "${ECHO_T}$zsh_cv_sys_killesrch" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_killesrch" >&5
+$as_echo "$zsh_cv_sys_killesrch" >&6; }
 
 if test x$zsh_cv_sys_killesrch = xno; then
-  cat >>confdefs.h <<\_ACEOF
-#define BROKEN_KILL_ESRCH 1
-_ACEOF
+  $as_echo "#define BROKEN_KILL_ESRCH 1" >>confdefs.h
 
 fi
 
 
-
 if test x$signals_style = xPOSIX_SIGNALS; then
-    { echo "$as_me:$LINENO: checking if POSIX sigsuspend() works" >&5
-echo $ECHO_N "checking if POSIX sigsuspend() works... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_sigsuspend+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if POSIX sigsuspend() works" >&5
+$as_echo_n "checking if POSIX sigsuspend() works... " >&6; }
+if test "${zsh_cv_sys_sigsuspend+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_sys_sigsuspend=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <signal.h>
@@ -18427,62 +10791,33 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_sigsuspend=yes
 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 )
-zsh_cv_sys_sigsuspend=no
+  zsh_cv_sys_sigsuspend=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_sigsuspend" >&5
-echo "${ECHO_T}$zsh_cv_sys_sigsuspend" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_sigsuspend" >&5
+$as_echo "$zsh_cv_sys_sigsuspend" >&6; }
     if test x$zsh_cv_sys_sigsuspend = xno; then
-      cat >>confdefs.h <<\_ACEOF
-#define BROKEN_POSIX_SIGSUSPEND 1
-_ACEOF
+      $as_echo "#define BROKEN_POSIX_SIGSUSPEND 1" >>confdefs.h
 
     fi
 fi
 
 
 
-
 # Check whether --with-tcsetpgrp was given.
-if test "${with_tcsetpgrp+set}" = set; then
+if test "${with_tcsetpgrp+set}" = set; then :
   withval=$with_tcsetpgrp;
 case "x$withval" in
     xyes) zsh_working_tcsetpgrp=yes;;
     xno)  zsh_working_tcsetpgrp=no;;
-    *)    { { echo "$as_me:$LINENO: error: please use --with-tcsetpgrp=yes or --with-tcsetpgrp=no" >&5
-echo "$as_me: error: please use --with-tcsetpgrp=yes or --with-tcsetpgrp=no" >&2;}
-   { (exit 1); exit 1; }; };;
+    *)    as_fn_error "please use --with-tcsetpgrp=yes or --with-tcsetpgrp=no" "$LINENO" 5;;
 esac
 else
   zsh_working_tcsetpgrp=check
@@ -18492,19 +10827,15 @@
 case "x$zsh_working_tcsetpgrp" in
   xcheck)
     trap "" TTOU > /dev/null 2>&1 || :
-    { echo "$as_me:$LINENO: checking if tcsetpgrp() actually works" >&5
-echo $ECHO_N "checking if tcsetpgrp() actually works... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_tcsetpgrp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcsetpgrp() actually works" >&5
+$as_echo_n "checking if tcsetpgrp() actually works... " >&6; }
+if test "${zsh_cv_sys_tcsetpgrp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_sys_tcsetpgrp=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -18521,33 +10852,9 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_tcsetpgrp=yes
 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 )
 
 case $? in
     1) zsh_cv_sys_tcsetpgrp=no;;
@@ -18556,57 +10863,41 @@
 esac
 
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_tcsetpgrp" >&5
-echo "${ECHO_T}$zsh_cv_sys_tcsetpgrp" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_tcsetpgrp" >&5
+$as_echo "$zsh_cv_sys_tcsetpgrp" >&6; }
     case "x$zsh_cv_sys_tcsetpgrp" in
-      xno)    cat >>confdefs.h <<\_ACEOF
-#define BROKEN_TCSETPGRP 1
-_ACEOF
+      xno)    $as_echo "#define BROKEN_TCSETPGRP 1" >>confdefs.h
 ;;
       xyes)   :;;
-      xnotty) { { echo "$as_me:$LINENO: error: no controlling tty
-Try running configure with --with-tcsetpgrp or --without-tcsetpgrp" >&5
-echo "$as_me: error: no controlling tty
-Try running configure with --with-tcsetpgrp or --without-tcsetpgrp" >&2;}
-   { (exit 1); exit 1; }; };;
-      *)      { { echo "$as_me:$LINENO: error: unexpected return status" >&5
-echo "$as_me: error: unexpected return status" >&2;}
-   { (exit 1); exit 1; }; };;
+      xnotty) as_fn_error "no controlling tty
+Try running configure with --with-tcsetpgrp or --without-tcsetpgrp" "$LINENO" 5;;
+      *)      as_fn_error "unexpected return status" "$LINENO" 5;;
     esac
     trap - TTOU > /dev/null 2>&1 || :
     ;;
   xyes) :;;
-  xno)  cat >>confdefs.h <<\_ACEOF
-#define BROKEN_TCSETPGRP 1
-_ACEOF
+  xno)  $as_echo "#define BROKEN_TCSETPGRP 1" >>confdefs.h
 ;;
-  *)    { { echo "$as_me:$LINENO: error: unexpected value zsh_working_tcsetpgrp=$zsh_working_tcsetpgrp" >&5
-echo "$as_me: error: unexpected value zsh_working_tcsetpgrp=$zsh_working_tcsetpgrp" >&2;}
-   { (exit 1); exit 1; }; };;
+  *)    as_fn_error "unexpected value zsh_working_tcsetpgrp=$zsh_working_tcsetpgrp" "$LINENO" 5;;
 esac
 fi
 
 
-
 if test x$ac_cv_func_getpwnam = xyes; then
-    { echo "$as_me:$LINENO: checking if getpwnam() is faked" >&5
-echo $ECHO_N "checking if getpwnam() is faked... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_getpwnam_faked+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getpwnam() is faked" >&5
+$as_echo_n "checking if getpwnam() is faked... " >&6; }
+if test "${zsh_cv_sys_getpwnam_faked+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_sys_getpwnam_faked=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <pwd.h>
@@ -18622,46 +10913,20 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_getpwnam_faked=no
 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 )
-zsh_cv_sys_getpwnam_faked=yes
+  zsh_cv_sys_getpwnam_faked=yes
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_getpwnam_faked" >&5
-echo "${ECHO_T}$zsh_cv_sys_getpwnam_faked" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_getpwnam_faked" >&5
+$as_echo "$zsh_cv_sys_getpwnam_faked" >&6; }
     if test x$zsh_cv_sys_getpwnam_faked = xyes; then
-      cat >>confdefs.h <<\_ACEOF
-#define GETPWNAM_FAKED 1
-_ACEOF
+      $as_echo "#define GETPWNAM_FAKED 1" >>confdefs.h
 
     fi
 fi
@@ -18669,18 +10934,14 @@
 
 
 
-  { echo "$as_me:$LINENO: checking base type of the third argument to accept" >&5
-echo $ECHO_N "checking base type of the third argument to accept... $ECHO_C" >&6; }
-if test "${zsh_cv_type_socklen_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking base type of the third argument to accept" >&5
+$as_echo_n "checking base type of the third argument to accept... " >&6; }
+if test "${zsh_cv_type_socklen_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   zsh_cv_type_socklen_t=
     for zsh_type in socklen_t int "unsigned long" size_t ; do
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
          #include <sys/socket.h>
@@ -18692,32 +10953,9 @@
   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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   zsh_cv_type_socklen_t="$zsh_type"; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     done
     if test -z "$zsh_cv_type_socklen_t"; then
@@ -18725,8 +10963,8 @@
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_type_socklen_t" >&5
-echo "${ECHO_T}$zsh_cv_type_socklen_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_type_socklen_t" >&5
+$as_echo "$zsh_cv_type_socklen_t" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define ZSOCKLEN_T $zsh_cv_type_socklen_t
@@ -18734,10 +10972,10 @@
 
 
 
-{ echo "$as_me:$LINENO: checking if your system has /dev/ptmx" >&5
-echo $ECHO_N "checking if your system has /dev/ptmx... $ECHO_C" >&6; }
-if test "${ac_cv_have_dev_ptmx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system has /dev/ptmx" >&5
+$as_echo_n "checking if your system has /dev/ptmx... " >&6; }
+if test "${ac_cv_have_dev_ptmx+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -w /dev/ptmx; then
   ac_cv_have_dev_ptmx=yes
@@ -18745,174 +10983,67 @@
   ac_cv_have_dev_ptmx=no
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_dev_ptmx" >&5
-echo "${ECHO_T}$ac_cv_have_dev_ptmx" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_dev_ptmx" >&5
+$as_echo "$ac_cv_have_dev_ptmx" >&6; }
 
 
 if test x$ac_cv_have_dev_ptmx = xyes && \
-   test x$ac_cv_func_grantpt = xyes && \
-   test x$ac_cv_func_unlockpt = xyes && \
-   test x$ac_cv_func_ptsname = xyes; then
-   { echo "$as_me:$LINENO: checking if /dev/ptmx is usable" >&5
-echo $ECHO_N "checking if /dev/ptmx is usable... $ECHO_C" >&6; }
-if test "${ac_cv_use_dev_ptmx+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.  */
-#ifdef __linux
-#define _GNU_SOURCE 1
-#endif
-#include <stdlib.h>
-int ptsname();
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_use_dev_ptmx=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_use_dev_ptmx=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_use_dev_ptmx" >&5
-echo "${ECHO_T}$ac_cv_use_dev_ptmx" >&6; }
-   if test x$ac_cv_use_dev_ptmx = xyes; then
-     cat >>confdefs.h <<\_ACEOF
-#define USE_DEV_PTMX 1
-_ACEOF
-
-   fi
-fi
-
-# Check whether --enable-multibyte was given.
-if test "${enable_multibyte+set}" = set; then
-  enableval=$enable_multibyte; zsh_cv_c_unicode_support=$enableval
-else
-  if test "${zsh_cv_c_unicode_support+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  { echo "$as_me:$LINENO: checking for functions supporting multibyte characters" >&5
-echo "$as_me: checking for functions supporting multibyte characters" >&6;}
-  zfuncs_absent=
-   for zfunc in iswalnum iswcntrl iswdigit iswgraph iswlower iswprint \
-iswpunct iswspace iswupper iswxdigit mbrlen mbrtowc towupper towlower \
-wcschr wcscpy wcslen wcsncmp wcsncpy wcrtomb wcwidth wmemchr wmemcmp \
-wmemcpy wmemmove wmemset; do
-     as_ac_var=`echo "ac_cv_func_$zfunc" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $zfunc" >&5
-echo $ECHO_N "checking for $zfunc... $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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $zfunc to an innocuous variant, in case <limits.h> declares $zfunc.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $zfunc innocuous_$zfunc
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $zfunc (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $zfunc
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $zfunc ();
-/* 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_$zfunc || defined __stub___$zfunc
-choke me
+   test x$ac_cv_func_grantpt = xyes && \
+   test x$ac_cv_func_unlockpt = xyes && \
+   test x$ac_cv_func_ptsname = xyes; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if /dev/ptmx is usable" >&5
+$as_echo_n "checking if /dev/ptmx is usable... " >&6; }
+if test "${ac_cv_use_dev_ptmx+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __linux
+#define _GNU_SOURCE 1
 #endif
-
+#include <stdlib.h>
+int ptsname();
 int
 main ()
 {
-return $zfunc ();
+
   ;
   return 0;
 }
 _ACEOF
-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); } && {
-	 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"
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_use_dev_ptmx=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
+  ac_cv_use_dev_ptmx=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_use_dev_ptmx" >&5
+$as_echo "$ac_cv_use_dev_ptmx" >&6; }
+   if test x$ac_cv_use_dev_ptmx = xyes; then
+     $as_echo "#define USE_DEV_PTMX 1" >>confdefs.h
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+   fi
 fi
-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
+
+# Check whether --enable-multibyte was given.
+if test "${enable_multibyte+set}" = set; then :
+  enableval=$enable_multibyte; zsh_cv_c_unicode_support=$enableval
+else
+  if test "${zsh_cv_c_unicode_support+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for functions supporting multibyte characters" >&5
+$as_echo "$as_me: checking for functions supporting multibyte characters" >&6;}
+  zfuncs_absent=
+   for zfunc in iswalnum iswcntrl iswdigit iswgraph iswlower iswprint \
+iswpunct iswspace iswupper iswxdigit mbrlen mbrtowc towupper towlower \
+wcschr wcscpy wcslen wcsncmp wcsncpy wcrtomb wcwidth wmemchr wmemcmp \
+wmemcpy wmemmove wmemset; do
+     as_ac_var=`$as_echo "ac_cv_func_$zfunc" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$zfunc" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   :
 else
   zfuncs_absent="$zfuncs_absent $zfunc"
@@ -18920,12 +11051,12 @@
 
     done
     if test x"$zfuncs_absent" = x; then
-      { echo "$as_me:$LINENO: all functions found, multibyte support enabled" >&5
-echo "$as_me: all functions found, multibyte support enabled" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: all functions found, multibyte support enabled" >&5
+$as_echo "$as_me: all functions found, multibyte support enabled" >&6;}
       zsh_cv_c_unicode_support=yes
     else
-      { echo "$as_me:$LINENO: missing functions, multibyte support disabled" >&5
-echo "$as_me: missing functions, multibyte support disabled" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: missing functions, multibyte support disabled" >&5
+$as_echo "$as_me: missing functions, multibyte support disabled" >&6;}
       zsh_cv_c_unicode_support=no
     fi
 
@@ -18936,12 +11067,8 @@
 
 
 
-
-
 if test x$zsh_cv_c_unicode_support = xyes; then
-  cat >>confdefs.h <<\_ACEOF
-#define MULTIBYTE_SUPPORT 1
-_ACEOF
+  $as_echo "#define MULTIBYTE_SUPPORT 1" >>confdefs.h
 
 
                                 locale_prog='char *my_locales[] = {
@@ -18972,83 +11099,49 @@
   }
   "
 
-  { echo "$as_me:$LINENO: checking if the wcwidth() function is broken" >&5
-echo $ECHO_N "checking if the wcwidth() function is broken... $ECHO_C" >&6; }
-if test "${zsh_cv_c_broken_wcwidth+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the wcwidth() function is broken" >&5
+$as_echo_n "checking if the wcwidth() function is broken... " >&6; }
+if test "${zsh_cv_c_broken_wcwidth+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_c_broken_wcwidth=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $locale_prog
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_c_broken_wcwidth=yes
 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 )
-zsh_cv_c_broken_wcwidth=no
+  zsh_cv_c_broken_wcwidth=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_c_broken_wcwidth" >&5
-echo "${ECHO_T}$zsh_cv_c_broken_wcwidth" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_c_broken_wcwidth" >&5
+$as_echo "$zsh_cv_c_broken_wcwidth" >&6; }
   if test x$zsh_cv_c_broken_wcwidth = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define BROKEN_WCWIDTH 1
-_ACEOF
+    $as_echo "#define BROKEN_WCWIDTH 1" >>confdefs.h
 
   fi
 fi
 
 # Check whether --enable-dynamic-nss was given.
-if test "${enable_dynamic_nss+set}" = set; then
+if test "${enable_dynamic_nss+set}" = set; then :
   enableval=$enable_dynamic_nss; zsh_cv_c_dynamic_nss=$enableval
 fi
 
 
 
-
 if test x$zsh_cv_c_dynamic_nss = xno; then
-  cat >>confdefs.h <<\_ACEOF
-#define DISABLE_DYNAMIC_NSS 1
-_ACEOF
+  $as_echo "#define DISABLE_DYNAMIC_NSS 1" >>confdefs.h
 
 fi
 
 
-
 L=N
 INSTLIB="install.bin-\$(L)"
 UNINSTLIB="uninstall.bin-\$(L)"
@@ -19075,9 +11168,7 @@
   elif test "x$dynamic" = xyes; then
     hpuxdynamic=yes
     DL_EXT="${DL_EXT=sl}"
-                    cat >>confdefs.h <<\_ACEOF
-#define HPUX10DYNAMIC 1
-_ACEOF
+                    $as_echo "#define HPUX10DYNAMIC 1" >>confdefs.h
   fi
 fi
 
@@ -19085,8 +11176,6 @@
 
 
 
-
-
 if test "x$aixdynamic" = xyes; then
   DL_EXT="${DL_EXT=so}"
   DLLD="${DLLD=$CC}"
@@ -19129,19 +11218,15 @@
   MOD_IMPORT_VARIABLE="__attribute__((__dllimport__))"
   MOD_IMPORT_FUNCTION=
 elif test "x$dynamic" = xyes; then
-  { echo "$as_me:$LINENO: checking if your system uses ELF binaries" >&5
-echo $ECHO_N "checking if your system uses ELF binaries... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_elf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system uses ELF binaries" >&5
+$as_echo_n "checking if your system uses ELF binaries... " >&6; }
+if test "${zsh_cv_sys_elf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   zsh_cv_sys_elf=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Test for whether ELF binaries are produced */
 #include <fcntl.h>
@@ -19160,42 +11245,18 @@
 		exit(1); /* fail */
 }
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_elf=yes
 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 )
-zsh_cv_sys_elf=no
+  zsh_cv_sys_elf=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_elf" >&5
-echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_elf" >&5
+$as_echo "$zsh_cv_sys_elf" >&6; }
 
   # We use [0-9]* in case statements, so need to change quoting
 
@@ -19317,18 +11378,14 @@
   # Done with our shell code, so restore autotools quoting
 
 
-{ echo "$as_me:$LINENO: checking if we can use -rdynamic" >&5
-echo $ECHO_N "checking if we can use -rdynamic... $ECHO_C" >&6; }
-if test "${zsh_cv_rdynamic_available+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use -rdynamic" >&5
+$as_echo_n "checking if we can use -rdynamic... " >&6; }
+if test "${zsh_cv_rdynamic_available+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   old_LDFLAGS="$LDFLAGS"
 LDFLAGS="$LDFLAGS -rdynamic"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -19339,67 +11396,42 @@
   return 0;
 }
 _ACEOF
-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); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   zsh_cv_rdynamic_available=yes
 EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	zsh_cvs_rdynamic_available=no
+  zsh_cvs_rdynamic_available=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LDFLAGS="$old_LDFLAGS"
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_rdynamic_available" >&5
-echo "${ECHO_T}$zsh_cv_rdynamic_available" >&6; }
-  { echo "$as_me:$LINENO: checking if your dlsym() needs a leading underscore" >&5
-echo $ECHO_N "checking if your dlsym() needs a leading underscore... $ECHO_C" >&6; }
-if test "${zsh_cv_func_dlsym_needs_underscore+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_rdynamic_available" >&5
+$as_echo "$zsh_cv_rdynamic_available" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if your dlsym() needs a leading underscore" >&5
+$as_echo_n "checking if your dlsym() needs a leading underscore... " >&6; }
+if test "${zsh_cv_func_dlsym_needs_underscore+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   echo failed >conftestval && cat >conftest.c <<EOM
 fred () { }
 EOM
     { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
     { ac_try='$DLLD $LDFLAGS $DLLDFLAGS -o conftest.$DL_EXT conftest.o 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-    if test "$cross_compiling" = yes; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
+    if test "$cross_compiling" = yes; then :
   zsh_cv_func_dlsym_needs_underscore=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -19455,47 +11487,21 @@
     exit(0);
 }
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_func_dlsym_needs_underscore=`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 )
-zsh_cv_func_dlsym_needs_underscore=failed
+  zsh_cv_func_dlsym_needs_underscore=failed
     dynamic=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_func_dlsym_needs_underscore" >&5
-echo "${ECHO_T}$zsh_cv_func_dlsym_needs_underscore" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_func_dlsym_needs_underscore" >&5
+$as_echo "$zsh_cv_func_dlsym_needs_underscore" >&6; }
   if test "x$zsh_cv_func_dlsym_needs_underscore" = xyes; then
-    cat >>confdefs.h <<\_ACEOF
-#define DLSYM_NEEDS_UNDERSCORE 1
-_ACEOF
+    $as_echo "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
 
   elif test "x$zsh_cv_func_dlsym_needs_underscore" != xno; then
         unset zsh_cv_func_dlsym_needs_underscore
@@ -19503,10 +11509,10 @@
 fi
 
 if test "x$dynamic" = xyes; then
-  { echo "$as_me:$LINENO: checking if environ is available in shared libraries" >&5
-echo $ECHO_N "checking if environ is available in shared libraries... $ECHO_C" >&6; }
-if test "${zsh_cv_shared_environ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is available in shared libraries" >&5
+$as_echo_n "checking if environ is available in shared libraries... " >&6; }
+if test "${zsh_cv_shared_environ+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "$zsh_cv_func_dlsym_needs_underscore" = yes; then
     us=_
@@ -19525,38 +11531,34 @@
 ' > conftest1.c
 sed 's/zsh_getaddr1/zsh_getaddr2/' < conftest1.c > conftest2.c
 if { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    if test "$cross_compiling" = yes; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    if test "$cross_compiling" = yes; then :
   zsh_cv_shared_environ=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HPUX10DYNAMIC
@@ -19612,53 +11614,29 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_shared_environ=yes
 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 )
-zsh_cv_shared_environ=no
+  zsh_cv_shared_environ=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 else
     zsh_cv_shared_environ=no
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_shared_environ" >&5
-echo "${ECHO_T}$zsh_cv_shared_environ" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_shared_environ" >&5
+$as_echo "$zsh_cv_shared_environ" >&6; }
 
   test "$zsh_cv_shared_environ" = yes || dynamic=no
   if test "$ac_cv_func_tgetent" = yes; then
-    { echo "$as_me:$LINENO: checking if tgetent is available in shared libraries" >&5
-echo $ECHO_N "checking if tgetent is available in shared libraries... $ECHO_C" >&6; }
-if test "${zsh_cv_shared_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tgetent is available in shared libraries" >&5
+$as_echo_n "checking if tgetent is available in shared libraries... " >&6; }
+if test "${zsh_cv_shared_tgetent+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "$zsh_cv_func_dlsym_needs_underscore" = yes; then
     us=_
@@ -19677,38 +11655,34 @@
 ' > conftest1.c
 sed 's/zsh_getaddr1/zsh_getaddr2/' < conftest1.c > conftest2.c
 if { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    if test "$cross_compiling" = yes; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    if test "$cross_compiling" = yes; then :
   zsh_cv_shared_tgetent=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HPUX10DYNAMIC
@@ -19764,53 +11738,29 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_shared_tgetent=yes
 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 )
-zsh_cv_shared_tgetent=no
+  zsh_cv_shared_tgetent=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 else
     zsh_cv_shared_tgetent=no
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_shared_tgetent" >&5
-echo "${ECHO_T}$zsh_cv_shared_tgetent" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_shared_tgetent" >&5
+$as_echo "$zsh_cv_shared_tgetent" >&6; }
 
   fi
   if test "$ac_cv_func_tigetstr" = yes; then
-    { echo "$as_me:$LINENO: checking if tigetstr is available in shared libraries" >&5
-echo $ECHO_N "checking if tigetstr is available in shared libraries... $ECHO_C" >&6; }
-if test "${zsh_cv_shared_tigetstr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tigetstr is available in shared libraries" >&5
+$as_echo_n "checking if tigetstr is available in shared libraries... " >&6; }
+if test "${zsh_cv_shared_tigetstr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "$zsh_cv_func_dlsym_needs_underscore" = yes; then
     us=_
@@ -19829,38 +11779,34 @@
 ' > conftest1.c
 sed 's/zsh_getaddr1/zsh_getaddr2/' < conftest1.c > conftest2.c
 if { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    if test "$cross_compiling" = yes; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    if test "$cross_compiling" = yes; then :
   zsh_cv_shared_tigetstr=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HPUX10DYNAMIC
@@ -19916,55 +11862,31 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_shared_tigetstr=yes
 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 )
-zsh_cv_shared_tigetstr=no
+  zsh_cv_shared_tigetstr=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 else
     zsh_cv_shared_tigetstr=no
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_shared_tigetstr" >&5
-echo "${ECHO_T}$zsh_cv_shared_tigetstr" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_shared_tigetstr" >&5
+$as_echo "$zsh_cv_shared_tigetstr" >&6; }
 
   fi
 fi
 
 if test "x$dynamic" = xyes; then
-  { echo "$as_me:$LINENO: checking if name clashes in shared objects are OK" >&5
-echo $ECHO_N "checking if name clashes in shared objects are OK... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_dynamic_clash_ok+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if name clashes in shared objects are OK" >&5
+$as_echo_n "checking if name clashes in shared objects are OK... " >&6; }
+if test "${zsh_cv_sys_dynamic_clash_ok+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "$zsh_cv_func_dlsym_needs_underscore" = yes; then
     us=_
@@ -19974,38 +11896,34 @@
 echo 'int fred () { return 42; }' > conftest1.c
 echo 'int fred () { return 69; }' > conftest2.c
 if { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    if test "$cross_compiling" = yes; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    if test "$cross_compiling" = yes; then :
   zsh_cv_sys_dynamic_clash_ok=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HPUX10DYNAMIC
@@ -20051,57 +11969,31 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_dynamic_clash_ok=yes
 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 )
-zsh_cv_sys_dynamic_clash_ok=no
+  zsh_cv_sys_dynamic_clash_ok=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 else
     zsh_cv_sys_dynamic_clash_ok=no
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_dynamic_clash_ok" >&5
-echo "${ECHO_T}$zsh_cv_sys_dynamic_clash_ok" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_dynamic_clash_ok" >&5
+$as_echo "$zsh_cv_sys_dynamic_clash_ok" >&6; }
 if test "$zsh_cv_sys_dynamic_clash_ok" = yes; then
-    cat >>confdefs.h <<\_ACEOF
-#define DYNAMIC_NAME_CLASH_OK 1
-_ACEOF
+    $as_echo "#define DYNAMIC_NAME_CLASH_OK 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for working RTLD_GLOBAL" >&5
-echo $ECHO_N "checking for working RTLD_GLOBAL... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_dynamic_rtld_global+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working RTLD_GLOBAL" >&5
+$as_echo_n "checking for working RTLD_GLOBAL... " >&6; }
+if test "${zsh_cv_sys_dynamic_rtld_global+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "$zsh_cv_func_dlsym_needs_underscore" = yes; then
     us=_
@@ -20111,38 +12003,34 @@
 echo 'int fred () { return 42; }' > conftest1.c
 echo 'extern int fred(); int barney () { return fred() + 27; }' > conftest2.c
 if { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest2.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest2.$DL_EXT $LDFLAGS $DLLDFLAGS conftest2.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    if test "$cross_compiling" = yes; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    if test "$cross_compiling" = yes; then :
   zsh_cv_sys_dynamic_rtld_global=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HPUX10DYNAMIC
@@ -20186,52 +12074,28 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_dynamic_rtld_global=yes
 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 )
-zsh_cv_sys_dynamic_rtld_global=no
+  zsh_cv_sys_dynamic_rtld_global=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 else
     zsh_cv_sys_dynamic_rtld_global=no
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_dynamic_rtld_global" >&5
-echo "${ECHO_T}$zsh_cv_sys_dynamic_rtld_global" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_dynamic_rtld_global" >&5
+$as_echo "$zsh_cv_sys_dynamic_rtld_global" >&6; }
 
   RTLD_GLOBAL_OK=$zsh_cv_sys_dynamic_rtld_global
-  { echo "$as_me:$LINENO: checking whether symbols in the executable are available" >&5
-echo $ECHO_N "checking whether symbols in the executable are available... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_dynamic_execsyms+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symbols in the executable are available" >&5
+$as_echo_n "checking whether symbols in the executable are available... " >&6; }
+if test "${zsh_cv_sys_dynamic_execsyms+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "$zsh_cv_func_dlsym_needs_underscore" = yes; then
     us=_
@@ -20240,28 +12104,24 @@
 fi
 echo 'extern int fred(); int barney () { return fred() + 27; }' > conftest1.c
 if { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
     save_ldflags=$LDFLAGS
     LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   zsh_cv_sys_dynamic_execsyms=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HPUX10DYNAMIC
@@ -20305,56 +12165,32 @@
 int fred () { return 42; }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_dynamic_execsyms=yes
 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 )
-zsh_cv_sys_dynamic_execsyms=no
+  zsh_cv_sys_dynamic_execsyms=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
     LDFLAGS=$save_ldflags
 else
     zsh_cv_sys_dynamic_execsyms=no
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_dynamic_execsyms" >&5
-echo "${ECHO_T}$zsh_cv_sys_dynamic_execsyms" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_dynamic_execsyms" >&5
+$as_echo "$zsh_cv_sys_dynamic_execsyms" >&6; }
 
   if test "$zsh_cv_sys_dynamic_execsyms" != yes; then
     L=L
   fi
 
-{ echo "$as_me:$LINENO: checking whether executables can be stripped" >&5
-echo $ECHO_N "checking whether executables can be stripped... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_dynamic_strip_exe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether executables can be stripped" >&5
+$as_echo_n "checking whether executables can be stripped... " >&6; }
+if test "${zsh_cv_sys_dynamic_strip_exe+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "$zsh_cv_sys_dynamic_execsyms" != yes; then
     zsh_cv_sys_dynamic_strip_exe=yes
@@ -20366,28 +12202,24 @@
     fi
     echo 'extern int fred(); int barney() { return fred() + 27; }' > conftest1.c
     { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
     { ac_try='$DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS conftest1.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
     save_ldflags=$LDFLAGS
     LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS -s"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   zsh_cv_sys_dynamic_strip_exe=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HPUX10DYNAMIC
@@ -20431,52 +12263,28 @@
 int fred () { return 42; }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_dynamic_strip_exe=yes
 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 )
-zsh_cv_sys_dynamic_strip_exe=no
+  zsh_cv_sys_dynamic_strip_exe=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
     LDFLAGS=$save_ldflags
 else
     zsh_cv_sys_dynamic_strip_exe=no
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_dynamic_strip_exe" >&5
-echo "${ECHO_T}$zsh_cv_sys_dynamic_strip_exe" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_dynamic_strip_exe" >&5
+$as_echo "$zsh_cv_sys_dynamic_strip_exe" >&6; }
 
-  { echo "$as_me:$LINENO: checking whether libraries can be stripped" >&5
-echo $ECHO_N "checking whether libraries can be stripped... $ECHO_C" >&6; }
-if test "${zsh_cv_sys_dynamic_strip_lib+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libraries can be stripped" >&5
+$as_echo_n "checking whether libraries can be stripped... " >&6; }
+if test "${zsh_cv_sys_dynamic_strip_lib+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "$zsh_cv_func_dlsym_needs_underscore" = yes; then
     us=_
@@ -20485,26 +12293,22 @@
 fi
 echo 'int fred () { return 42; }' > conftest1.c
 if { ac_try='$CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest1.c 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } &&
 { ac_try='$DLLD -o conftest1.$DL_EXT $LDFLAGS $DLLDFLAGS -s conftest1.o $LIBS 1>&5'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    if test "$cross_compiling" = yes; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    if test "$cross_compiling" = yes; then :
   zsh_cv_sys_dynamic_strip_lib=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HPUX10DYNAMIC
@@ -20546,46 +12350,22 @@
 }
 
 _ACEOF
-rm -f 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>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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
+if ac_fn_c_try_run "$LINENO"; then :
   zsh_cv_sys_dynamic_strip_lib=yes
 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 )
-zsh_cv_sys_dynamic_strip_lib=no
+  zsh_cv_sys_dynamic_strip_lib=no
 fi
-rm -f core *.core core.conftest.* 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
 
-
 else
     zsh_cv_sys_dynamic_strip_lib=no
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $zsh_cv_sys_dynamic_strip_lib" >&5
-echo "${ECHO_T}$zsh_cv_sys_dynamic_strip_lib" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $zsh_cv_sys_dynamic_strip_lib" >&5
+$as_echo "$zsh_cv_sys_dynamic_strip_lib" >&6; }
 
   if $strip_exeldflags && test "$zsh_cv_sys_dynamic_strip_exe" = yes; then
     EXELDFLAGS="$EXELDFLAGS -s"
@@ -20604,23 +12384,17 @@
 fi
 
 
-
 if test "x$dynamic" = xyes; then
   D=D
-  cat >>confdefs.h <<\_ACEOF
-#define DYNAMIC 1
-_ACEOF
+  $as_echo "#define DYNAMIC 1" >>confdefs.h
 else
   D=N
 fi
 
 
-
 if test "x$aixdynamic" = xyes; then
   E=E
-  cat >>confdefs.h <<\_ACEOF
-#define AIXDYNAMIC 1
-_ACEOF
+  $as_echo "#define AIXDYNAMIC 1" >>confdefs.h
 else
   E=N
 fi
@@ -20751,7 +12525,6 @@
 
 
 
-
 CLEAN_MK="${srcdir}/Config/clean.mk"
 CONFIG_MK="${srcdir}/Config/config.mk"
 DEFS_MK="Config/defs.mk"
@@ -20792,12 +12565,13 @@
     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;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -20805,8 +12579,8 @@
   (set) 2>&1 |
     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 \).
+      # `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"
@@ -20829,12 +12603,12 @@
 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;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -20850,11 +12624,11 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -20863,11 +12637,13 @@
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -20877,59 +12653,79 @@
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+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
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
+fi
 
-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=:
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
@@ -20938,20 +12734,18 @@
 # 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
+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
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -20962,32 +12756,111 @@
   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; }
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  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) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
 
-# Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -21001,13 +12874,17 @@
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -21022,104 +12899,103 @@
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  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 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
-  # 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
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$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 sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# 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
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
-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
+  mkdir conf$$.dir 2>/dev/null
 fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  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 ||
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    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'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_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 ||
+$as_echo X"$as_dir" |
+    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 -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -21136,12 +13012,12 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
-	case $1 in
-        -*)set "./$1";;
+	case $1 in #(
+	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -21156,13 +13032,19 @@
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# 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.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -21175,7 +13057,16 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -21183,22 +13074,24 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -21209,27 +13102,28 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to the package provider."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.64,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -21251,34 +13145,38 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append 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; }; };;
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -21293,30 +13191,32 @@
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -21332,9 +13232,7 @@
     "config.modules") CONFIG_COMMANDS="$CONFIG_COMMANDS config.modules" ;;
     "stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;;
 
-  *) { { 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; }; };;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -21361,7 +13259,7 @@
   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
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -21372,237 +13270,174 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-# Create sed commands to just substitute file output variables.
-
-# Remaining file output variables are in a fragment that also has non-file
-# output varibles.
-
-
-
+if $AWK 'BEGIN { getline <"/dev/null" }' </dev/null 2>/dev/null; then
+  ac_cs_awk_getline=:
+  ac_cs_awk_pipe_init=
+  ac_cs_awk_read_file='
+      while ((getline aline < (F[key])) > 0)
+	print(aline)
+      close(F[key])'
+  ac_cs_awk_pipe_fini=
+else
+  ac_cs_awk_getline=false
+  ac_cs_awk_pipe_init="print \"cat <<'|#_!!_#|' &&\""
+  ac_cs_awk_read_file='
+      print "|#_!!_#|"
+      print "cat " F[key] " &&"
+      '$ac_cs_awk_pipe_init
+  # The final `:' finishes the AND list.
+  ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
+fi
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+# Create commands to substitute file output variables.
+{
+  echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
+  echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
+  echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
+  echo "_ACAWK" &&
+  echo "_ACEOF"
+} >conf$$files.sh &&
+. ./conf$$files.sh ||
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+rm -f conf$$files.sh
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 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
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-tzsh!$tzsh$ac_delim
-zshenv!$zshenv$ac_delim
-zshrc!$zshrc$ac_delim
-zprofile!$zprofile$ac_delim
-zlogin!$zlogin$ac_delim
-zlogout!$zlogout$ac_delim
-fndir!$fndir$ac_delim
-sitefndir!$sitefndir$ac_delim
-FUNCTIONS_SUBDIRS!$FUNCTIONS_SUBDIRS$ac_delim
-scriptdir!$scriptdir$ac_delim
-sitescriptdir!$sitescriptdir$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
-EXELDFLAGS!$EXELDFLAGS$ac_delim
-LIBLDFLAGS!$LIBLDFLAGS$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-U!$U$ac_delim
-ALLOCA!$ALLOCA$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-AWK!$AWK$ac_delim
-LN!$LN$ac_delim
-YODL!$YODL$ac_delim
-PDFETEX!$PDFETEX$ac_delim
-TEXI2PDF!$TEXI2PDF$ac_delim
-TEXI2HTML!$TEXI2HTML$ac_delim
-ANSI2KNR!$ANSI2KNR$ac_delim
-PCRECONF!$PCRECONF$ac_delim
-SIGNAL_H!$SIGNAL_H$ac_delim
-ERRNO_H!$ERRNO_H$ac_delim
-ZSH_CURSES_H!$ZSH_CURSES_H$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; 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; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-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
-/^[	 ]*@CLEAN_MK@[	 ]*$/{
-r $CLEAN_MK
-d
-}
-/^[	 ]*@CONFIG_MK@[	 ]*$/{
-r $CONFIG_MK
-d
-}
-/^[	 ]*@DEFS_MK@[	 ]*$/{
-r $DEFS_MK
-d
-}
-/^[	 ]*@VERSION_MK@[	 ]*$/{
-r $VERSION_MK
-d
-}
-_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
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-CURSES_KEYS_H!$CURSES_KEYS_H$ac_delim
-ZSH_TERM_H!$ZSH_TERM_H$ac_delim
-RLIMITS_INC_H!$RLIMITS_INC_H$ac_delim
-SHORTBOOTNAMES!$SHORTBOOTNAMES$ac_delim
-INSTLIB!$INSTLIB$ac_delim
-UNINSTLIB!$UNINSTLIB$ac_delim
-D!$D$ac_delim
-DL_EXT!$DL_EXT$ac_delim
-DLLD!$DLLD$ac_delim
-DLCFLAGS!$DLCFLAGS$ac_delim
-DLLDFLAGS!$DLLDFLAGS$ac_delim
-E!$E$ac_delim
-EXTRA_LDFLAGS!$EXTRA_LDFLAGS$ac_delim
-EXPOPT!$EXPOPT$ac_delim
-IMPOPT!$IMPOPT$ac_delim
-L!$L$ac_delim
-LINKMODS!$LINKMODS$ac_delim
-MOD_EXPORT!$MOD_EXPORT$ac_delim
-MOD_IMPORT_VARIABLE!$MOD_IMPORT_VARIABLE$ac_delim
-MOD_IMPORT_FUNCTION!$MOD_IMPORT_FUNCTION$ac_delim
-EXTRAZSHOBJS!$EXTRAZSHOBJS$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+  \$ac_cs_awk_pipe_init
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+  if (nfields == 3 && !substed) {
+    key = field[2]
+    if (F[key] != "" && line ~ /^[	 ]*@.*@[	 ]*$/) {
+      \$ac_cs_awk_read_file
+      next
+    }
+  }
+  print line
+}
+\$ac_cs_awk_pipe_fini
+_ACAWK
 _ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; 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
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _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
@@ -21618,20 +13453,128 @@
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # 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.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 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; }; };;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -21659,26 +13602,34 @@
 	   [\\/$]*) 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; }; };;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append 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."
+    configure_input='Generated from '`
+	  $as_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;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -21688,42 +13639,7 @@
 	 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'`
-  { 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 :; 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 ||
-echo X"$as_dir" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -21741,20 +13657,15 @@
 	    q
 	  }
 	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    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; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -21794,12 +13705,12 @@
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # 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/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -21807,36 +13718,37 @@
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $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;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   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' ;;
+  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
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -21846,123 +13758,57 @@
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
+if $ac_cs_awk_getline; then
+  $AWK -f "$tmp/subs.awk"
+else
+  $AWK -f "$tmp/subs.awk" | $SHELL
+fi >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :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=' ,'
-
-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
-
-# 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.
-# (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"'
-
-while :
-do
-  # 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"' "$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 conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; 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;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
-  rm -f "$tmp/out12"
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -21975,11 +13821,13 @@
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -21999,7 +13847,11 @@
   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; }
+  $ac_cs_success || as_fn_exit $?
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
--- zsh-4.3.10.orig/debian/zsh.doc-base
+++ zsh-4.3.10/debian/zsh.doc-base
@@ -0,0 +1,19 @@
+Document: zsh
+Title: Z Shell Manual
+Author: Z-Shell workers
+Abstract: This guide documents Zsh, a freely available UNIX command
+ interpreter (shell), which of the standard shells most closely
+ resembles the Korn shell (ksh), although it is not completely
+ compatible.
+Section: Shells
+
+Format: info
+Index: /usr/share/info/zsh.info.gz
+Files: /usr/share/info/zsh.info*
+
+Format: HTML
+Index: /usr/share/doc/zsh-doc/html/zsh_toc.html
+Files: /usr/share/doc/zsh-doc/html/*.html
+
+Format: PDF
+Files: /usr/share/doc/zsh-doc/zsh.pdf
--- zsh-4.3.10.orig/debian/rules
+++ zsh-4.3.10/debian/rules
@@ -0,0 +1,373 @@
+#!/usr/bin/make -f
+INSTALL = install
+INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
+INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+
+package=zsh
+ifeq (zsh-beta,$(package))
+snapshot_date := $(shell dpkg-parsechangelog | sed -n '/^Version: [0-9.][0-9.]*.*+20[0-9][0-9]\([0-9][0-9][0-9][0-9]\)-[0-9][0-9]*$$/ {s//\1/;p}')
+endif
+
+CFLAGS = -Wall -g
+ifeq (zsh-beta,$(package))
+CFLAGS += -W
+endif
+
+CONFIGFLAGS = --prefix=/usr --mandir=/usr/share/man --bindir=/bin LDFLAGS="-Wl,--as-needed -g"
+
+ifeq (zsh-beta,$(package))
+CONFIGFLAGS += --program-suffix=-beta
+endif
+
+CONFIGFLAGS += --infodir=/usr/share/info --enable-maildir-support
+CONFIGFLAGS += --enable-max-jobtable-size=256 --enable-etcdir=/etc/$(package)
+CONFIGFLAGS += --enable-function-subdirs
+CONFIGFLAGS += --enable-site-fndir=/usr/local/share/$(package)/site-functions
+CONFIGFLAGS += --enable-fndir=/usr/share/$(package)/functions
+CONFIGFLAGS += --with-tcsetpgrp --with-term-lib="ncursesw"
+CONFIGFLAGS += --enable-cap --enable-pcre
+CONFIGFLAGS += --enable-readnullcmd=pager
+CONFIGFLAGS += --enable-custom-patchlevel=Debian
+
+STATICFLAGS = --disable-dynamic --enable-ldflags=-static
+ifneq (zsh-beta,$(package))
+STATICFLAGS += --disable-dynamic-nss
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CONFIGFLAGS += --enable-zsh-debug --enable-zsh-mem-debug --enable-zsh-mem-warning --enable-zsh-secure-free --enable-zsh-hash-debug
+endif
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+
+ifeq (zsh-beta,$(package))
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+endif
+
+build: stamp-configure
+	$(checkdir)
+ifeq (zsh-beta,$(package))
+	touch stamp-h.in
+endif
+
+	cd obj && $(MAKE)
+
+	-cd obj && HOME="$(CURDIR)/obj/testhome" $(MAKE) check
+
+ifeq (zsh,$(package))
+	cd obj && $(MAKE) pdf
+endif
+
+	touch build
+
+build-static: stamp-configure-static
+	$(checkdir)
+	cd obj-static && $(MAKE)
+
+	touch build-static
+
+build-debug: DEB_BUILD_OPTIONS+=debug
+build-debug: build
+
+stamp-configure:
+	$(checkdir)
+ifneq (zsh-beta,$(package))
+	touch stamp-h.in configure
+else
+	chmod 755 configure
+endif
+	mkdir -p obj/testhome
+ifeq (zsh-beta,$(package))
+	test -f Config/version.mk.orig || cp Config/version.mk Config/version.mk.orig
+	sed -i -e 's/^VERSION=\([^+]*\)$$/VERSION=\1-cvs$(snapshot_date)/' Config/version.mk
+endif
+	cd obj && CFLAGS='$(CFLAGS)' ../configure $(CONFIGFLAGS)
+	touch stamp-configure
+
+stamp-configure-static:
+	$(checkdir)
+	mkdir obj-static
+	cd obj-static && CFLAGS='$(CFLAGS)' ../configure $(CONFIGFLAGS) $(STATICFLAGS)
+#	cp debian/static.conf obj-static/Src/mymods.conf
+	sed -i -e 's/files.mdd link=no/files.mdd link=static/;s/stat.mdd link=no/stat.mdd link=static/' obj-static/config.modules
+	touch stamp-configure-static
+
+clean:
+	$(checkdir)
+ifeq (zsh-beta,$(package))
+	test ! -f Config/version.mk.orig || mv Config/version.mk.orig Config/version.mk
+endif
+	-rm -f build build-static
+	if test -d obj && cd obj && test -f Makefile; then $(MAKE) distclean; fi
+	if test -d obj-static && cd obj-static && test -f Makefile; then $(MAKE) distclean; fi
+ifneq (zsh-beta,$(package))
+	test ! -f Makefile || $(MAKE) distclean
+endif
+	-rm -f `find . -name "*~"` \
+	        debian/files* core debian/*ubstvars \
+	        stamp-configure stamp-configure-static \
+		config.cache config.status config.status.lineno \
+		Doc/zsh.idx config.h.in~
+	-rm -rf debian/tmp debian/tmp-doc debian/tmp-static debian/tmp-dbg \
+	        debian/tmp-dev config.cache obj obj-static \
+		autom4te.cache
+
+binary-indep:	checkroot build
+	$(checkdir)
+	-rm -rf debian/tmp-doc
+	$(INSTALL_DIR) debian/tmp-doc
+	cd debian/tmp-doc && $(INSTALL_DIR) usr/share/doc-base \
+		usr/share/info \
+		usr/share/doc/$(package)-doc/html \
+		DEBIAN
+
+	-cd obj && $(MAKE) install.info DESTDIR=$(CURDIR)/debian/tmp-doc
+	rm -f debian/tmp-doc/usr/share/info/dir*
+	gzip -9frq debian/tmp-doc/usr/share/info/*
+	cd obj && $(MAKE) install.html DESTDIR=$(CURDIR)/debian/tmp-doc htmldir=/usr/share/doc/$(package)-doc/html
+# Work around texi2html unfriendliness
+	sed -i -e 's/<BODY.*>/<BODY LANG="EN">/' debian/tmp-doc/usr/share/doc/$(package)-doc/html/*.html
+
+ifeq (zsh,$(package))
+	$(INSTALL_FILE) obj/Doc/zsh.pdf debian/tmp-doc/usr/share/doc/$(package)-doc/
+endif
+
+	$(INSTALL_FILE) debian/copyright debian/tmp-doc/usr/share/doc/$(package)-doc/copyright
+	$(INSTALL_FILE) debian/changelog debian/tmp-doc/usr/share/doc/$(package)-doc/changelog.Debian
+	gzip -9frq debian/tmp-doc/usr/share/doc/$(package)-doc/changelog.Debian
+	$(INSTALL_FILE) debian/$(package).doc-base debian/tmp-doc/usr/share/doc-base/$(package)
+	cd debian/tmp-doc && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
+
+	dpkg-gencontrol -isp -p$(package)-doc -Pdebian/tmp-doc
+	chown -R root.root debian/tmp-doc
+	chmod -R go=rX debian/tmp-doc
+	dpkg --build debian/tmp-doc ..
+
+ifneq (zsh-beta,$(package))
+binary-arch: binary-arch-dynamic binary-arch-static binary-arch-dev
+else
+binary-arch: binary-arch-dynamic
+endif
+binary-arch-dynamic:	checkroot build
+	$(checkdir)
+
+	-rm -rf debian/tmp debian/tmp-dbg
+	$(INSTALL_DIR) debian/tmp debian/tmp-dbg/usr/lib/debug/bin debian/tmp-dbg/DEBIAN
+	cd debian/tmp && $(INSTALL_DIR) etc/$(package) \
+		bin \
+		usr/lib/$(package) \
+		usr/share/menu \
+		usr/share/man \
+		usr/share/$(package)/help \
+		usr/share/doc/$(package)/examples/Functions \
+		usr/share/doc/$(package)/examples/Misc \
+		usr/share/doc/$(package)/examples/old \
+		DEBIAN
+
+	cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/tmp
+	nroff -mandoc -Tascii Doc/zshbuiltins.1 | colcrt - | \
+	sed -e 's/±/{+|-}/' | ( cd debian/tmp/usr/share/$(package)/help && \
+	perl $(CURDIR)/Util/helpfiles )
+
+ifeq (zsh-beta,$(package))
+	sed -r -i -e \
+	's/zsh(all|builtins|compctl|compsys|compwid|contrib|expn|misc|modules|options|param|roadmap|tcpsys|zftpsys|zle|calsys)/$(package)\1/g' \
+	debian/tmp/usr/share/man/man1/*.1
+endif
+
+# functions
+	$(INSTALL_FILE) -m 644 Misc/* debian/tmp/usr/share/doc/$(package)/examples/Misc/.
+	$(INSTALL_FILE) -m 644 Functions/Example/* debian/tmp/usr/share/doc/$(package)/examples/Functions/.
+	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/$(package):;s#/usr/local/bin#/usr/bin#' \
+	   debian/tmp/usr/share/doc/$(package)/examples/Misc/*
+	$(INSTALL_FILE) StartupFiles/* debian/tmp/usr/share/doc/$(package)/examples/.
+	$(INSTALL_FILE) Util/reporter debian/tmp/usr/share/doc/$(package)/examples/.
+
+	$(INSTALL_FILE) debian/examples/ssh_completion debian/examples/ssh_completion2 debian/tmp/usr/share/doc/$(package)/examples/.
+ifneq (zsh-beta,$(package))
+	$(INSTALL_FILE) debian/examples/compctl.dpkg debian/examples/jhm.zshrc debian/tmp/usr/share/doc/$(package)/examples/old/.
+endif
+
+	cd obj && $(MAKE) install.bin DESTDIR=$(CURDIR)/debian/tmp INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
+	cd obj && $(MAKE) install.modules DESTDIR=$(CURDIR)/debian/tmp INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
+	cd obj && $(MAKE) install.fns DESTDIR=$(CURDIR)/debian/tmp
+
+	rm -r debian/tmp/usr/local
+
+# move this to a non-root section; also drop it for cross-compiles
+	awk '/^#define FPATH_DIR/ { head=$$3; gsub(/"/,"",head); }; /^#define FPATH_SUBDIRS/ { $$1=""; $$2=""; gsub(/[" ]/,""); tail=$$0; } END { printf "%s/%s\n", head, tail; };' obj/Src/zshpaths.h >obj/Src/zshpaths.temp
+	debian/tmp/bin/$(package) -fc 'setopt extendedglob; for i in debian/tmp/'`cat obj/Src/zshpaths.temp`'; do zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; chmod 644 $$i.zwc ; done'
+
+ifneq (zsh-beta,$(package))
+	mv debian/tmp/bin/zsh debian/tmp/bin/zsh4
+	rm debian/tmp/bin/zsh-4.[0-9]*
+	ln -s zsh.1.gz debian/tmp/usr/share/man/man1/zsh4.1.gz
+
+	for i in `find debian/tmp/usr/lib/zsh -type d | sed 's#^debian/tmp/##'`; \
+		do mkdir -p debian/tmp-dbg/usr/lib/debug/"$$i"; done
+
+	objcopy --only-keep-debug debian/tmp/bin/zsh4 \
+	                          debian/tmp-dbg/usr/lib/debug/bin/zsh4.dbg
+	strip --remove-section=.comment --remove-section=.note debian/tmp/bin/zsh4
+	objcopy --add-gnu-debuglink=debian/tmp-dbg/usr/lib/debug/bin/zsh4.dbg debian/tmp/bin/zsh4
+
+	for i in `find debian/tmp/usr/lib/zsh -name "*.so"`; \
+		do objcopy --only-keep-debug $$i debian/tmp-dbg/usr/lib/debug/`echo $$i | sed 's#^debian/tmp/##'`.debug; \
+		   strip --remove-section=.comment --remove-section=.note \
+		         --strip-unneeded $$i; \
+		   objcopy --add-gnu-debuglink=debian/tmp-dbg/usr/lib/debug/`echo $$i | sed 's#^debian/tmp/##'`.debug $$i; \
+		done
+else
+	rm debian/tmp/bin/zsh-beta-*
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	strip --remove-section=.comment --remove-section=.note debian/tmp/bin/zsh-beta
+	strip --remove-section=.comment --remove-section=.note \
+	      --strip-unneeded `find debian/tmp/usr/lib/zsh-beta -name "*.so"`
+endif
+endif
+
+	$(INSTALL_DIR) debian/tmp-dbg/usr/share/doc
+	ln -s zsh debian/tmp-dbg/usr/share/doc/$(package)-dbg
+
+	$(INSTALL_FILE) debian/zlogin debian/zlogout debian/zprofile debian/zshenv debian/zshrc debian/tmp/etc/$(package)/.
+	sed -i -e 's,^local HELPDIR=.*,local HELPDIR=$${HELPDIR:-/usr/share/$(package)/help},;s,:-more,:-/usr/bin/pager,;' debian/tmp/usr/share/$(package)/functions/Misc/run-help
+
+	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/$(package):;s#/usr/local/bin#/usr/bin#;' `find debian/tmp/usr/share/$(package)/functions -type f`
+	chmod 755 debian/tmp/usr/share/$(package)/functions/Misc/checkmail \
+	          debian/tmp/usr/share/$(package)/functions/Misc/harden \
+	          debian/tmp/usr/share/$(package)/functions/Misc/run-help \
+	          debian/tmp/usr/share/$(package)/functions/Misc/zkbd \
+	          debian/tmp/usr/share/$(package)/functions/Misc/zcalc \
+
+	$(INSTALL_FILE) Etc/ChangeLog* README META-FAQ Doc/zsh.texi Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ FEATURES \
+		Etc/FTP-README MACHINES NEWS Etc/TODO Etc/completion-style-guide Etc/zsh-development-guide Functions/README.zftp debian/tmp/usr/share/doc/$(package)/
+	$(INSTALL_FILE) ChangeLog debian/tmp/usr/share/doc/$(package)/changelog
+	chmod -R u+rw,go=rX debian/tmp/usr/share/doc
+	$(INSTALL_FILE) debian/copyright debian/tmp/usr/share/doc/$(package)/copyright
+
+	$(INSTALL_FILE) debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian
+ifeq (zsh-beta,$(package))
+	$(INSTALL_FILE) debian/NEWS debian/tmp/usr/share/doc/$(package)/NEWS.Debian
+endif
+
+	$(INSTALL_FILE) debian/README.Debian debian/tmp/usr/share/doc/$(package)/README.Debian
+
+	$(INSTALL_FILE) debian/menu debian/tmp/usr/share/menu/$(package)
+
+	chmod 644 `find debian/tmp/usr/share/man -type f` `find debian/tmp/usr/share/doc -type f`
+	chmod 644 `find debian/tmp/usr/lib/$(package) -type f -name "*.so"`
+	chmod 644 `find debian/tmp/usr/share/$(package) -type f -name "_*"`
+	gzip -9f `find debian/tmp/usr/share/man -type f` `find debian/tmp/usr/share/doc -type f ! -name "copyright"`
+	dpkg-shlibdeps -Tdebian/substvars -dDepends debian/tmp/bin/* -dRecommends debian/tmp/usr/lib/$(package)/*/zsh/*.so
+	dpkg-gencontrol -ldebian/changelog -isp -p$(package) -Tdebian/substvars -Pdebian/tmp
+ifneq (zsh-beta,$(package))
+	cd debian/tmp-dbg && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
+	dpkg-gencontrol -ldebian/changelog -isp -p$(package)-dbg -Tdebian/substvars -Pdebian/tmp-dbg
+endif
+
+	$(INSTALL_SCRIPT) debian/postinst debian/tmp/DEBIAN/postinst
+	$(INSTALL_SCRIPT) debian/postrm debian/tmp/DEBIAN/postrm
+	$(INSTALL_SCRIPT) debian/prerm debian/tmp/DEBIAN/prerm
+	$(INSTALL_FILE) debian/conffiles debian/tmp/DEBIAN/conffiles
+
+	cd debian/tmp && find * -type f ! -path "etc/$(package)/zlogin" ! -path "etc/$(package)/zlogout" ! -path "etc/$(package)/zprofile" ! -path "etc/$(package)/zshenv" ! -path "etc/$(package)/zshrc"  ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
+
+ifneq (zsh-beta,$(package))
+	chown -R root:root debian/tmp debian/tmp-dbg
+	chmod -R go=rX debian/tmp debian/tmp-dbg
+else
+	chown -R root:root debian/tmp
+	chmod -R go=rX debian/tmp
+endif
+
+	dpkg --build debian/tmp ..
+ifneq (zsh-beta,$(package))
+	dpkg --build debian/tmp-dbg ..
+endif
+
+define checkdir
+	test -f debian/rules
+endef
+
+binary-arch-static:	checkroot build-static
+	$(checkdir)
+
+	-rm -rf debian/tmp-static
+	$(INSTALL_DIR) debian/tmp-static/usr/share/man/man1/
+	cd debian/tmp-static && $(INSTALL_DIR) bin \
+		usr/share/doc/$(package)-static \
+		DEBIAN
+
+	$(INSTALL_SCRIPT) debian/static.prerm debian/tmp-static/DEBIAN/prerm
+	$(INSTALL_SCRIPT) debian/static.postinst debian/tmp-static/DEBIAN/postinst
+	$(INSTALL_SCRIPT) debian/static.postrm debian/tmp-static/DEBIAN/postrm
+
+	$(INSTALL_FILE) debian/changelog debian/tmp-static/usr/share/doc/$(package)-static/changelog.Debian
+
+	awk 'BEGIN { print "The following modules are statically-compiled into the static $(package) binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/tmp-static/usr/share/doc/$(package)-static/README.Debian
+
+	$(INSTALL_FILE) debian/copyright debian/tmp-static/usr/share/doc/$(package)-static/copyright
+
+	$(INSTALL_PROGRAM) obj-static/Src/zsh debian/tmp-static/bin/zsh4-static
+	strip --remove-section=.comment --remove-section=.note debian/tmp-static/bin/zsh4-static
+
+	gzip -9f debian/tmp-static/usr/share/doc/$(package)-static/changelog.Debian
+	cd debian/tmp-static && find * -type f  ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
+	ln -s $(package).1.gz debian/tmp-static/usr/share/man/man1/zsh4-static.1.gz
+
+ifneq (zsh-beta,$(package))
+	dpkg-shlibdeps -Tdebian/$(package)-static.substvars -dDepends debian/tmp-static/bin/*
+endif
+	dpkg-gencontrol -ldebian/changelog -isp -p$(package)-static -Tdebian/$(package)-static.substvars -Pdebian/tmp-static
+	chown -R root.root debian/tmp-static
+	chmod -R go=rX debian/tmp-static
+	dpkg --build debian/tmp-static ..
+
+binary-arch-dev:	checkroot build
+	$(INSTALL_DIR) debian/tmp-dev/usr/include/$(package) \
+	               debian/tmp-dev/usr/share/$(package)-dev \
+		       debian/tmp-dev/usr/share/doc/$(package)-dev \
+		       debian/tmp-dev/usr/share/aclocal \
+		       debian/tmp-dev/DEBIAN
+	$(INSTALL_FILE) obj/Src/*.epro obj/Src/sigcount.h \
+	                Src/hashtable.h Src/prototypes.h \
+			Src/signals.h Src/system.h Src/zsh.h Src/ztype.h \
+			debian/tmp-dev/usr/include/$(package)
+	$(INSTALL_FILE) Src/makepro.awk debian/tmp-dev/usr/share/$(package)-dev
+	$(INSTALL_FILE) Config/aczshoot.m4 debian/tmp-dev/usr/share/aclocal/$(package)oot.m4
+	$(INSTALL_FILE) debian/changelog debian/tmp-dev/usr/share/doc/$(package)-dev/changelog.Debian
+	$(INSTALL_FILE) debian/copyright debian/tmp-dev/usr/share/doc/$(package)-dev/
+	gzip -9f debian/tmp-dev/usr/share/doc/$(package)-dev/changelog.Debian
+
+	cd debian/tmp-dev && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
+	dpkg-gencontrol -ldebian/changelog -isp -p$(package)-dev -Tdebian/$(package)-dev.substvars -Pdebian/tmp-dev
+	chown -R root.root debian/tmp-dev
+	chmod -R go=rX debian/tmp-dev
+	dpkg --build debian/tmp-dev ..
+
+ifneq (zsh-beta,$(package))
+binary:		binary-indep binary-arch binary-arch-static binary-arch-dev
+else
+binary:		binary-indep binary-arch
+endif
+
+prebuild:
+	Util/preconfig
+	./configure
+	make -C Doc
+	make distclean
+	rm -rf autom4te.cache
+
+checkroot:
+	$(checkdir)
+	test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot binary-arch-dynamic binary-arch-static prebuild binary-arch-dev
--- zsh-4.3.10.orig/debian/postrm
+++ zsh-4.3.10/debian/postrm
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if test -x /usr/bin/update-menus ; then update-menus ; fi
+
+case "$1" in
+	(remove)
+	remove-shell /bin/zsh
+	remove-shell /usr/bin/zsh
+	;;
+esac
--- zsh-4.3.10.orig/debian/conffiles
+++ zsh-4.3.10/debian/conffiles
@@ -0,0 +1,5 @@
+/etc/zsh/zlogin
+/etc/zsh/zlogout
+/etc/zsh/zprofile
+/etc/zsh/zshenv
+/etc/zsh/zshrc
--- zsh-4.3.10.orig/debian/postinst
+++ zsh-4.3.10/debian/postinst
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+
+case "$1" in
+    (configure)
+#    if test -z "$2"; then
+	    add-shell /bin/zsh
+	    add-shell /usr/bin/zsh
+#    fi
+    ;;
+    (abort-upgrade|abort-remove|abort-deconfigure)
+	exit 0
+    ;;
+    (*)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 0
+    ;;
+esac
+
+if test -x /usr/bin/update-menus ; then update-menus ; fi
+
+update-alternatives --remove zsh /usr/bin/zsh
+update-alternatives --install /bin/zsh zsh /bin/zsh4 50 \
+		--slave /usr/bin/zsh zsh-usrbin /bin/zsh4
+update-alternatives --install /bin/rzsh rzsh /bin/zsh4 50 \
+		--slave /usr/share/man/man1/rzsh.1.gz rzsh.1.gz /usr/share/man/man1/zsh.1.gz
+update-alternatives --install /bin/ksh ksh /bin/zsh4 5 \
+                    --slave /usr/bin/ksh usr.bin.ksh /bin/zsh4 \
+                    --slave /usr/share/man/man1/ksh.1.gz ksh.1.gz /usr/share/man/man1/zsh.1.gz
+
+mkdir -m2775 -p /usr/local/share/zsh/site-functions && chown root:staff \
+               /usr/local/share/zsh/site-functions || true
+
+exit 0
--- zsh-4.3.10.orig/debian/copyright
+++ zsh-4.3.10/debian/copyright
@@ -0,0 +1,36 @@
+This is the Debian Linux prepackaged version of the Z Shell (zsh), a shell
+with lots of features.
+
+This package was put together by Robert Leslie <rob@mars.org> with sources
+obtained from:
+  ftp://ftp.math.gatech.edu/pub/zsh/
+
+Source can now be obtained from ftp://ftp.zsh.org/pub/zsh/
+
+The following copyright and license apply to this software:
+
+The Z Shell is copyright (c) 1992-2000 Paul Falstad, Richard Coleman,
+Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wischnowsky, and
+others.  All rights reserved.  Individual authors, whether or not
+specifically named, retain copyright in all changes; in what follows, they
+are referred to as `the Zsh Development Group'.  This is for convenience
+only and this body has no legal status.  The Z shell is distributed under
+the following licence; any provisions made in individual files take
+precedence.
+
+Permission is hereby granted, without written agreement and without
+licence or royalty fees, to use, copy, modify, and distribute this
+software and to distribute modified versions of this software for any
+purpose, provided that the above copyright notice and the following
+two paragraphs appear in all copies of this software.
+
+In no event shall the Zsh Development Group be liable to any party for
+direct, indirect, special, incidental, or consequential damages arising out
+of the use of this software and its documentation, even if and the Zsh
+Development Group have been advised of the possibility of such damage.
+
+The Zsh Development Group specifically disclaim any warranties, including,
+but not limited to, the implied warranties of merchantability and fitness
+for a particular purpose.  The software provided hereunder is on an "as is"
+basis, and the Zsh Development Group have no obligation to provide
+maintenance, support, updates, enhancements, or modifications.
--- zsh-4.3.10.orig/debian/watch
+++ zsh-4.3.10/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+ftp://ftp.zsh.org/pub/zsh-([\d.]+)\.tar\.gz
--- zsh-4.3.10.orig/debian/zlogout
+++ zsh-4.3.10/debian/zlogout
@@ -0,0 +1 @@
+# /etc/zsh/zlogout: system-wide .zlogout file for zsh(1).
--- zsh-4.3.10.orig/debian/README.Debian
+++ zsh-4.3.10/debian/README.Debian
@@ -0,0 +1,4 @@
+This version of zsh has been compiled with support for maildir
+folders in MAIL and MAILPATH.
+
+Clint Adams <schizo@debian.org>
--- zsh-4.3.10.orig/debian/zshrc
+++ zsh-4.3.10/debian/zshrc
@@ -0,0 +1,51 @@
+# /etc/zsh/zshrc: system-wide .zshrc file for zsh(1).
+#
+# This file is sourced only for interactive shells. It
+# should contain commands to set up aliases, functions,
+# options, key bindings, etc.
+#
+# Global Order: zshenv, zprofile, zshrc, zlogin
+
+READNULLCMD=${PAGER:-/usr/bin/pager}
+
+if [[ "$TERM" != emacs ]]; then
+[[ -z "$terminfo[kdch1]" ]] || bindkey -M emacs "$terminfo[kdch1]" delete-char
+[[ -z "$terminfo[khome]" ]] || bindkey -M emacs "$terminfo[khome]" beginning-of-line
+[[ -z "$terminfo[kend]" ]] || bindkey -M emacs "$terminfo[kend]" end-of-line
+[[ -z "$terminfo[kich1]" ]] || bindkey -M emacs "$terminfo[kich1]" overwrite-mode
+[[ -z "$terminfo[kdch1]" ]] || bindkey -M vicmd "$terminfo[kdch1]" vi-delete-char
+[[ -z "$terminfo[khome]" ]] || bindkey -M vicmd "$terminfo[khome]" vi-beginning-of-line
+[[ -z "$terminfo[kend]" ]] || bindkey -M vicmd "$terminfo[kend]" vi-end-of-line
+[[ -z "$terminfo[kich1]" ]] || bindkey -M vicmd "$terminfo[kich1]" overwrite-mode
+
+[[ -z "$terminfo[cuu1]" ]] || bindkey -M viins "$terminfo[cuu1]" vi-up-line-or-history
+[[ -z "$terminfo[cuf1]" ]] || bindkey -M viins "$terminfo[cuf1]" vi-forward-char
+[[ -z "$terminfo[kcuu1]" ]] || bindkey -M viins "$terminfo[kcuu1]" vi-up-line-or-history
+[[ -z "$terminfo[kcud1]" ]] || bindkey -M viins "$terminfo[kcud1]" vi-down-line-or-history
+[[ -z "$terminfo[kcuf1]" ]] || bindkey -M viins "$terminfo[kcuf1]" vi-forward-char
+[[ -z "$terminfo[kcub1]" ]] || bindkey -M viins "$terminfo[kcub1]" vi-backward-char
+
+# ncurses fogyatekos
+[[ "$terminfo[kcuu1]" == "O"* ]] && bindkey -M viins "${terminfo[kcuu1]/O/[}" vi-up-line-or-history
+[[ "$terminfo[kcud1]" == "O"* ]] && bindkey -M viins "${terminfo[kcud1]/O/[}" vi-down-line-or-history
+[[ "$terminfo[kcuf1]" == "O"* ]] && bindkey -M viins "${terminfo[kcuf1]/O/[}" vi-forward-char
+[[ "$terminfo[kcub1]" == "O"* ]] && bindkey -M viins "${terminfo[kcub1]/O/[}" vi-backward-char
+[[ "$terminfo[khome]" == "O"* ]] && bindkey -M viins "${terminfo[khome]/O/[}" beginning-of-line
+[[ "$terminfo[kend]" == "O"* ]] && bindkey -M viins "${terminfo[kend]/O/[}" end-of-line
+[[ "$terminfo[khome]" == "O"* ]] && bindkey -M emacs "${terminfo[khome]/O/[}" beginning-of-line
+[[ "$terminfo[kend]" == "O"* ]] && bindkey -M emacs "${terminfo[kend]/O/[}" end-of-line
+fi
+
+zstyle ':completion:*:sudo:*' command-path /usr/local/sbin /usr/local/bin \
+			     /usr/sbin /usr/bin /sbin /bin /usr/X11R6/bin
+
+unalias run-help
+autoload run-help
+
+# If you don't want compinit called here, place the line
+# skip_global_compinit=1
+# in your $ZDOTDIR/.zshenv or $ZDOTDIR/.zprofice
+if [[ -z "$skip_global_compinit" ]]; then
+  autoload -U compinit
+  compinit
+fi
--- zsh-4.3.10.orig/debian/menu
+++ zsh-4.3.10/debian/menu
@@ -0,0 +1 @@
+?package(zsh):needs="text" section="Applications/Shells"  title="Zsh" command="/bin/zsh4"
--- zsh-4.3.10.orig/debian/zlogin
+++ zsh-4.3.10/debian/zlogin
@@ -0,0 +1,9 @@
+# /etc/zsh/zlogin: system-wide .zlogin file for zsh(1).
+#
+# This file is sourced only for login shells. It
+# should contain commands that should be executed only
+# in login shells. It should be used to set the terminal
+# type and run a series of external commands (fortune,
+# msgs, from, etc.)
+#
+# Global Order: zshenv, zprofile, zshrc, zlogin
--- zsh-4.3.10.orig/debian/prerm
+++ zsh-4.3.10/debian/prerm
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+case "$1" in
+    (remove|deconfigure)
+	update-alternatives --remove zsh /bin/zsh4
+	update-alternatives --remove rzsh /bin/zsh4
+	update-alternatives --remove ksh /bin/zsh4
+        rmdir /usr/local/share/zsh/site-functions || true
+        rmdir /usr/local/share/zsh || true
+    ;;
+    (upgrade)
+    ;;
+
+    (failed-upgrade)
+    ;;
+
+    (*)
+	echo "prerm called with unknown argument \`$1'" >&2
+	exit 0
+    ;;
+esac
+
+exit 0
--- zsh-4.3.10.orig/debian/zshenv
+++ zsh-4.3.10/debian/zshenv
@@ -0,0 +1,18 @@
+# /etc/zsh/zshenv: system-wide .zshenv file for zsh(1).
+#
+# This file is sourced on all invocations of the shell.
+# If the -f flag is present or if the NO_RCS option is
+# set within this file, all other initialization files
+# are skipped.
+#
+# This file should contain commands to set the command
+# search path, plus other important environment variables.
+# This file should not contain commands that produce
+# output or assume the shell is attached to a tty.
+#
+# Global Order: zshenv, zprofile, zshrc, zlogin
+
+if [[ -z "$PATH" || "$PATH" == "/bin:/usr/bin" ]]
+then
+	export PATH="/usr/local/bin:/usr/bin:/bin:/usr/games"
+fi
--- zsh-4.3.10.orig/debian/changelog
+++ zsh-4.3.10/debian/changelog
@@ -0,0 +1,3446 @@
+zsh (4.3.10-5ubuntu3) lucid; urgency=low
+
+  * Rebuild statically linked zsh binary against recent libc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 18 Apr 2010 22:23:57 +0000
+
+zsh (4.3.10-5ubuntu2) lucid; urgency=low
+
+  * rebuild rest of main for armel armv7/thumb2 optimization;
+    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <asac@ubuntu.com>  Sun, 07 Mar 2010 01:12:08 +0100
+
+zsh (4.3.10-5ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #426837), remaining changes:
+    - debian/zshrc: Enable completions by default, unless
+      skip_global_compinit is set
+
+ -- Simon Olofsson <simon@olofsson.de>  Tue, 08 Sep 2009 17:04:03 +0200
+
+zsh (4.3.10-5) unstable; urgency=low
+
+  * Possible fix for an intermittent history segfault.  closes: #535232.
+  * Bump to Standards-Version 3.8.3.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 16 Aug 2009 19:43:33 -0400
+
+zsh (4.3.10-4) unstable; urgency=low
+
+  * Cope with the fact that GCC on Debian GNU/kFreeBSD defines __GLIBC__
+    for some nonsensical reason.  closes: #536601.
+  * Update reportbug completion.  closes: #537461.
+  * Remove zsh-doc postinst and prerm.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 01 Aug 2009 00:29:15 -0400
+
+zsh (4.3.10-3) unstable; urgency=low
+
+  * Bump to Standards-Version 3.8.2.
+  * Patch from Vincent Bernat to add completion for bts fixed/notfixed.
+    closes: #536022.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 10 Jul 2009 21:58:50 -0400
+
+zsh (4.3.10-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/zshrc: Enable completions by default, unless
+      skip_global_compinit is set
+
+ -- Muharem Hrnjadovic <muharem@ubuntu.com>  Tue, 16 Jun 2009 16:04:38 +0200
+
+zsh (4.3.10-2) unstable; urgency=medium
+
+  * Patch from Colin Watson to complete for for bzr switch.
+    closes: #531549.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 02 Jun 2009 14:51:43 -0400
+
+zsh (4.3.10-1ubuntu1) karmic; urgency=low
+
+  * Resynchronise with Debian. Remaining changes:
+    + debian/zshrc: Enable completions by default, unless
+      skip_global_compinit is set
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 02 Jun 2009 10:40:25 +0100
+
+zsh (4.3.10-1) unstable; urgency=low
+
+  * New upstream version.
+    - Patch from Kalle Olavi Niemitalo to fix git write-tree
+      and git send-pack completions.  closes: #524754.
+    - Patch from Patrick Schoenfeld to complete .t files for
+      perl.  closes: #527369.
+    - Complete apt-get purge.  closes: #525215.
+  * Remove lintian override.
+  * Remove zsh-doc postinst/prerm invocations of install-docs.
+  * Move zsh-dbg to Section 'debug'.
+  * Set custom patchlevel ($ZSH_PATCHLEVEL) to "Debian".
+
+ -- Clint Adams <schizo@debian.org>  Mon, 01 Jun 2009 14:20:05 -0400
+
+zsh (4.3.9-5) unstable; urgency=low
+
+  * Patch from Greg Klanderman to use device/inode/mtime for svn
+    completion caching.  closes: #512308.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 21 May 2009 21:25:43 -0400
+
+zsh (4.3.9-4ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    + debian/zshrc: Enable completions by default, unless
+      skip_global_compinit is set
+
+ -- Kees Cook <kees@ubuntu.com>  Sat, 28 Mar 2009 10:01:26 -0700
+
+zsh (4.3.9-4) unstable; urgency=low
+
+  * ZW#26675: add POSIX_ALIASES option.  closes: #516998.
+  * ZW#26602: fix buffer overflow in ! (history) handling.
+    closes: #521108.
+  * Bump to Standards-Version 3.8.1.
+  * ZW#26625, ZU#13593: inopportune interrupt could wreck terminal set
+    up (combined patch thanks to Vincent Lefevre).  closes: #521174.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 25 Mar 2009 23:36:43 -0400
+
+zsh (4.3.9-3) unstable; urgency=medium
+
+  * ZU#13477: fix completion of files after rm.  closes: #517448.
+  * Patch from Chris Lamb to complete custom Django management commands.
+    closes: #517672.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 01 Mar 2009 11:16:34 -0500
+
+zsh (4.3.9-2) unstable; urgency=low
+
+  * Patch from Daniel Friesel to complete .flac files for mplayer.
+    closes: #516816.
+  * Patch from Sven Joachim to complete aptitude build-dep.
+    closes: #512671.
+  * Tim Schumacher's completion for xmms2, thanks to Louis-David
+    Mitterrand.  closes: #512610.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 28 Feb 2009 14:44:32 -0500
+
+zsh (4.3.9-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #314112
+    + debian/zshrc: Enable completions by default, unless
+      skip_global_compinit is set.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Mon, 05 Jan 2009 22:27:10 +0530
+
+zsh (4.3.9-1) unstable; urgency=low
+
+  * New upstream version.
+    - Fixes completion errors when CSH_JUNKIE_QUOTES is set.  closes: #497663.
+    - Fixes some broken handling of Unicode characters in completion.
+      closes: #501851.
+  * Patch from Chris Lamb for lintian-info completion.  closes: #490383.
+  * Patch from Chris Lamb for Django 1.0 completion.  closes: #500489
+  * Patch from Ansgar Burchardt to improve bts completion.  closes: #503575.
+  * Remove --remote-sent-files from rsync completion, thanks to
+    Louis-David Mitterrand.  closes: #498780.
+  * Fix compinstall losing prior config thanks to Morita Sho.
+    closes: #501248.
+  * Merge in minor rules tweaks from zsh-beta.
+  * Patch from Ryo IGARASHI to equate 'bzr co' with 'bzr checkout'.
+    closes: #504769.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 29 Dec 2008 12:01:01 -0500
+
+zsh (4.3.6-7ubuntu1) jaunty; urgency=low
+
+  * Merge from unstable, remaining changes:
+    + debian/zshrc: Enable completions by default, unless 
+      skip_global_compinit is set (cf. LP: #16759).
+  * Dropped changes:
+    + Makefile.in: no need to disable running of autoconf if configure
+      is out of date (builds just fine anyway)
+    + debian/control: downgrade libcap2-dev: libcap2-dev is in main now,
+      so we can build with it.
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Wed, 12 Nov 2008 13:38:52 +0100
+
+zsh (4.3.6-7) unstable; urgency=medium
+
+  * Add grep-excuses completion from Chris Lamb.  closes: #494137.
+  * Apply patch from Chris Lamb for apt-show-versions completion
+    improvement.  closes: #494138.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 08 Aug 2008 15:21:25 -0400
+
+zsh (4.3.6-6) unstable; urgency=medium
+
+  * Fudge curses module check to build with libncursesw5-dev.
+  * Apply patch from Chris Lamb to add xrandr --same-as completion.
+    closes: #487626.
+  * Fix completion of gpg --recv-keys and --send-keys.  closes: #491742.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 22 Jul 2008 22:39:19 -0400
+
+zsh (4.3.6-5) unstable; urgency=medium
+
+  * ZU#13036: recognize . as a valid username character.
+    closes: #490968.
+  * Bump to Standards-Version 3.8.0.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 16 Jul 2008 18:33:18 -0400
+
+zsh (4.3.6-4ubuntu1) intrepid; urgency=low
+
+  * Merge from unstable (LP: #244373), remaining changes:
+    + Makefile.in: Disable rule which runs autoconf if configure is 
+                   out of date.
+    + debian/zshrc: Enable completions by default, unless 
+                     skip_global_compinit is set (cf. LP #16759).
+    + debian/control: Update maintainer field by Ubuntu policy.
+  * debian/control: Downgrade build-dependency against libcap2-dev
+                    to libcap-dev, since libcap2-dev is only
+                    available in universe.
+  * This version fixes the issues with the broken zshall manpage
+    w.o. further modification (LP: #243268).
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Tue, 01 Jul 2008 18:34:38 +0200
+
+zsh (4.3.6-4) unstable; urgency=medium
+
+  * Tweak configure so that dpkg-dev setting CPPFLAGS to the null string
+    doesn't break LFS.  closes: #483867.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 31 May 2008 17:42:20 -0400
+
+zsh (4.3.6-3) unstable; urgency=low
+
+  * Update locate completion to properly handle newer versions of GNU
+    findutils.  closes: #482662.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 31 May 2008 13:14:20 -0400
+
+zsh (4.3.6-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Makefile.in: Disable rule which runs autoconf;
+                   we don't want it to run during the build.
+    - debian/zshenv: Stop setting PATH, depend on new and shiny libpam-modules
+                     which sets PATH for us.
+    - debian/zshrc: Enable completions by default.
+    - Change the maintainer address.
+  * remove the patch from debian/zshenv. It does only act if $PATH is
+    empty or likely to be unconfigured. If a local administrator really
+    wants PATH to default to "/bin:/usr/bin", he can be expected to modify
+    /etc/zshenv.
+  * debian/zshrc: Enable to local user to prevent enabling completions by
+    the global /etc/zshrc by setting the variable "skip_global_compinit=1"
+    in his ~/.zshenv. Patch based on proposal by  Jay Berkenbilt. LP: #16759
+
+ -- Reinhard Tartler <siretart@tauware.de>  Wed, 21 May 2008 09:17:09 +0200
+
+zsh (4.3.6-2) unstable; urgency=medium
+
+  * Complete .spx files after ogg123, thanks to Markus Waldeck.  closes:
+    #474744.
+  * Call configure with --enable-readnullcmd=pager (for when this
+    becomes meaningful in the next upstream version, thanks to Marc Chantreux).
+  * Hardcode default readnullcmd to "pager" instead of "more".  closes:
+    #477722.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 28 Apr 2008 21:14:12 -0400
+
+zsh (4.3.6-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Unconditionally add zsh and zsh-static to /etc/shells in postinst,
+    to ensure smooth transition to lenny+1.  closes: #473652.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 02 Apr 2008 11:31:01 -0400
+
+zsh (4.3.5-8) unstable; urgency=low
+
+  * Avoid removal/readdition of shells in /etc/shells on package
+    upgrades, in order to preserve local changes.
+    closes: #473199, #473200.
+  * Switch build dependency to libcap2-dev.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 29 Mar 2008 13:15:58 -0400
+
+zsh (4.3.5-7) unstable; urgency=medium
+
+  * Complete packages for aptitude why and why-not.  closes: #472193.
+  * Make git completion cope with user configs setting colors to
+    "always".  closes: #469588.
+  * Move doc-base section to 'Shells' in accordance with doc-base 0.8.10
+    policy.
+  * Add PDF format to the doc-base control file.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 23 Mar 2008 12:06:29 -0400
+
+zsh (4.3.5-6) unstable; urgency=low
+
+  * Completion for calendar.
+  * Update git completion (bisect skip and run, copying with the
+    situation wherein git is an alias to a wrapper).
+
+ -- Clint Adams <schizo@debian.org>  Sun, 16 Mar 2008 10:46:49 -0400
+
+zsh (4.3.5-5) unstable; urgency=medium
+
+  * Fix completion of rsync -e ssh remote pathnames containing spaces.
+    closes: #468654.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 02 Mar 2008 16:55:13 -0500
+
+zsh (4.3.5-4) unstable; urgency=low
+
+  * ZW#24611: fix ${+array[...]} with empty range matches.
+    closes: #466655.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 28 Feb 2008 00:04:41 -0500
+
+zsh (4.3.5-3) unstable; urgency=medium
+
+  * ZU#12632: fix bug unexporting special parameter after
+    "SPECIAL=stuff funccall".  closes: #317773.
+  * Drop --print-gnu-build-architecture from dpkg completion.
+    closes: #466904.
+  * Patch documentation to reflect that global rc files are
+    in /etc/zsh.  closes: #466596.
+  * Add Vcs-Git and Vcs-Browser control headers.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 22 Feb 2008 10:07:10 -0500
+
+zsh (4.3.5-2) unstable; urgency=low
+
+  * Add Homepage control field.
+  * Apply patches from A Costa to fix documentation typos.
+    closes: #463613, #463614, #463615, #463616, #463617, #463619,
+    #463620, #463621, #463622.
+  * Drop debconf-related dependencies and all vestiges of the
+    debconf note.  closes: #463916.
+  * Remove conffile movement code from postinst.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 12 Feb 2008 18:28:01 -0500
+
+zsh (4.3.5-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 01 Feb 2008 11:44:10 -0500
+
+zsh (4.3.4-dev-8-1) unstable; urgency=low
+
+  * New upstream development release.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 29 Jan 2008 09:29:38 -0500
+
+zsh (4.3.4-dev-7-4) unstable; urgency=low
+
+  * Add symlink for zsh4-static man page.
+  * Reduce testsuite verbosity back to normal.
+  * Update dpkg completion.  closes: #460566.
+  * Fix sed completion for multiple input files.  closes: #461143.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 27 Jan 2008 21:55:52 -0500
+
+zsh (4.3.4-dev-7-3) unstable; urgency=low
+
+  * Remove leading spaces from Texinfo direntry, since they cause
+    dpkg's broken install-info to break.  closes: #460158.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 18 Jan 2008 18:44:04 -0500
+
+zsh (4.3.4-dev-7-2) unstable; urgency=medium
+
+  * ZW#24384: eliminate invalid pointer causing segfault when
+    trying to complete 'apt-c('.  closes: #459896.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 10 Jan 2008 11:48:26 -0500
+
+zsh (4.3.4-dev-7-1) unstable; urgency=low
+
+  * New upstream development release.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 08 Jan 2008 12:55:44 -0500
+
+zsh (4.3.4-dev-6-10) unstable; urgency=medium
+
+  * Update completion for xpdf.  closes: #458422.
+  * Update run-help to CVS version.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 04 Jan 2008 13:46:20 -0500
+
+zsh (4.3.4-dev-6-9) unstable; urgency=low
+
+  * Update completion for metaflac.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 04 Jan 2008 12:33:47 -0500
+
+zsh (4.3.4-dev-6-8) unstable; urgency=low
+
+  * Drop Debian run-help fork and modify upstream run-help at build
+    time with sed.
+  * Reduce testsuite verbosity to level 1.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 04 Jan 2008 10:46:04 -0500
+
+zsh (4.3.4-dev-6-7) unstable; urgency=low
+
+  * Tweak run-help so that it runs man on tails and not full
+    pathnames.
+  * Increase testsuite verbosity.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 30 Dec 2007 14:30:22 -0500
+
+zsh (4.3.4-dev-6-6) unstable; urgency=low
+
+  * Ignore testsuite failures.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 25 Dec 2007 16:26:57 -0500
+
+zsh (4.3.4-dev-6-5) unstable; urgency=low
+
+  * Add extra diagnostic to test harness to track down potential
+    problem with V01zmodload test on the buildds.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 25 Dec 2007 12:12:19 -0500
+
+zsh (4.3.4-dev-6-4) unstable; urgency=low
+
+  * Remove leading spaces from Texinfo direntry, since they cause
+    a "fixed" makeinfo to break.  closes: #457741, #457743.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 25 Dec 2007 10:36:07 -0500
+
+zsh (4.3.4-dev-6-3) unstable; urgency=low
+
+  * Tweak test suite so that skipped tests are not counted as failures.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 24 Dec 2007 20:40:59 -0500
+
+zsh (4.3.4-dev-6-2) unstable; urgency=low
+
+  * Move zsh-doc to section 'doc'.
+  * Set HOME to a directory guaranteed to exist while running the
+    test suite.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 24 Dec 2007 14:34:33 -0500
+
+zsh (4.3.4-dev-6-1) unstable; urgency=low
+
+  * New upstream development release.
+  * Drop version number from the function directory.  closes: #455891.
+  * Switch to ncursesw.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 20 Dec 2007 09:53:11 -0500
+
+zsh (4.3.4-dev-5-1) unstable; urgency=low
+
+  * New upstream development release.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 17 Dec 2007 14:58:14 -0500
+
+zsh (4.3.4-dev-4-2) unstable; urgency=low
+
+  * Drop module linking patch.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 15 Dec 2007 11:30:25 -0500
+
+zsh (4.3.4-dev-4-1) unstable; urgency=low
+
+  * New upstream development release.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 11 Dec 2007 10:23:17 -0500
+
+zsh (4.3.4-dev-3-3) unstable; urgency=low
+
+  * Use LDFLAGS=-Wl,--as-needed for zsh binary and modules.
+  * Bump to Standards-Version 3.7.3.
+  * Add completion for id.  closes: #454990.
+  * Add completion for members.  closes: #454994.
+  * Apply patch from Vincent Lefevre to handle "-include" in make
+    completion.  closes: #455070.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 10 Dec 2007 20:25:33 -0500
+
+zsh (4.3.4-dev-3-2) unstable; urgency=high
+
+  * Stop shipping difflog.pl in the binary package.  closes: #454073.
+    [CVE-2007-6209].
+
+ -- Clint Adams <schizo@debian.org>  Tue, 04 Dec 2007 10:17:27 -0500
+
+zsh (4.3.4-dev-3-1) unstable; urgency=medium
+
+  * New upstream development release.
+    - fixes segfault when doing
+      `export TERM=dumb; export TERM=xterm; export TERM=dumb`.
+      closes: #452915.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 26 Nov 2007 11:51:38 -0500
+
+zsh (4.3.4-dev-2-1) unstable; urgency=low
+
+  * New upstream development release.
+    - properly handles negative zero.  closes: #448732.
+    - default to POSIX symlink dereferencing behavior in chgrp
+      builtin.  closes: #439036.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 25 Nov 2007 19:46:49 -0500
+
+zsh (4.3.4-27) unstable; urgency=low
+
+  * Fix two issues with `git push` completion, thanks to Sean Finney.
+  * Fix typo in the "clint" prompt.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 22 Nov 2007 14:16:29 -0500
+
+zsh (4.3.4-26) unstable; urgency=low
+
+  * Add completion for cut, from Dr. Markus Waldeck.
+    closes: #448465.
+  * Only run $(MAKE) distclean if Makefile exists.
+  * Don't install any of the completion function files +x.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 12 Nov 2007 12:13:36 -0500
+
+zsh (4.3.4-25) unstable; urgency=low
+
+  * Add completion for dpkg-repack, from Dr. Markus Waldeck.
+    closes: #448182.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 26 Oct 2007 15:22:39 -0400
+
+zsh (4.3.4-24ubuntu1) hardy; urgency=low
+
+   * Merge from debian unstable, remaining changes:
+    - Disable rule in top-level Makefile.in which runs autoconf;
+      we don't want it to run during the build.
+    - Disable further autoconf-invoking rules in mkmakemod.sh.in.in.
+    - Stop setting PATH, depend on new and shiny libpam-modules which sets
+      PATH for us.
+    - Enable completions by default.
+    - Change the maintainer address.
+   * remove autogenerated and unneeded hunks (po, files, etc.)
+
+ -- Reinhard Tartler <siretart@tauware.de>  Thu, 25 Oct 2007 19:34:31 +0200
+
+zsh (4.3.4-24) unstable; urgency=low
+
+  * Add completion for growisofs.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 22 Oct 2007 21:26:38 -0400
+
+zsh (4.3.4-23) unstable; urgency=low
+
+  * Update git completion.
+  * Update clint prompt.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 19 Oct 2007 11:30:31 -0400
+
+zsh (4.3.4-22) unstable; urgency=medium
+
+  * Fix broken git svnimport completion.  closes: #446800.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 15 Oct 2007 15:52:56 -0400
+
+zsh (4.3.4-21) unstable; urgency=low
+
+  * Add .m4 file for aclocal in -dev package.
+  * Guard (ZSH_OOT_MODULE) struct timezone definition in Src/system.h
+    to facilitate out-of-tree module building.
+  * Update git completion.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 12 Oct 2007 09:45:15 -0400
+
+zsh (4.3.4-20) unstable; urgency=low
+
+  * Update git completion.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 04 Oct 2007 05:13:07 -0400
+
+zsh (4.3.4-19) unstable; urgency=low
+
+  * Update subversion completion.
+  * Update git completion, including git-mergetool.  closes: #444747.
+  * Add completion for dpkg-buildpackage.
+  * Add completion for svn-buildpackage.  closes: #345437.
+  * Change menu section to Applications/Shells.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 30 Sep 2007 14:20:18 -0400
+
+zsh (4.3.4-18) unstable; urgency=medium
+
+  * Fix git rm completion.  closes: #443489.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 21 Sep 2007 14:50:16 -0400
+
+zsh (4.3.4-17) unstable; urgency=low
+
+  * Update dput completion.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 15 Sep 2007 07:30:42 -0400
+
+zsh (4.3.4-16) unstable; urgency=medium
+
+  * Fix segfault with vi history search.  closes: #439425.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 13 Sep 2007 16:48:11 -0400
+
+zsh (4.3.4-15) unstable; urgency=medium
+
+  * ZW#23794: don't segfault when trying to complete after strings such
+    as "foo$".
+  * Chris Lamb's completion for lighty-{enable,disable}-mod.
+    closes: #439261.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 30 Aug 2007 18:31:25 -0400
+
+zsh (4.3.4-14ubuntu2) gutsy; urgency=low
+
+  * Trigger rebuild for hppa
+
+ -- LaMont Jones <lamont@ubuntu.com>  Thu, 04 Oct 2007 12:26:56 -0600
+
+zsh (4.3.4-14ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Disable rule in top-level Makefile.in which runs autoconf;
+      we don't want it to run during the build.
+    - Disable further autoconf-invoking rules in mkmakemod.sh.in.in.
+    - Stop setting PATH, depend on new and shiny libpam-modules which sets
+      PATH for us.
+    - Enable completions by default.
+    - Change the maintainer address.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Fri, 31 Aug 2007 12:27:14 +0300
+
+zsh (4.3.4-14) unstable; urgency=low
+
+  * Ship md5sums for zsh-dev and zsh-dbg.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 16 Aug 2007 19:44:20 -0400
+
+zsh (4.3.4-13) unstable; urgency=medium
+
+  * Complete for apt-get autoremove.  closes: #436357.
+  * Make bts show completion be exactly the same as bts bugs
+    completion.  closes: #429640.
+  * Complete for bts cache and bts cleancache.  closes: #349033.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 07 Aug 2007 10:25:45 -0400
+
+zsh (4.3.4-12) unstable; urgency=medium
+
+  * Update dvips completion to handle -G, -j, -R, -u, -U, -v, -V, -y,
+    and -z.
+  * Handle arguments to dvips -P without intervening space.
+    closes: #434879.
+  * ZW#23450: fix undefined widget causing crash in in $widgets special
+    parameter.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 29 Jul 2007 10:37:59 -0400
+
+zsh (4.3.4-11) unstable; urgency=low
+
+  * Patch from Magnus Therning to make tin completion respect TIN_HOMEDIR
+    environment variable.  closes: #433767.
+  * Patch from Vincent Lefevre to redirect apt-cache's stderr whining to
+    /dev/null in deb package completion.  closes: #432036.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 20 Jul 2007 05:42:36 -0400
+
+zsh (4.3.4-10) unstable; urgency=high
+
+  * Remove preinst (the need for conffile moves pre-dates sarge).
+  * Engage in historical revisionism and remove ancient "closes="
+    pairs from changelog.
+  * Bring accidentally-misplaced postinst back. closes: #431422.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 26 Jun 2007 12:30:40 -0400
+
+zsh (4.3.4-9) unstable; urgency=low
+
+  * Word-compile functions at build time instead of in postinst.
+    closes: #430472.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 26 Jun 2007 11:43:42 -0400
+
+zsh (4.3.4-8) unstable; urgency=low
+
+  * Complete already-controlled files after 'git add'. closes: #428793.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 14 Jun 2007 10:12:44 -0400
+
+zsh (4.3.4-7) unstable; urgency=low
+
+  * Complete filenames after 'git reset <revision>'.  closes: #428705.
+  * Fix wodim completion to not run cdrecord.  closes: #426266.
+  * Change tex build dependency to texlive-latex-base | tetex-bin.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 13 Jun 2007 12:42:59 -0400
+
+zsh (4.3.4-6) unstable; urgency=medium
+
+  * ZW#23478. Fix segfault in reverse-menu-complete.  closes: #426161.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 06 Jun 2007 12:55:43 -0400
+
+zsh (4.3.4-5ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Disable rule in top-level Makefile.in which runs autoconf;
+      we don't want it to run during the build.
+    - Disable further autoconf-invoking rules in mkmakemod.sh.in.in.
+    - Stop setting PATH, depend on new and shiny libpam-modules which sets
+      PATH for us.
+    - Enable completions by default.
+    - Change the maintainer address.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 29 May 2007 12:51:42 +0300
+
+zsh (4.3.4-5) unstable; urgency=low
+
+  * Clean up detritus from zsh-dev and zsh-dbg packages in
+    clean target.  closes: #424078.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 15 May 2007 19:22:49 -0400
+
+zsh (4.3.4-4) unstable; urgency=low
+
+  * Apply patch from Alexander Myodov to better complete sessions for
+    screen.  closes: #423897.
+  * Merge changes into Debian run-help.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 14 May 2007 15:50:00 -0400
+
+zsh (4.3.4-3ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Disable rule in top-level Makefile.in which runs autoconf;
+      we don't want it to run during the build.
+    - Disable further autoconf-invoking rules in mkmakemod.sh.in.in.
+    - Stop setting PATH, depend on new and shiny libpam-modules which sets
+      PATH for us.
+    - Enable completions by default.
+  * Change the maintainer address.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 10 May 2007 10:14:05 +0300
+
+zsh (4.3.4-3) unstable; urgency=low
+
+  * Add Italian debconf templates translation from Luca Monducci.
+    closes: #422418.
+  * Build and ship the PDF in zsh-doc.  closes: #319595.
+  * Add build dependency on texlive | tetex-bin.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 06 May 2007 16:57:40 -0400
+
+zsh (4.3.4-2) unstable; urgency=medium
+
+  * Correct semi-colon typo in add-zsh-hook.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 19 Apr 2007 15:51:43 -0400
+
+zsh (4.3.4-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 19 Apr 2007 07:29:14 -0400
+
+zsh (4.3.3-1) unstable; urgency=low
+
+  * New upstream version.
+  * Fix "too much .RE in zsh manpages".  closes: #391002.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 18 Apr 2007 17:00:27 -0400
+
+zsh (4.3.2-26) unstable; urgency=low
+
+  * Add completion for apt-cache --install.  closes: #412679.
+  * Update completion for make-kpkg.  closes: #410924.
+  * Fix completion for mpc.  closes: #405578
+  * Fix completion for darcs.  closes: #400500.
+  * Fix build system logic error for zsh-dev.  closes: #411885.
+  * Add gl.po from Jacobo Tarrio.  closes: #412197.
+  * Update completion for aptitude.  closes: #405355.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 10 Apr 2007 09:46:46 -0400
+
+zsh (4.3.2-25) unstable; urgency=medium
+
+  * ZW#23008: don't change a 126 return code to a 127 when stderr
+    is redirected.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 23 Nov 2006 21:17:31 -0500
+
+zsh (4.3.2-24) unstable; urgency=medium
+
+  * Completion for toilet.
+  * Fix acpi completion.
+  * Complete cdrecord options for wodim.
+  * Complete .xpi files for zip/unzip.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 17 Nov 2006 23:32:34 -0500
+
+zsh (4.3.2-23) unstable; urgency=low
+
+  * From R. Ramkumar: Completion for mkdir.  closes: #396486.
+  * Completion for ri.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  1 Nov 2006 19:13:47 -0500
+
+zsh (4.3.2-22) unstable; urgency=medium
+
+  * ZW#22584: Frank Terbeck's fix to complete uncompressed archives.
+    closes: #394818.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 23 Oct 2006 09:10:09 -0400
+
+zsh (4.3.2-21) unstable; urgency=high
+
+  * Remove stray .orig files from source package.  closes: #392113.
+  * Update completion for aptitude.  closes: #392338.
+  * Completion for a2ensite, a2dissite, a2enmod, a2dismod.
+    closes: #392338.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 14 Oct 2006 12:05:42 -0400
+
+zsh (4.3.2-20) unstable; urgency=low
+
+  * Complete .flv and .mp4 files for mplayer.  closes: #390714.
+  * Completion for pon and invoke-rc.d.  closes: #391001.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  7 Oct 2006 04:34:39 -0400
+
+zsh (4.3.2-19) unstable; urgency=medium
+
+  * Fix buggy gpg --encrypt-to completion.
+  * From Roger Leigh: Completion updates for dchroot and schroot,
+    and new completion for dchroot-dsa.  closes: #390574.
+  * From R. Ramkumar: Completion of bindable IP addresses for
+    bittorrent, rsync, ssh, and wget.  closes: #390109.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  3 Oct 2006 12:02:03 -0400
+
+zsh (4.3.2-18) unstable; urgency=low
+
+  * Completion for acpitool.  closes: #389795.
+  * Add https protocol to url completion.  closes: #389796.
+  * Fix typo in subversion completion.  closes: #389799.
+  * Add R. Ramkumar's generic fuse completion support.
+    closes: #389801.
+  * Cleanup for bittorrent completion.  closes: #390048.
+  * Change fusermount completion to use generic fuse
+    function.  closes: #390049.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 30 Sep 2006 17:04:54 -0400
+
+zsh (4.3.2-17) unstable; urgency=low
+
+  * Implement ulimit -e and -r (same as limit nice and
+    limit rt_priority).
+  * Change zsh-dbg dependency on zsh from Source-Version to
+    binary:Version.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 15 Sep 2006 17:14:35 -0400
+
+zsh (4.3.2-16) unstable; urgency=medium
+
+  * ZW#22715: fix broken logic for AUTO_CONTINUE.  closes: #271488.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 15 Sep 2006 14:56:52 -0400
+
+zsh (4.3.2-15) unstable; urgency=low
+
+  * Complete for 'baz switch'.  cf. #383115.
+  * Handle single-digit and two-digit octal escapes in printf
+    builtin.  closes: #386730.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 15 Aug 2006 01:05:11 -0400
+
+zsh (4.3.2-14) unstable; urgency=low
+
+  * Add completion for cssh (clusterssh).
+  * Slightly improve completion for svn propset.  closes: #377647.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 11 Jul 2006 22:38:44 -0400
+
+zsh (4.3.2-13) unstable; urgency=medium
+
+  * Complete compressed tarball filenames for GNU tar even when
+    a compression option isn't specified.  closes: #375186.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 24 Jun 2006 15:29:58 -0400
+
+zsh (4.3.2-12) unstable; urgency=medium
+
+  * Extend madison completion to rmadison.
+  * Add completion for dak.
+  * ZU#10282: completion associated sections with man page names.
+  * Fix lintian option completion.
+  * Bump to Standards-Version 3.7.2.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  9 Jun 2006 15:00:28 -0400
+
+zsh (4.3.2-11) unstable; urgency=medium
+
+  * Patch from Oliver Kiddle to update subversion completion
+    for diff and resolved subcommands.  closes: #342348, #368903.
+  * Update bzr completion from HEAD.
+  * Add completion for vserver.  closes: #365238.
+  * Remove /usr/bin/X11 from /etc/zsh/zshenv PATH.  closes: #366417.
+  * Patch from R.Ramkumar to canonicalize completion alternatives
+    for use in umount.  closes: #368404.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  2 Jun 2006 16:33:05 -0400
+
+zsh (4.3.2-10) unstable; urgency=medium
+
+  * Patch from R.Ramkumar to update valgrind completion.
+    closes: #368389.
+  * Patch from R.Ramkumar to update and fix mpc completion.
+    closes: #368390.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 25 May 2006 23:29:15 -0400
+
+zsh (4.3.2-9) unstable; urgency=medium
+
+  * Add completion for tcptraceroute, traceroute, tracepath6.
+  * ZW#22448: Don't segfault when "completing arrays".
+    closes: #367823.
+  * Unalias run-help in /etc/zsh/zshrc again.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 20 May 2006 12:57:03 -0400
+
+zsh (4.3.2-8) unstable; urgency=medium
+
+  * Patch from R.Ramkumar to complete "mpc --no-status".
+    closes: #364708
+  * Handle kfreebsd-amd64 in the build-depends.  closes: #361453.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 26 Apr 2006 00:39:04 -0400
+
+zsh (4.3.2-7) unstable; urgency=low
+
+  * More zsh-mime-handler fixes.
+  * Updated completion for surfraw from Micah Anderson.
+    closes: #364389.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 23 Apr 2006 10:27:27 -0400
+
+zsh (4.3.2-6) unstable; urgency=medium
+
+  * Add completion for analyseplugin (ladspa) from R.Ramkumar.
+    closes: #356676.
+  * Patch from R.Ramkumar to fix "zsh-mime-handler used even in
+    the case of executable files".  closes: #339635.
+  * Patch from R.Ramkumar to enable use of IP addresses and
+    multiple host files in _hosts closes: #359992.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 31 Mar 2006 09:09:31 -0500
+
+zsh (4.3.2-5) unstable; urgency=low
+
+  * Strip zsh4-static binary again; this broke in the zsh-dbg
+    transition.  closes: #360034.
+  * Version the build-dep on texi2html to >=1.76-3. closes: #344983.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 30 Mar 2006 09:22:44 -0500
+
+zsh (4.3.2-4) unstable; urgency=low
+
+  * Add zsh-dev and zsh-dbg packages.
+  * Fix the acroread completion bug introduced by the
+    incorrect fix for #355430.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 25 Mar 2006 22:22:01 -0500
+
+zsh (4.3.2-3) unstable; urgency=high
+
+  * Fix vi fix for #357313.  closes: #357934.
+  * Fix bug in acroread completion leading to screen spew.
+    closes: #355430.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 25 Mar 2006 12:05:42 -0500
+
+zsh (4.3.2-2) unstable; urgency=medium
+
+  * Add completion for nautilus.
+  * Add 'nice' and 'rt_priority' to limits.
+  * Handle multibyte-character-containing words better
+    with vi keybindings.  closes: #357313.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 17 Mar 2006 18:50:27 -0500
+
+zsh (4.3.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 12 Mar 2006 12:40:09 -0500
+
+zsh (4.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Apply patch from Micah Anderson which updates surfraw
+    completion to know about the debsec elvi.  closes: #354741.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 28 Feb 2006 13:40:37 -0500
+
+zsh (4.3.0-dev-5-2) unstable; urgency=low
+
+  * Add completion for schroot.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 26 Feb 2006 14:36:08 -0500
+
+zsh (4.3.0-dev-5-1) unstable; urgency=low
+
+  * New upstream development release.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 20 Feb 2006 11:35:39 -0500
+
+zsh (4.3.0-dev-4-3) unstable; urgency=low
+
+  * For zsh-static, don't link against anything that requires NSS.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 19 Feb 2006 14:46:32 -0500
+
+zsh (4.3.0-dev-4-2) unstable; urgency=low
+
+  * Timestamp voodoo.  closes: #353188.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 18 Feb 2006 17:16:14 -0500
+
+zsh (4.3.0-dev-4-1) unstable; urgency=medium
+
+  * New upstream development release.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 16 Feb 2006 11:05:13 -0500
+
+zsh (4.3.0-dev-3-3) unstable; urgency=low
+
+  * Update quilt completion, thanks to Adeodato Simó.
+  * Use a better method of not choking on invalid UTF-8 during
+    completion.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 11 Feb 2006 17:42:00 -0500
+
+zsh (4.3.0-dev-3-2) unstable; urgency=low
+
+  * Readd completion for ping, which had gone missing.
+    closes: #351661.
+  * Use -C arguments to make for completion.  Patch from
+    R.Ramkumar.  closes: #340065.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  9 Feb 2006 09:40:08 -0500
+
+zsh (4.3.0-dev-3-1) unstable; urgency=low
+
+  * New upstream development release.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  6 Feb 2006 20:13:06 -0500
+
+zsh (4.3.0-dev-2-4) unstable; urgency=low
+
+  * Adjust non-choking of invalid UTF-8 during completion.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 18 Jan 2006 16:26:37 -0500
+
+zsh (4.3.0-dev-2-3) unstable; urgency=medium
+
+  * Fix bad references in man pages.  closes: #348627.
+  * Fix comments in /etc/zsh/* . closes: #348368.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 17 Jan 2006 22:39:04 -0500
+
+zsh (4.3.0-dev-2-2) unstable; urgency=low
+
+  * Fix completion for last.  closes: #345583.
+  * Don't choke on invalid UTF-8 during completion.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 12 Jan 2006 20:03:25 -0500
+
+zsh (4.3.0-dev-2-1) unstable; urgency=low
+
+  * New upstream development release.
+    - Better UTF-8 support.  closes: #139771, #269719.
+  * Remove /etc/skel/.zshrc so newuser magic can work.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 27 Dec 2005 18:07:14 -0500
+
+zsh (4.2.6-2) unstable; urgency=medium
+
+  * Update ssh completion.  closes: #344708.
+  * Add surfraw completion.  closes: #342162.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 24 Dec 2005 20:07:29 -0500
+
+zsh (4.2.6-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  5 Dec 2005 11:16:25 -0500
+
+zsh (4.2.5-24) unstable; urgency=low
+
+  * Add completion for dchroot.
+  * Fixes/improvements for baz, bzr, date, ssh, subversion, gv.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 25 Nov 2005 10:30:49 -0500
+
+zsh (4.2.5-23) unstable; urgency=low
+
+  * Fix typo in dput completion.
+  * Add completions for cplay(1), dpkg-cross(1), tpkg-debarch(1L),
+    tpkg-install(1L), tpkg-install-libc(1L), tpkg-make(1L),
+    tpkg-update(1L).
+
+ -- Clint Adams <schizo@debian.org>  Mon,  7 Nov 2005 13:54:01 -0500
+
+zsh (4.2.5-22) unstable; urgency=medium
+
+  * ZW#21872: clear job table properly in subshells.
+  * Patch from R.Ramkumar to use ZDOTDIR for zcalc history file.
+    closes: #336547.
+  * Patch from R.Ramkumar to enhance zsh-mime-handler.
+    closes: #335190.
+  * Add notes to ssh host completion examples about needing
+    to set HashKnownHosts to "no".
+
+ -- Clint Adams <schizo@debian.org>  Mon, 31 Oct 2005 14:37:58 -0500
+
+zsh (4.2.5-21) unstable; urgency=low
+
+  * Update xmllint options completion.  closes: #335014.
+  * Drop dependency on passwd.  closes; #334085.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 21 Oct 2005 10:46:17 -0400
+
+zsh (4.2.5-20) unstable; urgency=medium
+
+  * Swedish debconf po translation from Daniel Nylander.
+    closes: #330620.
+  * Fix iconv(1) completion with glibc 2.3.5.
+  * Add completion for piuparts(1).
+  * Add completion for dlocate(1).
+  * Add completion for quilt(1).
+
+ -- Clint Adams <schizo@debian.org>  Thu, 29 Sep 2005 10:54:53 -0400
+
+zsh (4.2.5-19) unstable; urgency=high
+
+  * Have man(1) completion better handle uncompressed man pages
+    whose filenames contain multiple digits separated by periods.
+    closes: #311020.
+  * Add completion for bzr(1).
+  * ZW#21678: fix crash when unsetting tied parameters.
+  * ZW#21701: fix handling of negative offsets that indexed before
+    the statr of a scalar.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  8 Sep 2005 13:38:02 -0400
+
+zsh (4.2.5-18) unstable; urgency=medium
+
+  * Fix baz tree-version completion.  closes: #325898.
+  * Fix baz tree-id completion.  closes: #325900.
+  * Add completion for date(1).
+
+ -- Clint Adams <schizo@debian.org>  Wed,  7 Sep 2005 13:23:06 -0400
+
+zsh (4.2.5-17) unstable; urgency=high
+
+  * Add in urxvt completion from CVS HEAD.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 25 Aug 2005 15:48:31 -0400
+
+zsh (4.2.5-16) unstable; urgency=medium
+
+  * Fix svn completion a little.  closes: #323617, #323628.
+  * Fix accidental clobbering of the /usr/bin/zsh alternative
+    symlink.
+  * Add zsh(1) - zsh4(1) symlink.  closes: #205893.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 23 Aug 2005 14:54:27 -0400
+
+zsh (4.2.5-15) unstable; urgency=low
+
+  * Vietnamese debconf po translation from Clytie Siddall.
+    closes: #324286.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 21 Aug 2005 17:44:38 -0400
+
+zsh (4.2.5-14) unstable; urgency=medium
+
+  * ZW#21577: window resizing prompt update fix.  closes: #323137.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 15 Aug 2005 14:15:26 -0400
+
+zsh (4.2.5-13) unstable; urgency=low
+
+  * Update svn completion again, since it was broken.  closes: #322573.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 11 Aug 2005 15:48:43 -0400
+
+zsh (4.2.5-12) unstable; urgency=medium
+
+  * ZW#21567: window-resizing multi-line prompt fix.
+  * Change dependency from 'debconf' to 'debconf-2.0'.
+  * Update svn completion from 4.3.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  8 Aug 2005 21:10:37 -0400
+
+zsh (4.2.5-11) unstable; urgency=low
+
+  * Merge more fixes from 4.2 branch.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  5 Aug 2005 18:58:29 -0400
+
+zsh (4.2.5-10) unstable; urgency=medium
+
+  * Handle an equals sign after --keyring in gpg completion.
+  * Do completion for xscreensaver-command.
+  * Do completion for madison.
+  * Tweak build system since texi2html behavior has changed
+    incompatibly.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 10 Jul 2005 08:06:17 -0400
+
+zsh (4.2.5-9) unstable; urgency=medium
+
+  * ZW#21235, ZW#:21236: fix remote filename quoting in ssh completion.
+    closes: #307341.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  9 Jul 2005 13:09:02 -0400
+
+zsh (4.2.5-8) unstable; urgency=low
+
+  * Merge more fixes from 4.2 branch.
+  * Bump to Standards-Version 3.6.2.
+  * Move menu file to /usr/share/menu.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 26 Jun 2005 19:33:17 -0400
+
+zsh (4.2.5-7) unstable; urgency=high
+
+  * ZW#21195: fix handling of zero-length quoted test strings,
+    broken in 4.2.5-5.  closes: #306346.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 26 Apr 2005 18:12:49 -0400
+
+zsh (4.2.5-6) unstable; urgency=low
+
+  * ZU#8752, ZW#21184: fix IFS stripping metachar insensitivity.
+  * Improve dpkg-reconfigure completion.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 25 Apr 2005 21:40:29 -0400
+
+zsh (4.2.5-5) unstable; urgency=medium
+
+  * ZW#21170: reduce inefficiencies in ${...//.../...}.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 24 Apr 2005 10:40:01 -0400
+
+zsh (4.2.5-4) unstable; urgency=medium
+
+  * Fix baz completion breakage introduced by fix for #302354.
+  * Improve tla and baz completion to deal better with inconsistent
+    help output.
+  * Add completion for module-assistant.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 17 Apr 2005 16:26:45 -0400
+
+zsh (4.2.5-3) unstable; urgency=high
+
+  * Fix no-ops in preinst and postinst.
+  * Fix screen -x completion.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 12 Apr 2005 18:36:07 -0400
+
+zsh (4.2.5-2) unstable; urgency=medium
+
+  * Provide better completion for xpdf and zxpdf.  closes: #304198.
+  * Install /bin/ksh alternative, and conflict with versions of
+    pdksh older than 5.2.14-18.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 11 Apr 2005 14:17:40 -0400
+
+zsh (4.2.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  6 Apr 2005 09:26:17 -0400
+
+zsh (4.2.4-9) unstable; urgency=medium
+
+  * Merge fixes from 4.2 branch.
+  * Update gv completion to use gv 3.6 syntax (double-hyphen).
+    closes: #303278.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  5 Apr 2005 15:07:03 -0400
+
+zsh (4.2.4-8) unstable; urgency=medium
+
+  * Update aptitude completion with patch from Zack Cerza.
+    closes: #302225.
+  * Update baz completion to work with baz 1.3.  closes: #302354.
+  * Better completion for svn revert.  closes: #299950.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 31 Mar 2005 08:46:08 -0500
+
+zsh (4.2.4-7) unstable; urgency=medium
+
+  * Merge fixes from 4.2 branch.
+    - Fixes a completion segfault involving Meta chars.
+      closes: #301538.
+  * Drop the debconf note about the startup files having
+    having been moved in 4.0.4-50, and just move them
+    without asking.  closes: #157871.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 26 Mar 2005 13:20:01 -0500
+
+zsh (4.2.4-6) unstable; urgency=medium
+
+  * Fix module linking patch.
+  * Fix subversion completion in non-English locales.
+    closes: #291683.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 15 Mar 2005 18:58:51 -0500
+
+zsh (4.2.4-5) unstable; urgency=medium
+
+  * Brazilian Portuguese debconf po translation from Andre Luis
+    Lopes.  closes: #269970.
+  * Fix 'baz status' and 'baz diff' completion.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 10 Mar 2005 21:21:19 -0500
+
+zsh (4.2.4-4) unstable; urgency=medium
+
+  * Fix 'baz merge' completion.
+  * Bind <Insert> key to toggle overwrite mode in emacs and vi
+    command-mode bindings.  closes: #295506.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  8 Mar 2005 21:06:03 -0500
+
+zsh (4.2.4-3) unstable; urgency=medium
+
+  * ZW#20837: fix some documentation typos.
+  * Completion updates for rsync 2.6.4.
+  * ZW#20816, ZW#20811: rlimit tricks for bleeding-edge glibc.
+  * Fix for yodl completion.
+  * ZW#20801: Kris Shannon's fix for initscript completion.
+  * Fix to prevent some make completion recursion problems.
+    closes: #295511.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  2 Mar 2005 14:31:56 -0500
+
+zsh (4.2.4-2) unstable; urgency=medium
+
+  * ZW#20793: fix function-style traps.  closes: #293364.
+  * ZW#20773: getconf completion improvements.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  6 Feb 2005 19:07:41 -0500
+
+zsh (4.2.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  3 Feb 2005 10:31:46 -0500
+
+zsh (4.2.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 13 Jan 2005 14:26:03 -0500
+
+zsh (4.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 12 Jan 2005 09:23:42 -0500
+
+zsh (4.2.1-18) unstable; urgency=medium
+
+  * ZW#20409: add completion for darcs.  closes: #289630.
+  * Improve completion for ggv, and complete the same for gnome-gv.
+    closes: #289664.
+  * Partially respect LC_COLLATE setting when sorting completions.
+    closes: #289442.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 10 Jan 2005 12:08:18 -0500
+
+zsh (4.2.1-17) unstable; urgency=medium
+
+  * ZW#20418: report parse error rather than crash on unfinished
+    pipelines.  closes: #289305.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  8 Jan 2005 15:17:33 -0500
+
+zsh (4.2.1-16) unstable; urgency=medium
+
+  * Add completion for cal, ncal, and mencal.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  8 Jan 2005 00:12:00 -0500
+
+zsh (4.2.1-15) unstable; urgency=medium
+
+  * Add completion for lintian.
+  * Improve completion for bogoutil, add completion for bogofilter and
+    bogotune.
+  * Add an /etc/skel/.zshrc that enables the new completion system by
+    default.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 27 Dec 2004 12:09:04 -0500
+
+zsh (4.2.1-14) unstable; urgency=low
+
+  * Add completion for baz from Matt Zimmerman.  closes: #285745.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 15 Dec 2004 12:30:03 -0500
+
+zsh (4.2.1-13) unstable; urgency=medium
+
+  * ZW#20592, ZW#20599: Fix $((##)) breakage on alpha.
+    closes: #283358.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  3 Dec 2004 10:33:38 -0500
+
+zsh (4.2.1-12) unstable; urgency=medium
+
+  * ZW#20578: handle /dev/pts/%s ttys in elite2 prompt theme.
+    closes: #266785.
+  * Complete GSSAPIAuthentication and other "modern" ssh options.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 24 Nov 2004 00:06:41 -0500
+
+zsh (4.2.1-11) unstable; urgency=medium
+
+  * Fix typo in bogoutil completion, thanks to Michał Politowski.  closes:
+    #281790.
+  * Complete pdf files for kpdf.  closes: #281829.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 18 Nov 2004 10:13:36 -0500
+
+zsh (4.2.1-10) unstable; urgency=medium
+
+  * ZW#20539: don't produce "bad option" warning on some Makefiles.
+    closes: #279417.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  3 Nov 2004 09:43:47 -0500
+
+zsh (4.2.1-9) unstable; urgency=high
+
+  * ZW#20528: allow exec fd>>(list) to work again.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 29 Oct 2004 09:49:49 -0400
+
+zsh (4.2.1-8) unstable; urgency=medium
+
+  * Really fix make completion this time.  closes: #278487.
+  * Fix prerm to actually remove compiled functions.
+    closes: #278576.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 27 Oct 2004 23:29:37 -0400
+
+zsh (4.2.1-7) unstable; urgency=medium
+
+  * ZW#20277 (modified): even better, less broken improved make
+    completion.  closes: #278487.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 27 Oct 2004 09:43:18 -0400
+
+zsh (4.2.1-6) unstable; urgency=medium
+
+  * ZW#20325: fix segfault with 'command -v'.  closes: #276409.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 13 Oct 2004 22:13:26 -0400
+
+zsh (4.2.1-5) unstable; urgency=medium
+
+  * ZW#20391: Fix "SHLVL not being incremented beyond 2" bug.
+    closes: #274964.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  4 Oct 2004 22:46:12 -0400
+
+zsh (4.2.1-4) unstable; urgency=medium
+
+  * ZW#20269, ZW#20270: Improved make completion.  closes: #262247.
+  * ZW#20414: fix completion of diff --unified, thanks to Paul
+    Wagland.  closes: #273888.
+  * Update of _make from HEAD including ZW#20358.  closes: #271196.
+  * Modify build system to allow zsh/pcre and zsh/cap modules to
+    have "independent" library dependencies.  Build-dep on pcre,
+    and relegate module dependencies to Recommends.
+  * Fix "cidnex" doc typo.  closes: #274188.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 30 Sep 2004 11:42:14 -0400
+
+zsh (4.2.1-3) unstable; urgency=high
+
+  * Fix findstring arguments order for DEB_BUILD_OPTIONS debug check.
+    closes: #266065.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 29 Aug 2004 23:42:12 -0400
+
+zsh (4.2.1-2) unstable; urgency=medium
+
+  * Explicitly specify --with-tcsetpgrp to avoid FTBFS when not under
+    a controlling tty.  closes: #265862.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 15 Aug 2004 09:16:01 -0400
+
+zsh (4.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 13 Aug 2004 15:05:12 -0400
+
+zsh (4.2.0-18) unstable; urgency=medium
+
+  * ZW#20235: fix remote rsync file completion space quoting.
+    closes: #261775.
+  * ZW#20196: fix prompt misbehavior LINES=2.  closes: #134474.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  8 Aug 2004 00:34:33 -0400
+
+zsh (4.2.0-17) unstable; urgency=medium
+
+  * ZW#20230: complete already-installed packages more often for
+    apt-get install.  closes: #262157.
+  * ZW#20225: add Philippe Troin's expanded explanation of clone
+    command.  closes: #205685.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  2 Aug 2004 13:51:11 -0400
+
+zsh (4.2.0-16) unstable; urgency=medium
+
+  * ZW#20201: avoid double slash in prompt expansion of '%~%1(C./.) '.
+    closes: #201685.
+  * Czech debconf po translation from Miroslav Kure.  closes: #261192.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 28 Jul 2004 11:30:13 -0400
+
+zsh (4.2.0-15) unstable; urgency=high
+
+  * ZW#20173: fix memory allocation bug causing segfaults
+    in big glob expansions.  closes: #251378, #259768.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 17 Jul 2004 15:31:23 -0400
+
+zsh (4.2.0-14) unstable; urgency=medium
+
+  * ZW#20033: possibly fix ./configure completion with optional arguments.
+  * ZW#20059: prefer : to . in chown user:group completion.
+  * ZW#20069: complete encodings case-insensitively for iconv.
+  * ZW#20077: fix completion of reserved words with enable/disable.
+  * Add prebuild target to debian/rules, move yodl processing there,
+    and drop yodl build-dep.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 19 Jun 2004 12:32:46 -0400
+
+zsh (4.2.0-13) unstable; urgency=medium
+
+  * Apply additions and fixes from Jason McCarty to tla completion.
+  * Update de.po from Helge Kreutzmann.  closes: #254305.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 15 Jun 2004 16:34:15 -0400
+
+zsh (4.2.0-12) unstable; urgency=low
+
+  * Add ca.po from Aleix Badia i Bosch.  closes: #250115.
+  * Add debian/watch file.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  9 Jun 2004 14:12:23 -0400
+
+zsh (4.2.0-11) unstable; urgency=medium
+
+  * Complete .htm files as well for lynx.  closes: #251407.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 28 May 2004 10:20:57 -0400
+
+zsh (4.2.0-10) unstable; urgency=medium
+
+  * ZW#19921: fix for ZW#19920.
+  * ZW#19877: fix for ZW#19869.
+  * ZW#19878: fix for ZW#19877.
+  * ZW#19893: fix the potential for an infinite loop in history locking.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 12 May 2004 09:22:36 -0400
+
+zsh (4.2.0-9) unstable; urgency=high
+
+  * ZW#19920: fix memory allocation bug which causes builtin
+    (zsh/files module) rm -rf to OOM.  closes: #245678.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 11 May 2004 11:50:56 -0400
+
+zsh (4.2.0-8) unstable; urgency=medium
+
+  * ZW#19869: fix segfault in prompt expansion for locales
+    where am_pm is defined to null strings.  closes: #245974.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  4 May 2004 00:17:51 -0400
+
+zsh (4.2.0-7) unstable; urgency=medium
+
+  * ZW#19839: fix for _path_files.  closes: #246898.
+  * ZW#19863: allow _command_names searchpath to be overriden with zstyle.
+  * Add zstyle with default Debian sudo path to global zshrc.
+    closes: #246305.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  2 May 2004 17:20:15 -0400
+
+zsh (4.2.0-6) unstable; urgency=high
+
+  * Add apt-move completion function written by Steven Kowalik.
+    closes: #246306.
+  * ZW#19806: fix for segfault with %v expansion and negative index.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 28 Apr 2004 10:12:28 -0400
+
+zsh (4.2.0-5) unstable; urgency=low
+
+  * Have mplayer complete .m2v and .m2p, thanks to Rene Larsen.
+    closes: #244211.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 18 Apr 2004 18:12:44 -0400
+
+zsh (4.2.0-4) unstable; urgency=medium
+
+  * Use cdrecord completion from CVS HEAD.  closes: #243460.
+  * Use subversion completion from CVS HEAD.
+  * Use rsync completion from CVS HEAD.  closes: #243385.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 15 Apr 2004 06:56:31 -0400
+
+zsh (4.2.0-3) unstable; urgency=medium
+
+  * Restore McCarty/Nielsen/Weir tla completion function.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 14 Apr 2004 23:58:47 -0400
+
+zsh (4.2.0-2) unstable; urgency=medium
+
+  * Explicitly enable linking with libcap.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 13 Apr 2004 20:46:59 -0400
+
+zsh (4.2.0-1) unstable; urgency=low
+
+  * Move to 4.2 branch because it's less buggy.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 13 Apr 2004 17:00:41 -0400
+
+zsh (4.1.1-15) unstable; urgency=low
+
+  * Add da.po from Claus Hindsgaul.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  7 Apr 2004 11:56:55 -0400
+
+zsh (4.1.1-14) unstable; urgency=medium
+
+  * Fix diff completion when there is more than one --exclude on the
+    line.  closes: #239975.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 25 Mar 2004 11:59:21 -0500
+
+zsh (4.1.1-13) unstable; urgency=medium
+
+  * Add es.po from Javi Castelo.  closes: #238025.
+  * Complete cvs tags containing plus signs; patch from
+    Peter Palfrader.  closes: #238843.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 22 Mar 2004 18:45:37 -0500
+
+zsh (4.1.1-12) unstable; urgency=medium
+
+  * Merge fix from 4.2 branch for "bart" prompt theme.
+  * Merge fix from 4.2 branch for scp completion.  closes: #239070.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 22 Mar 2004 11:31:00 -0500
+
+zsh (4.1.1-11) unstable; urgency=medium
+
+  * Remove unaliasing of run-help in /etc/zsh/zshrc.  closes: #229835.
+  * Use tla completion function from Jason McCarty, Erik Toubro Nielsen,
+    and Rob Weir.  closes: #237853.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 13 Mar 2004 15:30:02 -0500
+
+zsh (4.1.1-10) unstable; urgency=medium
+
+  * Add very limited tla completion.
+  * Merge url-quote-magic from 4.2 branch.  closes: #237527.
+  * Throw in quote-and-complete-word for good measure.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 11 Mar 2004 10:51:44 -0500
+
+zsh (4.1.1-9) unstable; urgency=medium
+
+  * ZW#19566: fix associative array documentation reference,
+    thanks to Frederik Eaton.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  8 Mar 2004 12:07:24 -0500
+
+zsh (4.1.1-8) unstable; urgency=medium
+
+  * Merge adam2 prompt fixes from 4.2 branch.
+  * Merge smit completion changes from 4.2 branch.
+  * Merge cvs completion changes from 4.2 branch.
+  * Merge global completion changes from 4.2 branch.
+  * Merge look completion changes from 4.2 branch.
+  * Merge mount completion changes from 4.2 branch.
+  * Merge mysql/mysqlshow/mysqldump/mysqladmin completion
+    changes from 4.2 branch.
+  * Merge diff completion changes from 4.2 branch.
+  * Merge groups completion changes from 4.2 branch.
+  * Merge hosts completion changes from 4.2 branch.
+  * Merge services completion changes from 4.2 branch.
+  * Merge urls completion changes from 4.2 branch.
+  * Merge X utilities completion changes from 4.2 branch.
+  * Merge xv completion changes from 4.2 branch.
+  * Merge X color completion changes from 4.2 branch.
+  * Merge cd completion changes from 4.2 branch.
+  * Merge compdef completion changes from 4.2 branch.
+  * Merge mondo completion changes from 4.2 branch.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  6 Mar 2004 15:48:05 -0500
+
+zsh (4.1.1-7) unstable; urgency=medium
+
+  * Rename zcalloc() function to zshcalloc(), since zlib sometimes
+    incorrectly exposes zcalloc().
+  * Merge ssh completion changes from 4.2 branch.
+  * Merge w3m completion changes from 4.2 branch.
+  * Merge .tex file completion changes from 4.2 branch.
+  * Merge .texi file completion changes from 4.2 branch.
+  * Merge gqview completion changes from 4.2 branch.
+  * Merge mozilla/mozilla-firefox completion changes from 4.2 branch.
+  * Merge mplayer completion changes from 4.2 branch.
+  * Merge nedit completion changes from 4.2 branch.
+  * Merge xdvi completion changes from 4.2 branch.
+  * Merge xfig completion changes from 4.2 branch.
+  * Merge xloadimage completion changes from 4.2 branch.
+  * Merge autoload completion changes from 4.2 branch.
+  * Merge hash completion changes from 4.2 branch.
+  * Merge mere completion changes from 4.2 branch.
+  * Merge env/catchsegv completion changes from 4.2 branch.
+  * Merge unhash completion changes from 4.2 branch.
+  * Merge which completion changes from 4.2 branch.
+  * Merge rsync completion changes from 4.2 branch.
+  * Merge ruby completion changes from 4.2 branch.
+  * Merge slrn completion changes from 4.2 branch.
+  * ZW#19365: fix perl modules completion.
+  * Update config.guess and config.sub to 2003-10-03 and 2003-08-18,
+    respectively.
+  * ZW#19387, ZW#19309: fix glob qualifiers in many places.
+  * Merge rcs merge completion from 4.2 branch.
+  * Merge wiggle completion from 4.2 branch.
+  * Merge raggle completion from 4.2 branch.
+  * Merge rar completion changes from 4.2 branch.
+  * Merge printers completion changes from 4.2 branch.
+  * Merge acroread completion changes from 4.2 branch.
+  * Merge screen completion changes from 4.2 branch.
+  * Merge perforce completion changes from 4.2 branch.
+  * Merge pkgtool completion from 4.2 branch.
+  * Merge sablotron completion from 4.2 branch.
+  * ZW#19382: fix zmv error message
+
+ -- Clint Adams <schizo@debian.org>  Sat,  6 Mar 2004 11:53:19 -0500
+
+zsh (4.1.1-6) unstable; urgency=medium
+
+  * Merge auto-apt completion changes from 4.2 branch.
+  * Merge bug completion changes from 4.2 branch.
+  * Merge losetup completion changes from 4.2 branch.
+  * Merge arp completion changes from 4.2 branch.
+  * Merge gdb completion changes from 4.2 branch.
+  * Merge gprof completion changes from 4.2 branch.
+  * Merge java completion changes from 4.2 branch.
+  * Merge ls completion changes from 4.2 branch.
+  * Merge lynx completion changes from 4.2 branch.
+  * Merge lzop completion changes from 4.2 branch.
+  * Merge MH completion changes from 4.2 branch.
+  * Merge mt completion changes from 4.2 branch.
+  * Merge mysqldiff completion changes from 4.2 branch.
+  * Merge nice completion from 4.2 branch.
+  * Merge nmap completion from 4.2 branch.
+  * Merge pack completion changes from 4.2 branch.
+  * Merge pbm completion changes from 4.2 branch.
+  * Merge perl completion changes from 4.2 branch.
+  * Merge perldoc completion changes from 4.2 branch.
+  * Merge pine completion changes from 4.2 branch.
+  * Merge prcs completion changes from 4.2 branch.
+  * Merge printenv completion changes from 4.2 branch.
+  * Merge python completion changes from 4.2 branch.
+  * Merge sync completion from 4.2 branch.
+  * Merge sccs completion changes from 4.2 branch.
+  * Merge subversion completion from 4.2 branch.
+  * Merge telnet completion changes from 4.2 branch.
+  * Merge texinfo completion changes from 4.2 branch.
+  * Merge tiff completion changes from 4.2 branch.
+  * Merge uniq completion from 4.2 branch.
+  * Merge useradd/usermod/groupadd/groupmod completion changes
+    from 4.2 branch.
+  * Merge vorbis tools completion from 4.2 branch.
+  * Merge wget completion changes from 4.2 branch.
+  * Merge xsltproc/xmllint completion changes from 4.2 branch.
+  * Merge yodl completion changes from 4.2 branch.
+  * Merge zip completion changes from 4.2 branch.
+  * Fix du completion.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  5 Mar 2004 23:37:31 -0500
+
+zsh (4.1.1-5) unstable; urgency=medium
+
+  * Merge iptables completion from 4.2 branch.
+  * Merge modutils completion changes from 4.2 branch.
+  * Merge uml completion changes from 4.2 branch.
+  * Merge a2ps completion changes from 4.2 branch.
+  * Merge ant completion changes from 4.2 branch.
+  * Merge antiword completion changes from 4.2 branch.
+  * Merge apachectl completion changes from 4.2 branch.
+  * Merge apm completion changes from 4.2 branch.
+  * Merge arping completion changes from 4.2 branch.
+  * Merge attr completion from 4.2 branch.
+  * Merge bison completion changes from 4.2 branch.
+  * Merge bzip2 completion changes from 4.2 branch.
+  * Merge cdrecord completion from 4.2 branch.
+  * Merge chmod completion from 4.2 branch.
+  * Merge chown completion changes from 4.2 branch.
+  * Merge compress completion changes from 4.2 branch.
+  * Merge du completion from 4.2 branch.
+  * Merge dvi completion changes from 4.2 branch.
+  * Merge ecasound completion changes from 4.2 branch.
+  * Merge elinks completion changes from 4.2 branch.
+  * Merge fakeroot completion changes from 4.2 branch.
+  * Merge figlet completion changes from 4.2 branch.
+  * Merge finger completion changes from 4.2 branch.
+  * Merge flex completion changes from 4.2 branch.
+  * Merge fsh completion changes from 4.2 branch.
+  * Merge gcc completion changes from 4.2 branch.
+  * Merge getent completion from 4.2 branch.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  5 Mar 2004 19:13:14 -0500
+
+zsh (4.1.1-4) unstable; urgency=low
+
+  * Add mplayer ogg/wav completion from Chip Salzenberg.  closes: #235719.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  5 Mar 2004 15:05:11 -0500
+
+zsh (4.1.1-3) unstable; urgency=medium
+
+  * Merge gpg completion changes from 4.2 branch.  closes: #236278.
+  * Merge grep completion changes from 4.2 branch.
+  * Merge gzip completion changes from 4.2 branch.
+  * Merge imagemagick completion changes from 4.2 branch.
+  * Merge irssi completion changes from 4.2 branch.
+  * Merge ispell completion changes from 4.2 branch.
+  * Merge links completion changes from 4.2 branch.
+  * Merge gphoto2 completion from 4.2 branch.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  5 Mar 2004 12:12:26 -0500
+
+zsh (4.1.1-2) unstable; urgency=medium
+
+  * ZW#18824: kill-word-match deletes too much.  closes: #236067.
+  * Re-apply Christian Marillat's bts completion patch.
+  * Merge aptitude completion from 4.2 branch.
+  * Merge debsign completion from 4.2 branch.
+  * Merge aap completion from 4.2 branch.
+  * Merge less completion from 4.2 branch.
+  * Merge sed completion from 4.2 branch.
+  * Merge apt completion changes from 4.2 branch.
+  * Merge debchange completion changes from 4.2 branch.
+  * Merge debfoster completion changes from 4.2 branch.
+  * Merge dpkg-reconfigure completion from 4.2 branch.
+  * Merge dpkg-source completion changes from 4.2 branch.
+  * Merge dupload completion changes from 4.2 branch.
+  * Merge dput completion changes from 4.2 branch.
+  * Merge update-alternatives completion changes from 4.2 branch.
+  * Merge update-rc.d completion from 4.2 branch.
+  * As a side effect, this should fix problems when upgrading from
+    4.0.9.  closes: #235733.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  4 Mar 2004 19:35:44 -0500
+
+zsh (4.1.1-1) unstable; urgency=low
+
+  * Move to 4.1 branch now that 4.2 is in development.
+    This fixes
+    - support \u and \U in echo/print/$''; closes: #154901.
+    - cope better with unlinked wordcode digests; closes: #99687.
+    - Zsh should clean up its signals on startup; closes: #104001.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  1 Mar 2004 10:43:24 -0500
+
+zsh (4.0.9-2) unstable; urgency=medium
+
+  * Include patch from Christian Marillat to update bts tag
+    completion.  closes: #232851.
+  * Avoid unalias error in /etc/zsh/zshrc.  closes: #229835.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 19 Feb 2004 18:03:48 -0500
+
+zsh (4.0.9-1) unstable; urgency=medium
+
+  * Old upstream stable release.
+  * Include Oliver's aptitude and update-rc.d completion functions.
+    closes: #227940.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 15 Jan 2004 13:43:37 -0500
+
+zsh (4.0.8-1) unstable; urgency=low
+
+  * New upstream stable release.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 18 Dec 2003 10:02:19 -0500
+
+zsh (4.0.7-19) unstable; urgency=low
+
+  * Merge fixes from 4.0 branch.
+    - Fixes "tab completion hosed for loopback mounts".  closes: #223291.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 16 Dec 2003 20:46:33 -0500
+
+zsh (4.0.7-18) unstable; urgency=medium
+
+  * Prefer : to . in chown completion.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  6 Dec 2003 20:04:46 -0500
+
+zsh (4.0.7-17) unstable; urgency=medium
+
+  * Merge fixes from 4.0 branch.
+  * Patch from Oliver to to fix svn diff completion.  closes: #221943.
+  * Backport echoti fixes from 4.1 branch.  closes: #222509.
+  * Backport apt completion fixes from 4.1 branch.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  6 Dec 2003 12:35:36 -0500
+
+zsh (4.0.7-16) unstable; urgency=medium
+
+  * Remove rzsh alternative in prerm.  closes: #220941.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 15 Nov 2003 17:00:27 -0500
+
+zsh (4.0.7-15) unstable; urgency=medium
+
+  * Add missing parenthesis to zdump completion function.
+    closes: #220842.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 15 Nov 2003 10:36:51 -0500
+
+zsh (4.0.7-14) unstable; urgency=medium
+
+  * Merge fixes from 4.0 branch.  Thanks, Oliver.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 14 Nov 2003 15:09:59 -0500
+
+zsh (4.0.7-13) unstable; urgency=medium
+
+  * Merge fixes from 4.0 branch.
+  * Apply Oliver's _subversion fixes.  closes: #202185.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 14 Nov 2003 10:01:46 -0500
+
+zsh (4.0.7-12) unstable; urgency=medium
+
+  * Apply patch from Yasuhiro Hayase to complete normal commands
+    after screen.  closes: #213530.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 25 Oct 2003 10:18:03 -0400
+
+zsh (4.0.7-11) unstable; urgency=low
+
+  * Add nl.po from Luk Claes.  closes: #213880.
+  * Add ru.po from Ilgiz Kalmetev.  closes: #214376.
+  * Add pt.po from Bruno Rodrigues.  closes: #216199.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 22 Oct 2003 00:07:27 -0400
+
+zsh (4.0.7-10) unstable; urgency=high
+
+  * Fix zsh/terminfo module to not exit shell on unknown
+    TERM type.  closes: #207219.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 14 Sep 2003 01:10:18 -0400
+
+zsh (4.0.7-9) unstable; urgency=medium
+
+  * Merge in fixes from CVS.
+  * Add ja.po from Kenshi Muto <kmuto@debian.org>.
+  * Copy libnss_files.so.* to a temporary location and
+    chmod it 755 so ldd doesn't choke.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 13 Sep 2003 11:13:18 -0400
+
+zsh (4.0.7-8) unstable; urgency=medium
+
+  * Correct passwd dependency to >= 1:4.0.3-10.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  1 Sep 2003 16:20:08 -0400
+
+zsh (4.0.7-7) unstable; urgency=medium
+
+  * Bump to Standards-Version 3.6.1.
+  * Run dpkg-shlibdebs on /lib/libnss_files.so.* for zsh-static
+    to help avoid segfaults due to continually-changing glibc NSS ABI.
+    closes: #207218, #193325.
+  * Add dependency on passwd (>= 4.0.3-10), and use add-shell and
+    remove-shell to manage /etc/shells.  closes: #143366.
+  * Apply patch from Christian Perrier to fix up po-debconf stuff.
+    closes: #207298.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  1 Sep 2003 14:59:53 -0400
+
+zsh (4.0.7-6) unstable; urgency=medium
+
+  * Merge (Q) extra space fix from 4.0 branch.
+  * Completion for sabcmd from Oliver.  closes: #202326.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 25 Jul 2003 22:50:53 -0400
+
+zsh (4.0.7-5) unstable; urgency=low
+
+  * Don't build-dep on libcap-dev on GNU/FreeBSD.  closes: #200546.
+  * Merge additional fixes from 4.0 branch.
+  * Update config.{guess,sub}.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 13 Jul 2003 15:40:02 -0400
+
+zsh (4.0.7-4) unstable; urgency=medium
+
+  * Fix from Oliver to make subversion completion suck less.  closes: #199638.
+  * New completion function for debsign from Matt Zimmerman.  closes: #200257.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  6 Jul 2003 16:47:16 -0400
+
+zsh (4.0.7-3) unstable; urgency=low
+
+  * Bump Standards-Version to 3.5.10
+  * Apply patch from Michel Grentzinger to use new gettext format
+    for debconf templates.  closes: #198268.
+  * Use fr.po from Michel Grentzinger for debconf templates.
+    closes: #198860.
+  * Now merge debconf templates at build time.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 29 Jun 2003 11:55:31 -0400
+
+zsh (4.0.7-2) unstable; urgency=medium
+
+  * mogrify -shave and -resize completion.  closes: #197544.
+  * Update completion of reportbug and querybts to modern usage.
+    (see #198468).
+  * Rudimentary completion for svn and svnadmin.  closes: #198409.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 24 Jun 2003 23:01:22 -0400
+
+zsh (4.0.7-1) unstable; urgency=low
+
+  * New upstream stable release.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 19 Jun 2003 23:58:21 -0400
+
+zsh (4.0.6-32) unstable; urgency=medium
+
+  * Merge in more fixes from 4.0 branch.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 13 May 2003 15:40:00 -0400
+
+zsh (4.0.6-31) unstable; urgency=medium
+
+  * Apply Oliver's patches to fix floating point l10n problems.
+    closes: #164686.
+  * Apply Peter's patch to fix null array vared segfault.  closes: #187259.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 13 May 2003 09:37:26 -0400
+
+zsh (4.0.6-30) unstable; urgency=medium
+
+  * Patch echoti so that it supports args.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 25 Mar 2003 00:35:48 -0500
+
+zsh (4.0.6-29) unstable; urgency=low
+
+  * Merge in more fixes from 4.0 branch.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 22 Mar 2003 01:38:47 -0500
+
+zsh (4.0.6-28) unstable; urgency=low
+
+  * Apply Phil Troin's setpgid and suspend-exec-fix patches.  closes: #183902.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  9 Mar 2003 23:45:04 -0500
+
+zsh (4.0.6-27) unstable; urgency=low
+
+  * Revert experiments, and fix several configure test evaluations,
+    none of which should be relevant to Debian.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 26 Feb 2003 13:00:03 -0500
+
+zsh (4.0.6-26) unstable; urgency=low
+
+  * Re-apply Oliver's tar completion patch.  closes: #182416.
+  * Experiment a little with configure tests to get more information
+    on why sbuild hangs for me on sparc.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 25 Feb 2003 12:04:16 -0500
+
+zsh (4.0.6-25) unstable; urgency=low
+
+  * Merge more fixes from CVS.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 24 Feb 2003 21:18:50 -0500
+
+zsh (4.0.6-24) unstable; urgency=low
+
+  * Generate md5sums for zsh-doc.  closes: #182252.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 23 Feb 2003 22:46:53 -0500
+
+zsh (4.0.6-23) unstable; urgency=low
+
+  * Fix rss in ulimit output.  closes: #180306.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 11 Feb 2003 12:39:49 -0500
+
+zsh (4.0.6-22) unstable; urgency=low
+
+  * Add maxfilelocks to ulimit output.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  8 Feb 2003 20:07:55 -0500
+
+zsh (4.0.6-21) unstable; urgency=low
+
+  * Another CVS sync, pulling in completion for elinks and tidy, and
+    bashcompinit.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  6 Feb 2003 11:24:07 -0500
+
+zsh (4.0.6-20) unstable; urgency=low
+
+  * Add rzsh alternative.  closes: #178252.
+  * Update to Standards-Version 3.5.8.
+  * Remove periods from short descriptions.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 24 Jan 2003 22:27:20 -0500
+
+zsh (4.0.6-19) unstable; urgency=low
+
+  * Completion for lsof, mt, xsltproc, and other fixes.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 19 Jan 2003 12:45:45 -0500
+
+zsh (4.0.6-18) unstable; urgency=low
+
+  * Fold debian/rules check target into build target to avoid fakeroot.
+  * Merge lots of fixes completion improvements from 4.0 branch.
+  * Don't install zsh-${version} hardlink anymore.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 26 Nov 2002 03:55:25 -0500
+
+zsh (4.0.6-17) unstable; urgency=low
+
+  * Patch for tar completion from Oliver Kiddle.  closes: #170654.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 26 Nov 2002 00:58:15 -0500
+
+zsh (4.0.6-16) unstable; urgency=low
+
+  * Beautify indentation in whence, which, &c.  closes: #163190.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 13 Nov 2002 16:11:45 -0500
+
+zsh (4.0.6-15) unstable; urgency=low
+
+  * Remove /usr/doc detritus from zsh-doc and zsh-static postinsts and
+    prerms.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 26 Oct 2002 14:33:12 -0400
+
+zsh (4.0.6-14) unstable; urgency=low
+
+  * Run make check in binary-arch target.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 26 Oct 2002 02:23:09 -0400
+
+zsh (4.0.6-13) unstable; urgency=medium
+
+  * Apply Stephen Rueger's fix to the apt-cache showsrc patch in #129428.
+    closes: #165346.
+  * Replace xli completion with Oliver's fix.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 18 Oct 2002 14:36:14 -0400
+
+zsh (4.0.6-12) unstable; urgency=low
+
+  * Remove extraneous 's' in compinit message.  closes: #164788.
+  * Remove completion for xli since it doesn't match.  closes: #164302.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 15 Oct 2002 01:22:49 -0400
+
+zsh (4.0.6-11) unstable; urgency=medium
+
+  * Apply Martin Waitz's patch for memory leak in privasserted().
+    closes: #164207.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 10 Oct 2002 21:12:00 -0400
+
+zsh (4.0.6-10) unstable; urgency=low
+
+  * Merge in additional fixes from upstream 4.0 branch.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  4 Oct 2002 20:59:04 -0400
+
+zsh (4.0.6-9) unstable; urgency=low
+
+  * Add missing apt-get options to completion.  closes: #163247.
+  * Handle doogie's case foo in (foo)echo foo;;(bar)echo bar;;esac
+    (no space between right paren and LIST) when in sh emulation mode.
+    closes: #163237.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  4 Oct 2002 17:14:57 -0400
+
+zsh (4.0.6-8) unstable; urgency=medium
+
+  * ZW#17252: fix unzip/_path_files interaction.  Also fixes broken xli
+    completion.  closes: bug#160836, bug#161065.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 16 Sep 2002 12:20:10 -0400
+
+zsh (4.0.6-7) unstable; urgency=low
+
+  * Fix CVS completion with respect to filenames containing spaces.
+  Deja vu.  closes: bug#160375.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 10 Sep 2002 14:25:14 -0400
+
+zsh (4.0.6-6) unstable; urgency=medium
+
+  * Patch from Jürgen A. Erhard to fix ssh-keygen completion.
+  closes: bug#156404.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  6 Sep 2002 02:27:36 -0400
+
+zsh (4.0.6-5) unstable; urgency=medium
+
+  * Fix CFLAGS for static build.
+  * Install more example functions.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  4 Sep 2002 17:46:45 -0400
+
+zsh (4.0.6-4) unstable; urgency=low
+
+  * Add missing lynx options.  closes: bug#158853.
+  * Add Oliver's lynx patch from 4.1.
+  * debian/rules cleanup
+
+ -- Clint Adams <schizo@debian.org>  Wed,  4 Sep 2002 15:14:31 -0400
+
+zsh (4.0.6-3) unstable; urgency=low
+
+  * Fix typo in the 'clint' prompt theme.
+  * Update to Standards-Version 3.5.7.0.
+  * Support 'noopt'
+
+ -- Clint Adams <schizo@debian.org>  Fri, 16 Aug 2002 21:39:04 -0400
+
+zsh (4.0.6-2) unstable; urgency=low
+
+  * Bandage the terminfo "fix" causing segfault on startup.
+  closes: bug#156840, bug#156842.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 15 Aug 2002 17:47:52 -0400
+
+zsh (4.0.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 14 Aug 2002 13:33:34 -0400
+
+zsh (4.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  9 Aug 2002 15:28:23 -0400
+
+zsh (4.0.4-53) unstable; urgency=low
+
+  * Complete .xhtml files for lynx.  closes: bug#155357.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  6 Aug 2002 20:15:35 -0400
+
+zsh (4.0.4-52) unstable; urgency=low
+
+  * Complete local filenames after file:/// and file://localhost/ .
+  closes: bug#155360.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  6 Aug 2002 17:24:15 -0400
+
+zsh (4.0.4-51) unstable; urgency=medium
+
+  * Fix cvs completion thinko from -45.
+  * Remove umask setting from global startup.  closes: bug#154809.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 30 Jul 2002 13:38:51 -0400
+
+zsh (4.0.4-50) unstable; urgency=low
+
+  * Move startup scripts to /etc/zsh/.  closes: bug#154555.
+  * Don't add /usr/doc/zsh symlink anymore.
+  * Add debconf message about rc move, and dependency on debconf.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 28 Jul 2002 17:30:27 -0400
+
+zsh (4.0.4-49) unstable; urgency=low
+
+  * Patch from Christian Marillat to complete more tags for bts(1).
+  closes: bug#154145.
+  * Fix documentation typo.  closes: bug#154126.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 24 Jul 2002 11:48:27 -0400
+
+zsh (4.0.4-48) unstable; urgency=medium
+
+  * Rearrange and improve examples.  closes: bug#153939.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 22 Jul 2002 21:48:33 -0400
+
+zsh (4.0.4-47) unstable; urgency=low
+
+  * Add completion for GNU GLOBAL, courtesy of Matt Zimmeran.
+  closes: bug#153919.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 22 Jul 2002 17:32:58 -0400
+
+zsh (4.0.4-46) unstable; urgency=medium
+
+  * ZW#17459: Properly exclude files which have RCS kflags from cvs
+  add completion.  closes: bug#152795.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 22 Jul 2002 10:39:24 -0400
+
+zsh (4.0.4-45) unstable; urgency=low
+
+  * Refix #138688 and #147102, which accidentally slipped out.
+  closes: bug#152318.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  8 Jul 2002 18:53:30 -0400
+
+zsh (4.0.4-44) unstable; urgency=low
+
+  * Complete files after dpkg -S for Joy.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  1 Jul 2002 12:13:32 -0400
+
+zsh (4.0.4-43) unstable; urgency=medium
+
+  * Merge additional parsing fixes from 4.0 branch CVS.
+  * Also, replace Colin Walters's prompt theme, which had gone AWOL.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 15 Jun 2002 13:30:42 -0400
+
+zsh (4.0.4-42) unstable; urgency=low
+
+  * Merge additional fixes and completion features from 4.0 branch CVS.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 31 May 2002 22:39:37 -0400
+
+zsh (4.0.4-41) unstable; urgency=low
+
+  * Merge additional fixes from 4.0 branch CVS.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 31 May 2002 16:33:22 -0400
+
+zsh (4.0.4-40) unstable; urgency=low
+
+  * Check output of manpath even when $manpath is set.  closes: bug#148557.
+  * ZW#16269: Don't segfault when trying to complete ^ when GLOB_COMPLETE
+  and EXTENDED_GLOB are set.  closes: bug#148607.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 31 May 2002 01:00:52 -0400
+
+zsh (4.0.4-39) unstable; urgency=low
+
+  * ZW#16776: Don't segfault for certain repeated completions.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 28 May 2002 21:20:15 -0400
+
+zsh (4.0.4-38) unstable; urgency=low
+
+  * Option descriptions in make-kpkg completion.
+  * Do not complete udebs for dpkg -i or --unpack.  closes: bug#148372.
+  * Make helpfiles build again.  closes: bug#148378.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 28 May 2002 10:12:20 -0400
+
+zsh (4.0.4-37) unstable; urgency=low
+
+  * Don't choke when all the matching nonentried CVS files also match
+    ~/.cvsignore when user is trying to complete a cvs add.  closes:
+    bug#148217.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 26 May 2002 15:23:12 -0400
+
+zsh (4.0.4-36) unstable; urgency=low
+
+  * Respect $CVSIGNORE.  closes: bug#147853.
+  * Complete files other than *.pl and *.pm for perl.  closes: bug#148159.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 25 May 2002 14:10:25 -0400
+
+zsh (4.0.4-35) unstable; urgency=low
+
+  * Fix CVS completion with respect to filenames containing spaces.
+  closes: bug#147102.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 21 May 2002 10:28:54 -0400
+
+zsh (4.0.4-34) unstable; urgency=medium
+
+  * Fixed typo in _spamassassin.  closes: bug#144915.
+  * Build modules on the Hurd after the ABI change.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 29 Apr 2002 16:46:08 -0400
+
+zsh (4.0.4-33) unstable; urgency=high
+
+  * Avoid dangling alternative on upgrade from potato.  closes: bug#144709.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 27 Apr 2002 10:34:25 -0400
+
+zsh (4.0.4-32) unstable; urgency=medium
+
+  * Complete all files for w3m.  closes: bug#143885.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 25 Apr 2002 11:19:33 -0400
+
+zsh (4.0.4-31) unstable; urgency=medium
+
+  * ZW#16201 to fix Vincent Lefevre's named directory disappearance problem.
+    closes: bug#140726.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 13 Apr 2002 15:29:42 -0400
+
+zsh (4.0.4-30) unstable; urgency=medium
+
+  * Bring /usr/bin/zsh under alternatives.  closes: bug#140870.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 12 Apr 2002 21:56:04 -0400
+
+zsh (4.0.4-29) unstable; urgency=medium
+
+  * Complete for aaaa, ns, mx, txt, zone.  closes: bug#141870.
+  * Complete package name argument for apt-cache policy.  closes: bug#141820.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 12 Apr 2002 19:25:30 -0400
+
+zsh (4.0.4-28) unstable; urgency=low
+
+  * Patch from Hugo Haas to complete ssh -1 as well as ssh -2.
+  closes: bug#140408.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  4 Apr 2002 07:50:12 -0500
+
+zsh (4.0.4-27) unstable; urgency=medium
+
+  * Fix rsync completion so that it completes remote files via
+  rsync and ssh, and all rsync 2.5.2 options.  closes: bug#138690.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 17 Mar 2002 14:04:03 -0500
+
+zsh (4.0.4-26) unstable; urgency=low
+
+  * Complete .dvi.gz and .dvi.bz2 for xdvi.  closes: bug#138687.
+  * Complete multiple -j's after cvs update.  closes: bug#138688.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 17 Mar 2002 00:04:47 -0500
+
+zsh (4.0.4-25) unstable; urgency=medium
+
+  * Update issues in BUGS and TODO.
+  * Add Matt Zimmeran's netcat completion function.  closes: bug#137563.
+  * Fix completion for nedit-nc.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  9 Mar 2002 21:58:09 -0500
+
+zsh (4.0.4-24) unstable; urgency=low
+
+  * Move zsh binary to /bin so it can more safely be used as
+  /bin/sh or root's shell.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  7 Mar 2002 20:08:22 -0500
+
+zsh (4.0.4-23) unstable; urgency=low
+
+  * Completion for irssi, thanks to Istvan Sebestyen.  closes: bug#136682.
+  * ZW#16635: display lists in singlelinezle mode.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  7 Mar 2002 08:45:34 -0500
+
+zsh (4.0.4-22) unstable; urgency=low
+
+  * Completion for cdcd, thanks to Gergely Nagy.  closes: bug#133925.
+  * Allow "while do done" to be interrupted.  closes: bug#107528.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 20 Feb 2002 22:24:12 -0500
+
+zsh (4.0.4-21) unstable; urgency=medium
+
+  * Added Colin Walters's prompt.
+  * Tweaked my prompt.
+  * Improved scp completion of remote files, thanks to David Engel.
+  closes: bug#131358.
+  * Improved dict completion, thanks to Matt Zimmerman.  closes: bug#132922.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 10 Feb 2002 12:12:16 -0500
+
+zsh (4.0.4-20) unstable; urgency=medium
+
+  * Small fix to zip completion.
+  * Complete urls for konqueror, skipstone, light, dillo.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  3 Feb 2002 16:31:45 -0500
+
+zsh (4.0.4-19) unstable; urgency=medium
+
+  * Complete short options and local files for rsync.  closes: bug#131657.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  3 Feb 2002 01:17:55 -0500
+
+zsh (4.0.4-18) unstable; urgency=medium
+
+  * Change permissions on modules to 644.  closes: bug#131848.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  1 Feb 2002 09:13:53 -0500
+
+zsh (4.0.4-17) unstable; urgency=medium
+
+  * ZW#16507: Fix ./ completion as was broken by the fix
+  for 129864.  closes: bug#131468.
+  * Fix completion for initscripts.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 29 Jan 2002 21:05:23 -0500
+
+zsh (4.0.4-16) unstable; urgency=medium
+
+  * Warn on fclose or fflush errors in bin_print.  closes: bug#130817.
+  * ZW#16435: Fix core dump in `hash'.
+  * "Command" completion now respects $PATH.  closes: bug#129864.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 27 Jan 2002 18:10:49 -0500
+
+zsh (4.0.4-15) unstable; urgency=low
+
+  * Matt Zimmerman's patch: completion for apt-cache showsrc.
+  closes: bug#129428.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 17 Jan 2002 09:31:40 -0500
+
+zsh (4.0.4-14) unstable; urgency=medium
+
+  * ZW#16408: Patch to make sure auto menu isn't started accidentally when
+    bashautolist is set.  closes: bug#124033.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  9 Jan 2002 08:48:01 -0500
+
+zsh (4.0.4-13) unstable; urgency=medium
+
+  * Fix manpage completion of the letter 'l'.  closes: bug#125936.
+  * Do not depend on $fpath in the postinst and prerm.  closes: bug#125601.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 20 Dec 2001 13:51:45 -0500
+
+zsh (4.0.4-12) unstable; urgency=high
+
+  * Completion for make-kpkg.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 16 Dec 2001 20:20:50 -0500
+
+zsh (4.0.4-11) unstable; urgency=high
+
+  * Modernize apt-cache completion.  closes: bug#123996.
+  * Completion for mozilla.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 15 Dec 2001 19:01:45 -0500
+
+zsh (4.0.4-10) unstable; urgency=high
+
+  * Fix annoying zsh/terminfo module segfault on IA-64.
+  closes: bug#123902.  Thanks to James Troup for tracking
+  the problem down.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 13 Dec 2001 23:26:36 -0500
+
+zsh (4.0.4-9) unstable; urgency=high
+
+  * Do not bind keys dynamically if TERM is equal to emacs
+  so that zsh will not choke when called from XEmacs.
+  closes: bug#123671.
+
+  * Complete .udebs as well as .debs for dpkg.  closes: bug#123390.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 12 Dec 2001 20:00:19 -0500
+
+zsh (4.0.4-8) unstable; urgency=high
+
+  * Try to get keybindings from ncurses instead of assuming VT100.
+  Also, make "not a large assumption" about ncurses idiosyncracies.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  9 Dec 2001 23:47:05 -0500
+
+zsh (4.0.4-7) unstable; urgency=medium
+
+  * Command completion for spamassassin.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  9 Dec 2001 13:29:16 -0500
+
+zsh (4.0.4-6) unstable; urgency=low
+
+  * No longer build-depend on debhelper.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  8 Dec 2001 14:12:48 -0500
+
+zsh (4.0.4-5) unstable; urgency=medium
+
+  * Completion for rsync.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 29 Nov 2001 12:09:53 -0500
+
+zsh (4.0.4-4) unstable; urgency=low
+
+  * mhp's patch for dupload completion to check ~/.dupload.conf.
+  closes: bug#120371.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 26 Nov 2001 12:23:12 -0500
+
+zsh (4.0.4-3) unstable; urgency=medium
+
+  * Completion for dput.  closes: bug#119353.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 18 Nov 2001 15:48:13 -0500
+
+zsh (4.0.4-2) unstable; urgency=high
+
+  * Fix make targets.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 30 Oct 2001 11:18:16 -0500
+
+zsh (4.0.4-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 26 Oct 2001 09:56:16 -0400
+
+zsh (4.0.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 25 Oct 2001 09:59:32 -0400
+
+zsh (4.0.2-9) unstable; urgency=medium
+
+  * Don't make empty example directories in /usr/share/doc.
+  closes: bug#113959.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 30 Sep 2001 13:24:48 -0400
+
+zsh (4.0.2-8) unstable; urgency=high
+
+  * Try not to choke in the prerm when cleaning out
+  the compiled function digests.  closes: bug#112955.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 21 Sep 2001 16:44:21 -0400
+
+zsh (4.0.2-7) unstable; urgency=medium
+
+  * Don't complain about policy-compliant "insecure"
+  directories in $fpath.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  6 Sep 2001 17:05:58 -0400
+
+zsh (4.0.2-6) unstable; urgency=medium
+
+  * Move site-functions dir to /usr/local.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  2 Sep 2001 18:35:04 -0400
+
+zsh (4.0.2-5) unstable; urgency=low
+
+  * Exclude libcap build-dep on hurd-i386.  closes: bug#111004.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  2 Sep 2001 17:48:30 -0400
+
+zsh (4.0.2-4) unstable; urgency=medium
+
+  * Add completion for links(1).
+
+ -- Clint Adams <schizo@debian.org>  Thu, 23 Aug 2001 09:53:25 -0400
+
+zsh (4.0.2-3) unstable; urgency=medium
+
+  * Make gzip completion behave properly for -l and -t.
+  closes: bug#106958.
+  * Make unzip completion behave properly for unzip -Z.
+  closes: bug#108626.
+  * Compensate for inanities permeating resource.h of
+  glibc 2.2.4 on sparc64, causing the ``no such resource:
+  coredumpsize'' problem noticed by Joy.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 21 Aug 2001 15:31:08 -0400
+
+zsh (4.0.2-2) unstable; urgency=low
+
+  * Added build-dep on bsdmainutils.
+  * Fixed typo in ssh_completion example.  closes: bug#106470.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 27 Jul 2001 10:51:54 -0400
+
+zsh (4.0.2-1) unstable; urgency=medium
+
+  * New upstream stable release.
+  * Don't segfault on shoop.sh.  closes: bug#101523.
+  * Better last(1) completion.  closes: bug#102153.
+  * Changed build-dep on groff to groff-base.
+  * Added missing build-dep on libcap-dev.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 26 Jun 2001 11:16:28 -0400
+
+zsh (4.0.1-1) unstable; urgency=high
+
+  * New upstream stable release.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  1 Jun 2001 11:32:15 -0400
+
+zsh (4.0.0+4.0.1.pre5-2) unstable; urgency=high
+
+  * Matt Zimmerman's cleaner _perl_config_vars().  closes: bug#99096.
+  * update-alternatives completion.  closes: bug#98980.
+  * Matt Zimmerman's patch for apt-get --reinstall completion.  closes: bug#98454.
+  * Change prompt expansion of %# to ignore significance of Inheritable capabilities.
+  closes: bug#98475.
+  * Make ZLS_COLOURS and ZLS_COLORS a bit more consistent in the face of compinit.
+  closes: bug#98424.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 30 May 2001 10:12:27 -0400
+
+zsh (4.0.0+4.0.1.pre5-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Repatch completion for diff.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 22 May 2001 10:05:31 -0400
+
+zsh (4.0.0+4.0.1.pre4-4) unstable; urgency=medium
+
+  * Fix completion for diff.  closes: bug#97626.
+  * Fix completion for modprobe.  closes: bug#97627.
+  * Fix completion for pdflatex.  closes: bug#97881.
+  * Introduce zsh-static binary package.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 21 May 2001 17:46:32 -0400
+
+zsh (4.0.0+4.0.1.pre4-3) unstable; urgency=medium
+
+  * Add completion for rmmod and modprobe -r.  closes: bug#97524.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 15 May 2001 10:27:52 -0400
+
+zsh (4.0.0+4.0.1.pre4-2) unstable; urgency=high
+
+  * Actually byte-compile the functions this time.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 11 May 2001 14:33:58 -0400
+
+zsh (4.0.0+4.0.1.pre4-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Fixes bug in math evaluation.  closes: bug#80977.
+  * Fixes bug in CVS completion.  closes: bug#92783.
+  * Byte-compile included functions in postinst and remove in
+  prerm.  closes: bug#75207.
+  * Use function directory hierarchy instead of flat.
+  * Include Martin Waitz's Alt-Backspace key binding example.  closes: bug#87731.
+  * Updated Standards-Version to 3.5.3.0.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  9 May 2001 10:09:45 -0400
+
+zsh (4.0.0+4.0.1.pre3-2) unstable; urgency=medium
+
+  * Fixed INSTALL_FLAGS typo in debian/rules.
+  * Create and remove /usr/local/share/zsh/site-functions
+  directory per ch.10.1.2 of policy.  closes: bug#92743.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 18 Apr 2001 21:15:57 -0400
+
+zsh (4.0.0+4.0.1.pre3-1) unstable; urgency=medium
+
+  * New upstream development release.  closes: bug#93231.
+  * Added completion for release names after apt-get -t or the slash.
+  closes: bug#86854.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  9 Apr 2001 20:47:42 -0400
+
+zsh (4.0.0+4.0.1.pre2-2) unstable; urgency=high
+
+  * Applied patch 13907, fix reverse string subscripting.  closes: bug#92782.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  5 Apr 2001 13:38:51 -0400
+
+zsh (4.0.0+4.0.1.pre2-1) unstable; urgency=medium
+
+  * New upstream development release.  closes: bug#81294.
+  * Add completion support for w3m.  closes: bug#88717.
+  * Update completion support for apt.  half of 86854.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 29 Mar 2001 15:57:57 -0500
+
+zsh (3.1.9.dev8-5) stable; urgency=high
+
+  * Fix build-deps for stable again.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 28 Mar 2001 16:24:43 -0500
+
+zsh (3.1.9.dev8-4) stable unstable; urgency=high
+
+  * Don't segfault on a null path component.  closes: bug#83354.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 26 Mar 2001 16:13:28 -0500
+
+zsh (3.1.9.dev8-3) unstable; urgency=medium
+
+  * No longer set PS1 in /etc/zshrc.  closes: bug#80970.
+  * Set READNULLCMD as per Debian pager policy.  closes: bug#82823.
+  * Michal Politowski's patch for _complete_tag.  closes: bug#91778.
+  * Michal Politowski's patch for _pids.  closes: bug#91792.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 26 Mar 2001 14:09:01 -0500
+
+zsh (3.1.9.dev8-2) unstable; urgency=high
+
+  * Fixed typo in apt-cache completion.  closes: bug#80339.
+  * Fixed dpkg -i completion of multiple debs.  closes: bug#80178.
+  * Fixed segfault on nonexistent capabilities in terminfo.
+  * Fixed jobtable size autoconf code.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 23 Dec 2000 01:57:09 -0500
+
+zsh (3.1.9.dev8-1) unstable; urgency=medium
+
+  * New upstream development release.  closes: bug#69928, bug#74874,
+  bug#76789.
+  * Bind arrow keys in vi insert mode.  closes: bug#77496.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  5 Dec 2000 20:01:19 -0500
+
+zsh (3.1.9.dev7-2) unstable; urgency=low
+
+  * Changed global zshrc so that root's umask is set by default to
+    022.  Patch from Miquel van Smoorenburg closes: bug#76767.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 12 Nov 2000 00:01:06 -0500
+
+zsh (3.1.9.dev7-1) unstable; urgency=medium
+
+  * New upstream development release.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 22 Oct 2000 01:42:26 -0400
+
+zsh (3.1.9.dev6-7) stable; urgency=medium
+
+  * Reissue to fix bad i386 build.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  8 Oct 2000 01:21:01 -0400
+
+zsh (3.1.9.dev6-6) stable; urgency=medium
+
+  * Backport to fix grave bug in potato.
+
+ -- Clint Adams <schizo@debian.org>  Sat,  7 Oct 2000 13:01:22 -0400
+
+zsh (3.1.9.dev6-5) unstable; urgency=medium
+
+  * Change behavior of failed redirection of builtins and such
+    to mimic that of forked binaries.  closes: bug#72288.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  2 Oct 2000 11:07:33 -0400
+
+zsh (3.1.9.dev6-4) unstable; urgency=medium
+
+  * Fix compctl.dpkg example so that it functions when EXTENDED_GLOB
+    is set and added some comments.  closes: bug#71474.
+  * Remove explicit color settings from BODY tags of html docs
+    after texi2html puts them there.  closes: bug#71627.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 12 Sep 2000 16:08:46 -0400
+
+zsh (3.1.9.dev6-3) unstable; urgency=low
+
+  * Restore build dependencies for woody.  Source is now divergent.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 11 Sep 2000 03:37:12 -0400
+
+zsh (3.1.9.dev6-2potato1) stable; urgency=high
+
+  * Fix build dependencies for potato.  closes: bug#71145.
+  * Incidentally, gzipped PostScript files are now completed
+    for gv as of dev-6, so this closes: bug#56485.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 11 Sep 2000 03:26:42 -0400
+
+zsh (3.1.9.dev6-2) stable unstable; urgency=high
+
+  * Add module aliasing to /etc/zshrc to provide backward compatibility
+    with versions prior to 3.1.9-dev-5.  closes: bug#71046.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  7 Sep 2000 11:37:33 -0400
+
+zsh (3.1.9.dev6-1) stable unstable; urgency=medium
+
+  * New upstream development release.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  4 Sep 2000 11:59:01 -0400
+
+zsh (3.1.9.dev5-3) stable unstable; urgency=medium
+
+  * Complete files after man -l instead of manpages.  closes: bug#70755.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  3 Sep 2000 17:47:50 -0400
+
+zsh (3.1.9.dev5-2) stable unstable; urgency=medium
+
+  * Fixed broken dpkg completion.  Probably closes: bug#70610.
+  * The segfault on the time builtin has been fixed since 3.1.9-4, but
+    people are obviously going to keep reporting it until it gets into
+    potato.  This is destined for proposed-updates, so hopefully it
+    closes: bug#70683.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  1 Sep 2000 10:02:56 -0400
+
+zsh (3.1.9.dev5-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Updated standards version.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 11 Aug 2000 15:55:44 -0400
+
+zsh (3.1.9.dev4-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Moved additional keybindings out of source and into global zshrc.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 31 Jul 2000 13:15:35 -0400
+
+zsh (3.1.9.dev3-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Removed preinst.  closes: bug#67252.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 17 Jul 2000 19:54:50 -0400
+
+zsh (3.1.9.dev2-1) unstable; urgency=medium
+
+  * New upstream development release.  Fixes ignored-patterns bug;
+  closes: bug#66464.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  3 Jul 2000 12:07:04 -0400
+
+zsh (3.1.9-5) unstable; urgency=medium
+
+  * Added explanation of deriving ssh host completion possibilities
+  from known_hosts file to examples directory.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 25 Jun 2000 10:19:09 -0400
+
+zsh (3.1.9-4) unstable; urgency=medium
+
+  * Moved umask setting from /etc/zprofile to /etc/zshrc, added
+  conditional.  closes: bug#65596.
+  * ZW#11885: Patch for 'time time'.  closes: bug#65602, bug#65604.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 14 Jun 2000 09:42:15 -0400
+
+zsh (3.1.9-3) unstable; urgency=medium
+
+  * Fixed TRAPEXIT segfault problem.  closes: bug#65350.
+  * Bart Schaefer's patch to prevent coredumps during menu selection
+  when the terminal does not have a programmable cursor.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 10 Jun 2000 13:14:14 -0400
+
+zsh (3.1.9-2) unstable; urgency=medium
+
+  * Tanaka Akira's patch fixing apt-get completion.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  8 Jun 2000 09:11:05 -0400
+
+zsh (3.1.9-1) unstable; urgency=medium
+
+  * New upstream beta release.
+  * Completion for dpkg improved.  closes: bug#61710.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  6 Jun 2000 09:17:41 -0400
+
+zsh (3.1.7-1) unstable; urgency=medium
+
+  * New upstream beta release.  closes: bug#60989, #62126, #62128,
+    #63781, #64125, #64131, #64582, #64684, #64695, #64517.
+  * Updated Build-Depends to include debhelper.
+  * Updated copyright file.
+  * Included Ray's sample zshrc previously featured in zsh-beta.
+  * Expanded job table size limit.  closes: bug#49221.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 30 May 2000 11:00:38 -0400
+
+zsh (3.1.6.pws21-1) frozen unstable; urgency=high
+
+  * New upstream development release.  compinstall no longer inserts
+    the invalid command 'compstyle' into .zshrc.  closes: bug#61326.
+  * ZW#10463: Add PM_HASHELEM type to avoid allexport spewing assoc. array
+    subparameters into the environment.  closes: bug#60597.
+  * Fixed bad awk command for zftp completion.  closes: bug#60754.
+  * ZW#10408, SF#103798: Fix space-containing directory completion
+    brain damage.  closes: bug#61567.
+  * Fixed _dpkg completion thinko for -i and non-completion for -S
+    mentioned by Joy in bug #61710.
+  * Added core completion functions accidentally left out of tarball.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  4 Apr 2000 22:55:14 -0400
+
+zsh (3.1.6.pws20-1) frozen unstable; urgency=high
+
+  * New upstream development release.  fixes "cd" coredump.
+    closes: bug#58941.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 25 Mar 2000 09:38:05 -0500
+
+zsh (3.1.6.pws19-1) frozen unstable; urgency=high
+
+  * New upstream development release.  fixes _x_argument to complete
+    files also.  closes: bug#58229.  fixes bad function termination
+    coredump.
+  * Works around broken FIFOs in configure test.  closes: bug#58036.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 21 Feb 2000 14:31:23 -0500
+
+zsh (3.1.6.pws16-1) frozen unstable; urgency=low
+
+  * New upstream development release.  Fixes incorrect module-loading
+    in Zftp.  closes: bug#55809.  Dozens of bugfixes.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 28 Jan 2000 10:43:55 -0500
+
+zsh (3.1.6.pws15-1) unstable; urgency=low
+
+  * New upstream development release.  Fixes typo in a2ps completion.
+    closes: bug#55004.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 15 Jan 2000 13:35:02 -0500
+
+zsh (3.1.6.pws14-1) unstable; urgency=low
+
+  * New upstream development release.
+  * Fixed new-style dpkg completion.  closes: bug#53339.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  7 Jan 2000 10:23:09 -0500
+
+zsh (3.1.6.pws13-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixed new-style completion for tar.  closes: bug#52785.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 24 Dec 1999 17:34:31 -0500
+
+zsh (3.1.6.pws12-1) unstable; urgency=low
+
+  * New upstream release.
+  * Cleaned up stray config.cache.  closes: bug #52432.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 16 Dec 1999 12:20:04 -0500
+
+zsh (3.1.6.pws11-1) unstable; urgency=low
+
+  * New upstream release.
+  * Note about completion being off by default in
+    README.Debian.  closes: bug#49374, bug#50009, bug#51150.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  8 Dec 1999 17:26:51 -0500
+
+zsh (3.1.6.pws10-2) unstable; urgency=high
+
+  * Fix to prevent infinite loop upon abrupt termination.
+    closes: bug#51802, bug#51810, bug#51828.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  3 Dec 1999 10:56:10 -0500
+
+zsh (3.1.6.pws10-1) unstable; urgency=low
+
+  * New upstream release.  closes: bug#51304.
+  * Now impersonates a compiler when printing script errors.
+    closes: bug#51059.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 29 Nov 1999 18:58:03 -0500
+
+zsh (3.1.6.pws9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Changed fix for floating point arithmatic evaluation to be
+    locale-independent.  Again closes: bug#49789.
+  * Moved doc alternatives fix to preinst.  closes: bug#50835.
+  * Moved install-docs correction to preinst.  closes: bug#50919.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 22 Nov 1999 09:59:12 -0500
+
+zsh (3.1.6.pws6.tanaka19991119-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+  * Removed errant config.cache causing glibc2.0 build problems.
+    closes: bug#49966.
+  * Removed alternative handling of info files.
+
+ -- Clint Adams <schizo@debian.org>  Fri, 19 Nov 1999 12:08:40 -0500
+
+zsh (3.1.6.pws6.tanaka19991111-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+  * Tweaked math/locale interaction to allow setting
+    of floating point variables where the decimal point
+    is a comma.  closes: bug#49789.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 11 Nov 1999 11:28:36 -0500
+
+zsh (3.1.6.pws6.tanaka19991110-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+  * Corrected keybinding thinko.  closes: bug#49750.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 10 Nov 1999 10:29:56 -0500
+
+zsh (3.1.6.pws6.tanaka19991109-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  9 Nov 1999 10:45:41 -0500
+
+zsh (3.1.6.pws6.tanaka19991108-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+  * Fixed erroneous length calculation involving 79-character
+    strings in 80-column windows.  closes: bug#38538.
+  * Fixed zsh-doc's Architecture field.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  8 Nov 1999 09:44:33 -0500
+
+zsh (3.1.6.pws6.tanaka19991107-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  7 Nov 1999 10:52:44 -0500
+
+zsh (3.1.6.pws6.tanaka19991105-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+
+ -- Clint Adams <schizo@debian.org>  Fri,  5 Nov 1999 10:16:41 -0500
+
+zsh (3.1.6.pws6.tanaka19991104-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+  * Fixed erroneous discrepancies with bart-8.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  4 Nov 1999 10:28:28 -0500
+
+zsh (3.1.6.pws6.tanaka19991103-1) unstable; urgency=low
+
+  * New "upstream" snaphot.
+  * Now including completion-style-guide in /usr/share/doc/zsh
+
+ -- Clint Adams <schizo@debian.org>  Wed,  3 Nov 1999 12:01:28 -0500
+
+zsh (3.1.6.pws6.tanaka19991102-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+  * Fixed references to /usr/local/bin/zsh in some functions.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  2 Nov 1999 13:46:20 -0500
+
+zsh (3.1.6.pws6.tanaka19991031-1) unstable; urgency=low
+
+  * New "upstream" snapshot.  closes: bug#48483.
+  * Forked zsh/zsh-doc from zsh-beta/zsh-beta-doc.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 31 Oct 1999 22:16:30 -0500
+
+zsh (3.1.6.pws6.tanaka19991028-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+  * Improved doc-share/doc symlink handling.
+  * manpages and info now under alternatives mechanism.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 28 Oct 1999 10:26:59 -0400
+
+zsh (3.1.6.pws6.tanaka19991027-1) unstable; urgency=low
+
+  * New "upstream" snapshot.
+  * Applied Csaba Benedek's compctl.dpkg example fix.  closes: bug#48472.
+  * Split HTML and info docs into separate binary package.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 27 Oct 1999 11:09:49 -0400
+
+zsh (3.1.6.pws6.bart7-1) unstable; urgency=low
+
+  * New "upstream" release.  closes: bug#44059, bug#47398.
+  * Disabled tcsetpgrp test to allow job control to be built on
+    powerpc.  closes: bug#47591.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 19 Oct 1999 11:45:11 -0400
+
+zsh (3.1.6.pws6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixed doc-base inconsistency.  closes: bug#45648.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 26 Sep 1999 16:34:16 -0400
+
+zsh (3.1.6.pws5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Debian changelog is now back in the binary package.  closes: bug#45295.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 20 Sep 1999 11:11:47 -0400
+
+zsh (3.1.6.pws4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Day of ridiculous symlinks.
+    /bin/zsh (managed by alternatives), closes: bug#41018
+    /usr/doc/zsh -> /usr/share/doc/zsh.
+  * Added support for DEB_BUILD_OPTIONS containing 'debug'.
+  * Moved info files to /usr/share/info
+  * Added registration of Z Shell Guide with doc-base.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 14 Sep 1999 11:28:34 -0400
+
+zsh (3.1.6.pws3-1) unstable; urgency=low
+
+  * New upstream release.  closes: bug#41242, bug#41895.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  7 Sep 1999 14:50:40 -0400
+
+zsh (3.1.6-3) unstable; urgency=low
+
+  * Fixed silly typo in the postinst.
+
+ -- Clint Adams <schizo@debian.org>  Wed,  1 Sep 1999 04:00:43 -0400
+
+zsh (3.1.6-2) unstable; urgency=low
+
+  * Added menu entry.
+  * Moved documentation from /usr/doc to /usr/share/doc.
+  * Fixed compctl.dpkg examples; patch from Gregor Hoffleit. closes: #43662.
+
+ -- Clint Adams <schizo@debian.org>  Sun, 29 Aug 1999 08:18:19 -0400
+
+zsh (3.1.6-1) unstable; urgency=low
+
+  * New upstream release.  closes: bug#41644, bug#43034.
+  * Fixed bad default FPATH.  closes: bug#40777, bug#41028, bug#41893.
+  * Fixed up compctl.dpkg examples pointed out by Fabien Ninoles.
+    closes: bug#41894.
+
+ -- Clint Adams <schizo@debian.org>  Wed, 11 Aug 1999 09:48:00 -0400
+
+zsh (3.1.5.pws24-1) unstable; urgency=low
+
+  * New upstream release.
+  * Changed Rob Leslie's run-help in the source diff instead of
+    in the rules file.  closes: bug# 38614 again.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 28 Jun 1999 20:22:15 -0400
+
+zsh (3.1.5.pws21-1) unstable; urgency=low
+
+  * New upstream release.
+  * Turned off globbing flags when EXTENDED_GLOB unset.  closes: bug#38312
+
+ -- Clint Adams <schizo@debian.org>  Sun, 13 Jun 1999 12:36:52 -0400
+
+zsh (3.1.5.pws20-1) unstable; urgency=low
+
+  * New "upstream" release.
+  * run-help now uses pager instead of more.  bug# 38614.
+  * MAILPATH maildir support patch from Miquel van Smoorenburg
+    <miquels@cistron.nl>.  bug# 38793.
+  * Hardcoded (ugh) Home, End, and Delete key bindings.
+    bug# 26862, bug# 30792.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  3 Jun 1999 00:01:16 -0400
+
+zsh (3.1.5.pws19-1) unstable; urgency=low
+
+  * New "upstream" release.
+  * Moved /usr/lib/zsh to /usr/share/zsh.  Bug# 38086.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 22 May 1999 22:23:17 -0400
+
+zsh (3.1.5.pws18-1) unstable; urgency=low
+
+  * New "upstream" release.
+
+ -- Clint Adams <schizo@debian.org>  Sat, 15 May 1999 15:48:19 -0400
+
+zsh (3.1.5.pws17-1) unstable; urgency=low
+
+  * New upstream release.  fixes bug #35119, bug #32144.
+  * Fixed quotes on dpkg compctl example. bug# 36995
+
+ -- Clint Adams <schizo@debian.org>  Mon, 10 May 1999 17:23:33 -0400
+
+zsh (3.1.5.pws16-1) unstable; urgency=low
+
+  * New upstream release.
+    (Fixes bug #24910, bug# 26861, bug# 27871).
+  * unset dpkg_options in compctl example (bug# 36337).
+
+ -- Clint Adams <schizo@debian.org>  Wed, 28 Apr 1999 16:57:17 -0400
+
+zsh (3.1.2-12) frozen unstable; urgency=low
+
+  * Removed unlimit coredumpsize from /etc/zprofile.
+    closes: bug#23029.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  7 Feb 1999 13:35:47 -0500
+
+zsh (3.1.2-11) frozen unstable; urgency=high
+
+  * Bart Schaefer's init patch prevents coredumps when running
+    zsh -c or zsh -o without arguments or zsh with a nonexistent
+    filename.  closes: bug#26861, bug#27871, bug#24910.
+
+ -- Clint Adams <schizo@debian.org>  Sun,  7 Feb 1999 09:47:11 -0500
+
+zsh (3.1.2-10) frozen unstable; urgency=high
+
+  * Removed --enable-zsh-mem to avoid problems on other
+    sparc and other architectures.  fixes: #29984, #30512.
+  * Fixed badly quoted manpages.  (bug#29998).
+  * Only will set FPATH in /etc/zshrc if unset.  (bug#29634).
+
+ -- Clint Adams <schizo@debian.org>  Fri, 22 Jan 1999 13:34:19 -0500
+
+zsh (3.1.2-9) frozen unstable; urgency=low
+
+  * Added binding for Del key.  bug#24258.
+  * Fixed paths in examples. bug#25402.
+  * Added Karl Hegbloom's compctl examples.  bug#23272.
+
+ -- Clint Adams <schizo@debian.org>  Mon,  9 Nov 1998 18:30:27 -0500
+
+zsh (3.1.2-8) frozen unstable; urgency=high
+
+  * Applied Peter Stephenson's patch alleviating the
+    reverse-history-search segmentation fault in login
+    shells problem (bug#23033).
+  * Changed /etc/zshenv to set PATH only if unset or if
+    set to /bin:/usr/bin (bug#22400, bug#23036).
+
+ -- Clint Adams <schizo@debian.org>  Sat, 11 Jul 1998 01:57:45 -0400
+
+zsh (3.1.2-7) frozen unstable; urgency=high
+
+  * Fixed improper generation of signal list.
+
+ -- Clint Adams <schizo@debian.org>  Mon, 18 May 1998 11:27:30 -0400
+
+zsh (3.1.2-6) frozen unstable; urgency=low
+
+  * Applied patch to correct miscalculation in spaceinline().
+  * Changed /etc/zshenv to only set PATH if unset.
+
+ -- Clint Adams <schizo@debian.org>  Thu, 14 May 1998 01:43:58 -0400
+
+zsh (3.1.2-5) frozen unstable; urgency=low
+
+  * Included current FAQ.
+  * Applied patch to fix prefix completion in zle_tricky
+  * Applied patch to fix clobbering behavior.
+  * Applied patch to fix typeset -U array; array=(1 2 1) creating
+    a non-unique array.
+  * Applied patch to fix unbalanced stack error on $((0x1+0x1)).
+  * Applied patch to fix incorrect prototype from match_username cast
+    in zle_tricky.
+  * Applied patches to read builtin.
+  * Applied patches to fix glob coredumping.
+  * Moved FPATH, PS1, and autoload of run-help to /etc/zshrc.  bug#20043.
+  * Moved setting of PATH back to /etc/zshenv.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  7 May 1998 20:38:01 -0400
+
+zsh (3.1.2-4) frozen unstable; urgency=high
+
+  * Applied Bernd Eggink's patch to make select comply with the documentation.
+  * Applied Bernd Eggink's patches to bin_getopts() fixing several bugs.
+  * Patched doinsert() to fix nasty problem of segfaults and other oddities
+    involved with metacharacters under X.  fixes: bug#18791.
+  * Some minor aesthetic modifications to the package description,
+    including those demanded by Richard Braakman.  fixes: bug#18987.
+  * Stopped debstd from sneaking ansi2knr.1 into /usr/man/man1.  fixes: bug#17833.
+
+ -- Clint Adams <schizo@debian.org>  Tue, 17 Mar 1998 02:46:42 -0500
+
+zsh (3.1.2-3) unstable; urgency=medium
+
+  * Fixed typo in debian/rules (bug #17858).
+  * Applied zefram3 patches.  Bug #18039 is fixed.
+  * Removed "." from default PATH (bug #18047).
+
+ -- Clint Adams <schizo@debian.org>  Tue, 17 Feb 1998 21:53:45 -0500
+
+zsh (3.1.2-2) unstable; urgency=high
+
+  * Disabled dynamic module support.
+
+ -- Clint Adams <schizo@debian.org>  Thu,  5 Feb 1998 00:02:35 -0500
+
+zsh (3.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Changed default umask from 022 to 002.
+  * Moved contents of /etc/zshenv and /etc/zshrc to /etc/zprofile
+    to avoid overriding PATH on every shell invocation (bug #17582).
+  * Modified configure script to search for utmp in /var/run before /etc.
+  * Modified configure script to search for wtmp in /var/log before /etc (bug #15802).
+  * Redisabled HISTCHARS/histchars import.
+
+ -- Clint Adams <schizo@debian.org>  Tue,  3 Feb 1998 14:50:00 -0500
+
+zsh (3.0.5-2) unstable; urgency=low
+
+  * Changed HISTCHARS/histchars to not reset (bug #6236).
+
+ -- Clint Adams <schizo@debian.org>  Fri, 28 Nov 1997 00:31:13 -0500
+
+zsh (3.0.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Clint Adams <schizo@debian.org>  Fri, 26 Sep 1997 13:35:56 -0400
+
+zsh (3.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * New maintainer
+  * Converted to use libc6.
+  * Converted to new source packaging format.
+  * Using pristine original source.
+  * Added Joey Hess's compctl example for dpkg to /usr/doc/zsh/examples
+
+ -- Clint Adams <schizo@debian.org>  Thu, 24 Jul 1997 13:42:49 -0400
+
--- zsh-4.3.10.orig/debian/static.postrm
+++ zsh-4.3.10/debian/static.postrm
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+case "$1" in
+	(remove)
+	remove-shell /bin/zsh-static
+	;;
+esac
--- zsh-4.3.10.orig/debian/zprofile
+++ zsh-4.3.10/debian/zprofile
@@ -0,0 +1,7 @@
+# /etc/zsh/zprofile: system-wide .zprofile file for zsh(1).
+#
+# This file is sourced only for login shells (i.e. shells
+# invoked with "-" as the first character of argv[0], and
+# shells invoked with the -l flag.)
+#
+# Global Order: zshenv, zprofile, zshrc, zlogin
--- zsh-4.3.10.orig/debian/control
+++ zsh-4.3.10/debian/control
@@ -0,0 +1,94 @@
+Source: zsh
+Section: shells
+Priority: optional
+Build-Depends: texinfo, groff-base, libncursesw5-dev, texi2html (>= 1.76-3), libcap2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], bsdmainutils, libpcre3-dev, texlive-latex-base | tetex-bin
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Clint Adams <schizo@debian.org>
+Standards-Version: 3.8.3
+Homepage: http://www.zsh.org/
+Vcs-Git: git://git.debian.org/git/private/schizo/zsh.git
+Vcs-Browser: http://git.debian.org/?p=private/schizo/zsh.git;a=summary
+
+Package: zsh
+Architecture: any
+Section: shells
+Priority: optional
+Depends: ${shlibs:Depends}
+Conflicts: pdksh (<< 5.2.14-18)
+Recommends: ${shlibs:Recommends}
+Suggests: zsh-doc
+Description: A shell with lots of features
+ Zsh is a UNIX command interpreter (shell) usable as an
+ interactive login shell and as a shell script command
+ processor. Of the standard shells, zsh most closely resembles
+ ksh but includes many enhancements. Zsh has command-line editing,
+ built-in spelling correction, programmable command completion,
+ shell functions (with autoloading), a history mechanism, and a
+ host of other features.
+
+Package: zsh-doc
+Architecture: all
+Section: doc
+Priority: optional
+Conflicts: zsh (<< 3.1.6.pws9-1)
+Description: zsh documentation - info/HTML format
+ Zsh is a UNIX command interpreter (shell) usable as an
+ interactive login shell and as a shell script command
+ processor. Of the standard shells, zsh most closely resembles
+ ksh but includes many enhancements. Zsh has command-line editing,
+ built-in spelling correction, programmable command completion,
+ shell functions (with autoloading), a history mechanism, and a
+ host of other features.
+ .
+ This contains the documentation in GNU info and HTML formats.
+
+Package: zsh-static
+Architecture: any
+Section: shells
+Priority: optional
+Depends: ${shlibs:Depends}, zsh
+Conflicts: zsh30-static (<< 3.0.8-5)
+Suggests: zsh-doc
+Description: A shell with lots of features (static link)
+ Zsh is a UNIX command interpreter (shell) usable as an
+ interactive login shell and as a shell script command
+ processor. Of the standard shells, zsh most closely resembles
+ ksh but includes many enhancements. Zsh has command-line editing,
+ built-in spelling correction, programmable command completion,
+ shell functions (with autoloading), a history mechanism, and a
+ host of other features.
+ .
+ This is the statically-compiled version of the shell.
+
+Package: zsh-dev
+Architecture: any
+Section: libdevel
+Priority: optional
+Description: A shell with lots of features (development files)
+ Zsh is a UNIX command interpreter (shell) usable as an
+ interactive login shell and as a shell script command
+ processor. Of the standard shells, zsh most closely resembles
+ ksh but includes many enhancements. Zsh has command-line editing,
+ built-in spelling correction, programmable command completion,
+ shell functions (with autoloading), a history mechanism, and a
+ host of other features.
+ .
+ This package contains headers and scripts necessary to compile
+ third-party modules.
+
+Package: zsh-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: zsh (= ${binary:Version})
+Description: A shell with lots of features (debugging symbols)
+ Zsh is a UNIX command interpreter (shell) usable as an
+ interactive login shell and as a shell script command
+ processor. Of the standard shells, zsh most closely resembles
+ ksh but includes many enhancements. Zsh has command-line editing,
+ built-in spelling correction, programmable command completion,
+ shell functions (with autoloading), a history mechanism, and a
+ host of other features.
+ .
+ This package contains gdb debugging symbols for the 'zsh'
+ package.
--- zsh-4.3.10.orig/debian/static.prerm
+++ zsh-4.3.10/debian/static.prerm
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+case "$1" in
+    remove|deconfigure)
+	update-alternatives --remove zsh-static /bin/zsh4-static
+    ;;
+    upgrade)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+	echo "prerm called with unknown argument \`$1'" >&2
+	exit 0
+    ;;
+esac
--- zsh-4.3.10.orig/debian/static.postinst
+++ zsh-4.3.10/debian/static.postinst
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+case "$1" in
+    (configure)
+#    if test -z "$2"; then
+	    add-shell /bin/zsh-static
+#    fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+	exit 0
+    ;;
+
+    *)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 0
+    ;;
+esac
+
+update-alternatives --install /bin/zsh-static zsh-static /bin/zsh4-static 40
+
+exit 0
--- zsh-4.3.10.orig/debian/examples/ssh_completion
+++ zsh-4.3.10/debian/examples/ssh_completion
@@ -0,0 +1,66 @@
+NOTE: In order for this to work with newer versions of ssh, you must
+insure that "HashKnownHosts" is set to "no".
+
+This will set the variable $hosts to an array containing
+all the hosts in ~/.ssh/known_hosts and ~/.ssh/known_hosts2
+that do not start with a digit.
+
+hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts <$HOME/.ssh/known_hosts2)"}:#[0-9]*}%%\ *}%%,*})
+
+This will set the variable $hosts to an array containing
+all the hosts in ~/.ssh/known_hosts that do not start with
+a digit.
+
+hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*})
+
+If you are using the new completion system, you can then place
+
+zstyle ':completion:*:hosts' hosts $hosts
+
+after compinit is autoloaded to use those anywhere hosts would be
+completed, or
+
+zstyle ':completion:*:complete:ssh:*:hosts' hosts $hosts
+
+to use those hosts to complete only ssh.
+
+An explanation of the $hosts assignment, written by Peter Stephenson,
+follows.
+
+$(<$HOME/.ssh/known_hosts)
+
+is a standard substitution: it simply takes the file and sticks it onto the
+command line at that point.
+
+"$(<$HOME/.ssh/known_hosts)"
+
+Now it's quoted, it doesn't do word splitting; we have the complete file as
+one word.  From now on, we do nested substitutions: you just have to
+remember that ${${...}}, or ${${...}}, essentially does nothing but an
+ordinary parameter expansion --- the whole point is the extra bits tacked
+on with each extra set of braces.  For example, we're now going to do
+
+${(f)"$(<$HOME/.ssh/known_hosts)"}
+
+so we get the same answer, but with the effect of putting the (f) flag at
+the start, which splits the result of that into lines.  So we now have the
+entire file as an array, one line per element.
+
+${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}
+(Clint says the ^ shouldn't be there) says take the array elements (= lines
+of the original file) which completely match [0-9]*, i.e. elements
+beginning with a digit, and remove them, which is what ${...:#...} is for. 
+
+${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}
+
+takes the result of that, and strips off from the end the largest pattern
+matching ' *', i.e. a space followed by anything else, in other words it   
+leaves the largest initial string with no whitespace, which is a hostname
+(this is a standard ${...%%...} which even ordinary shells do, although not
+nested).
+
+${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*}
+
+does another strip at the end, this time for everything from the first
+comma on.  If there wasn't a comma, nothing changes.  You could have
+combined the last two as ${...%%[[:blank:],]*}, or something.
--- zsh-4.3.10.orig/debian/examples/jhm.zshrc
+++ zsh-4.3.10/debian/examples/jhm.zshrc
@@ -0,0 +1,516 @@
+# Ray's .zshrc
+# Note that completions for dpkg-deb, mutt, mount, and dupload are
+# included as part of the new completion system.  See docs for details.
+
+# Zsh settings
+
+# TODO
+# - completions for dpkg-deb
+# - completions for lintian
+# - completions for dupload
+# - completions for nm
+# - completions for objdump
+# - completions for mount
+# - completion for man -l
+
+bindkey -e	# Emacs-style commandline editing
+
+case "$TERM" in
+	linux)	# Linux console
+		bindkey '\e[1~' beginning-of-line	# Home 
+		bindkey '\e[4~' end-of-line		# End  
+		bindkey '\e[3~' delete-char		# Del
+		bindkey '\e[2~' overwrite-mode		# Insert  
+#		bindkey '\e[A' up-line-or-history	# cursor up
+#		bindkey '\e[B' down-line-or-history	# cursor down
+#		bindkey '\e[C' forward-char		# cursor right
+#		bindkey '\e[D' backward-char		# cursor left
+		;;
+	screen) # The textmode window manager
+		# In Linux console
+		bindkey '\e[1~' beginning-of-line	# Home
+		bindkey '\e[4~' end-of-line		# End  
+		bindkey '\e[3~' delete-char		# Del
+		bindkey '\e[2~' overwrite-mode		# Insert  
+		bindkey '\e[7~' beginning-of-line	# home
+		bindkey '\e[8~' end-of-line		# end
+		# In rxvt
+		bindkey '\eOc' forward-word		# ctrl cursor right
+		bindkey '\eOd' backward-word		# ctrl cursor left
+		bindkey '\e[3~' backward-delete-char	# This should not be necessary!
+#		bindkey '\e[A' up-line-or-history	# cursor up
+#		bindkey '\e[B' down-line-or-history	# cursor down
+#		bindkey '\e[C' forward-char		# cursor right
+#		bindkey '\e[D' backward-char		# cursor left
+		;;
+	rxvt)
+		bindkey '\e[7~' beginning-of-line	# home
+		bindkey '\e[8~' end-of-line		# end
+		bindkey '\eOc' forward-word		# ctrl cursor right
+		bindkey '\eOd' backward-word		# ctrl cursor left
+		bindkey '\e[3~' backward-delete-char	# This should not be necessary!
+		bindkey '\e[2~' overwrite-mode		# Insert
+		;;
+	xterm*)
+		bindkey '\e[H' beginning-of-line	# Home
+		bindkey '\e[F'  end-of-line		# End
+		bindkey '\e[3~' delete-char		# Del
+		bindkey '\e[2~' overwrite-mode		# Insert
+		;;
+	sun)
+		bindkey '\e[214z' beginning-of-line       # Home
+		bindkey '\e[220z' end-of-line             # End
+		bindkey '^J'      delete-char             # Del
+		bindkey '^H'      backward-delete-char    # Backspace
+		bindkey '\e[247z' overwrite-mode          # Insert
+		;;
+esac
+
+#if test "X$TERM" = "Xscreen" || test "X$TERM" = "Xlinux"; then
+#  bindkey '\e[A' up-line-or-history	# cursor up
+#  bindkey '\e[B' down-line-or-history	# cursor down
+#  bindkey '\e[C' forward-char		# cursor right
+#  bindkey '\e[D' backward-char		# cursor left
+#fi
+#
+#if test "X$TERM" = "Xscreen" || test "X$TERM" = "Xrxvt"; then
+#  bindkey '\e[7~' beginning-of-line	# home
+#  bindkey '\e[8~' end-of-line		# end
+#  bindkey '\eOc' forward-word		# ctrl cursor right
+#  bindkey '\eOd' backward-word		# ctrl cursor left
+#  bindkey '\e[3~' backward-delete-char	# This should not be necessary!
+#fi
+
+export DEBEMAIL=jhm@cistron.nl
+export IRCNICK=JHM
+export IRCSERVER=irc.nl.openprojects.org
+eval `lesspipe`
+
+alias glimpse='glimpse -z -i -w'
+
+# All functions used for defining completion rules start with `c_'.
+setopt extendedglob	# required for some of our completion magic
+setopt list_types	# Put a file type indicator after file names when 
+			# completing.
+setopt correct		# Attempt spelling correction on command names only.
+setopt print_exit_value
+setopt list_ambiguous
+setopt bash_auto_list	# Make <tab><tab> do the right thing.
+setopt list_packed	# Compacter display of completion list.
+setopt interactive_comments
+setopt nohup		# So backgrounded jobs don't get terminated when
+			# the shell is.
+
+# A sensible prompt:
+# hostname username(underlined) time pwd(bold; max 30 chars.) > or #
+if test "X$TERM" = "Xscreen"; then
+	# include a hint that screen(1) can use to set window titles.
+	PROMPT='%m %U%n%u %T %B%30<..<%~%b %{k\%}%(!.#.>) '
+else
+	# We don't include the hint outside screen, as it causes problems
+	# with xterm
+	PROMPT='%m %U%n%u %T %B%30<..<%~%b %(!.#.>) '
+fi
+
+c_groups=( $(cut -d: -f1 /etc/group) )
+
+############################################################################
+# Shell builtins
+
+compctl -k '( )' pushln
+compctl -z -P '%' bg
+compctl -j -P '%' fg jobs disown
+compctl -j -P '%' + -s '`ps -x | tail +2 | cut -c1-5`' wait
+
+compctl -A shift
+compctl -caF type whence which
+compctl -c unhash
+compctl -F functions unfunction
+compctl -x 'w[1,-d] p[2]' -n - 'w[1,-d] p[3]' -g '*(-/)' - \
+        'p[1]' -c - 'p[2]' -g '*(-x)' -- hash
+compctl -a unalias
+compctl -v getln getopts read unset vared
+compctl -v -S '=' -q declare export integer local readonly typeset
+compctl -e disable
+compctl -d enable
+
+eval compctl -k "'("`limit | cut -d\  -f1`")'" limit unlimit
+
+compctl -l '' -x 'p[1]' -f -- . source
+compctl -s '`unsetopt`' setopt
+# Redirection below makes zsh silent when completing unsetopt xtrace
+compctl -s '`setopt 2> /dev/null`' unsetopt
+compctl -s '${^fpath}/*(N:t)' autoload
+
+compctl -b bindkey
+compctl -c -x 'C[-1,-*k]' -A - 'C[-1,-*K]' -F -- compctl
+compctl -x 'C[-1,-*e]' -c - 'C[-1,-[ARWI]##]' -f -- fc
+compctl -x 'p[1]' - 'p[2,-1]' -l '' -- sched
+compctl -x 'C[-1,[+-]o]' -o - 'c[-1,-A]' -A -- set
+
+# Anything after nohup is a command by itself with its own completion
+compctl -l '' nohup exec nice eval sudo fakeroot
+compctl -x 'p[1]' -c - 'p[2,-1]' -k signals -- trap
+compctl -l '' -x 'p[1]' -B -- builtin
+
+# kill takes signal names as the first argument after -, but job names after %
+# or PIDs as a last resort
+compctl -j -P '%' + -s '`ps -x | tail +2 | cut -c1-5`' + \
+        -x 's[-] p[1]' -k "($signals[1,-3])" -- kill
+
+
+############################################################################
+# Basic commands and file manipulation commands
+
+compctl -k '( )' pwd
+compctl -g '*(/)' cd
+compctl -g '^*.(c|cc|C|cxx|cpp|h|in|l|y|tex)' rm
+compctl -g '*(/)' rmdir
+compctl -g '*.Z' + -g '*(/)' znew
+compctl -s '$(groups)' + -k groups newgrp
+compctl -f -x 'p[1], p[2] C[-1,-*]' -k groups -- chgrp
+compctl -f -x 'p[1] n[-1,.], p[2] C[-1,-*] n[-1,.]' -k groups \
+        - 'p[1], p[2] C[-1,-*]' -u -S '.' -- chown
+
+# GNU ls, dir: complete files, options (both - and -- kind), and option params.
+compctl -f \
+  -x s'[--format]' -P '=' -k '(long verbose commas horizontal across vertical si
+ngle-column)' \
+  - s'[--sort]' -P '=' -k '(none time size extension)' \
+  - s'[--time]' -P '=' -k '(atime ctime access use status)' \
+  - s'[--width=][--tabsize=][--ignore=][-w][-T][-I],c[-1,-w][-1,-T][-1,-I]' \
+    -k '( )' \
+  - s'[--]' -S '' -k '(all\  escape\  directory\  inode\  kilobytes\  numeric-uid-gid\  no-group\  hide-control-chars\  reverse\  size\  width= tabsize= almost-all\  ignore-backups\  classify\  file-type\  full-time\  ignore= dereference\ literal\  quote-name\  dired\  no-color\  7bit\  8bit\  recursive\  sort= format= time= no-group\  help\  version\ )' \
+  - s'[-]' -k '(a b c d f g i k l m n o p q r s t u x A B C F G L N Q R S U X 1
+w T I)' \
+  -- ls dir
+
+
+# Debian tar: viewing/extracting gzipped/compressed/bzip2ed/normal tar archives.
+compctl -f -x \
+	'C[-1,*[xt]*f*z*] p[2]' -g '*.tar.gz *.tar.Z *.tgz' + -g '*(/)' - \
+	'C[-1,*[xt]*f*I*] p[2]' -g '*.tar.bz *.tar.bz2 *.tbz' + -g '*(/)' - \
+	'C[-1,*[xt]*f*] p[2]' -g '*.tar' -- \
+	+ -g '*(/)' tar
+
+## tar: complete tar files (only .tar or .tar.* format) after -f, disable
+## completion for certain options, let user choose directory with -C,
+## complete GNU tar long options beginning with --.  The match-taropts
+## function prompts for GNU tar options, ensures one of the seven
+## mandatory options is given in the first argument to tar, and enforces
+## spaces after options that take an argument (this is required by GNU
+## tar and also makes filename completion possible for the -f option).
+## Note that the -[0-7][lmh] options are not completed, but they're
+## hardly ever used.
+#compctl -f \
+#  -x 'C[-1,-*f],p[2] C[-1,*f],c[-1,--file]' -g '*.tar(|.*)' + -g '*(-/)' \
+#  - 'C[-1,-*[bLN]],p[2] C[-1,*[bLN]],c[-1,--block-size][-1,tape-length][-1,--after-date][-1,--newer]' -k '( )' \
+#  - 'C[-1,-*C],p[2] C[-1,*C],c[-1,directory]' -g '*(-/)' \
+#  - 'C[-1,-*[FgKTV]],p[2] C[-1,*[FgKTV]],c[-1,--info-script][-1,--new-volume-script][-1,--starting-file][-1,--files-from][-1,--label][-1,--exclude]' -f \
+#  - 's[--]' -k '(catenate concatenate create diff compare delete append list update extract get atime-preserve block-size read-full-blocks directory checkpoint file force-local info-script new-volume-script incremental dereference ignore-zeros ignore-failed-read keep-old-files starting-file one-file-system tape-length modification-time multi-volume after-date newer old-archive portability to-stdout same-permissions preserve-permissions absolute-paths preserve record-number remove-files same-order preserve-order same-owner sparse files-from null totals verbose label version interactive confirmation verify exclude exclude-from compress uncompress gzip ungzip use-compress-program block-compress)' \
+#  - 's[-],p[1]' -S '' -K 'match-taropts' \
+#  -- tar
+
+# GNU find.
+# Note that 'r[-exec,;]' must come first.
+# We hardwire the filesystem types rather than use /proc/filesystems, in order
+# not to exclude filesystems that are supported through modules that are
+# currently not loaded.
+compctl -x 'r[-exec,;][-ok,;]' -l '' - \
+'s[-]' -s 'daystart {max,min,}depth follow noleaf version xdev mount \
+        {a,c,}newer {a,c,m}{min,time} empty false {fs,x,}type {u,g}id inum \
+	links {i,}{l,}name {no,}{user,group} {i,}path perm {i,}regex size \
+	true used exec {f,}print{f,0,} ok prune {f,}ls or not and' - \
+'p[1]' -g '. .. *(-/)' - \
+'C[-1,-((a|c|)newer|fprint(|0|f))]' -f - \
+'c[-1,-fstype]' -k '(ext2 fat iso9660 minix nfs vfat)' - \
+'c[-1,-type]' -k '(b c d p f l s)' -X '[b]lock dev, [c]har dev, [d]ir, named [p]ipe, regular [f]ile, [s]ocket' - \
+'c[-1,-size]' -k '(1234c 567k)' -X '512-byte [b]locks, [c] bytes, [k]ilobytes, 2-byte [w]ords' - \
+'c[-1,-group]' -k c_groups - \
+'c[-1,-user]' -u -- find
+
+
+############################################################################
+# Commands that are usually used on non-generated files.
+
+compctl -g '*.gz *.Z *.bz2' \
+	+ -g '*.web *.docbook' \
+	+ -g '*.c *.cc *.C *.cxx *.cpp *.h *.tex *.txt *.html' \
+	+ -g '^*.(o|a|so|aux|dvi|log|swp|fig|bbl|blg|bst|idx|ind|out|toc)' \
+	+ -g '.*' \
+	+ -g '*(/)' vi vim gvim less grep zgrep
+
+############################################################################
+# Mail
+# TODO: mutt
+
+############################################################################
+# Document processing
+
+compctl -g '*.tex' + -g '*(/)' tex
+compctl -g '*.tex *.ltx' + -g '*(/)' {latex,pdflatex} 
+compctl -g '*.texi' + -g '*(/)' texi2{dvi,pdf,html}
+
+function c_bibtex {
+	reply=(`ls *.aux | sed -e 's/\.aux//'`);
+}
+compctl -K c_bibtex bibtex
+
+
+############################################################################
+# Viewers, editors etc.
+
+compctl -g '*.gz *.Z' + -g '*(/)' zcat gunzip gzcat zless
+compctl -g '*.bz *.bz2' + -g '*(/)' bzcat bz2cat bunzip2
+compctl -g '*.ps *.ps.gz *.pdf *.pdf.gz *.eps *.eps.gz' + -g '*(/)' gv
+compctl -g '*.(e|)ps' + -g '*(-/)' gs ghostview ps2ascii ps2text psnup ps2pdf
+compctl -g '*.pdf' + -g '*(/)' acroread xpdf
+compctl -g '*.dvi *.dvi.gz' + -g '*(/)' xdvi
+compctl -g '*.dvi' + -g '*(/)' dvi2fax dvidvi dvilj dvilj4 dvips dvitomp \
+	dvicopydvihp dvilj2p dvilj4l dvired dvitype
+compctl -g '*.html' + -g '*.htm' + -g '*(/)' w3m lynx mozilla netscape
+compctl -g '*.zip' + -g '*(/)' unzip
+compctl -g '*.fig' + -g '*(/)' xfig
+compctl -g '*.rtf' + -g '*(/)' Ted
+compctl -g '*.web' + -g '*(/)' tangle weave ftangle fweave ctangle cweave ctanglex cweavex
+
+# man: complete commands, otherwise complete by search of $MANPATH.
+# This is placed as an all-encompassing pattern at the end because making it
+# the default before the -x doesn't work.  (It becomes
+# '-c + (-K 'match-man' -x ...), not (-c + -K 'match-man') -x ...).
+# We also complete paths for -M (override manpath), commands for -P (pager) and
+# disable for -S (search sections).  After an explicit number (which it helps
+# to complete for you), these completion rules assume a thorough search is
+# needed and no longer use the '-c' hashed commands, relying entirely on
+# what's really in the manpath.
+# Also support -l <file> and -T<device>
+c_man_var() {
+   man_pages=( /usr/share/man/man*/*(N:t:r) /usr/man/man*/*(N:t:r) )
+   compctl -k man_pages man
+   reply=( $man_pages )
+}
+compctl -x 'S[1][2][3][4][5][6][7][8][9]' -k '(1 2 3 4 5 6 7 8 9)' \
+  - 'R[[1-9nlo]|[1-9](|[a-z]),^*]' -K 'match-man' \
+  - 's[-M],c[-1,-M]' -g '*(-/)' \
+  - 's[-P],c[-1,-P]' -c \
+  - 's[-S],s[-1,-S]' -k '( )' \
+  - 's[-l],c[-1,-l]' -g '*.[0-9] *.man' \
+  - 's[-T]' -k '(X100 X75 ascii latin1 ps X100-12 X75-12 dvi lj4)' \
+  - 's[-]' -k '(a d f h k t M P l)' \
+  - 'p[1,-1]' -c + -K 'c_man_var' \
+  -- man
+
+function c_enscript_langs {
+# languages and file formats for which enscript supports pretty-printing
+	reply=(`enscript --help-pretty-print | grep '^Name:' | sed -e 's/Name: //'`)
+}
+compctl -g '*' + -g '*(/)' -x s'[-E][--pretty-print]' -P '=' -K c_enscript_langs \
+  - s'[--]' -S '' -k '(columns= pages= file-align= header= no-header\  truncate-lines\  line-numbers\  setpagedevice= escapes\  pretty-print\  pretty-print= font= header-font= fancy-header\  no-job-header\  highlight-bars= indent= filter= borders\  page-prefeed\  no-page-prefeed\  lineprinter\  lines-per-page= mail\  media= copies= newline= missing-characters\  output= printer= quiet\  silent\  landscape\  portrait\  baselineskip= statusdict= title=  tabsize= underlay\  nup=  verbose\  version\  language= encoding= no-formfeed\  pass-through\  ps-level= rotate-even-pages\  toc\  word-wrap\ )' \
+	-- enscript
+
+############################################################################
+# Networking
+
+function c_lftp_bookmarks {
+# extract the names of bookmarks from the lftp bookmarks file.
+	reply=(`cut -c '1-17' ~/.lftp/bookmarks \
+		| sed -e 's/[^a-zA-Z0-9\-]//g' `); 
+}
+compctl -K c_lftp_bookmarks lftp
+
+function c_ssh_knownhosts {
+# extract the hosts which are known to ssh.
+	reply=(`sed -e 's/ .*$//' \
+		    -e 's/,[0-9]\{3\}\..*//' ~/.ssh/known_hosts`);
+}
+#compctl -K c_ssh_knownhosts ssh
+
+# Complete the current word with files after a `:', with ssh
+# hosts after a `@', and with hosts or files (in that order)
+# at the start of a word.
+compctl -x 'n[0,:]' -f - 'n[0,@],s[]' -K c_ssh_knownhosts -S: + -f --  \
+        scp
+
+# This completes `ssh [username@]host remotecommand'.
+# TODO: how do we get the -X working?
+compctl -x \
+	'C[-1,*@*]' -X '<Remote command>' - \
+	'n[0,@],s[]' -K c_ssh_knownhosts \
+	-- ssh
+#compctl -K c_ssh_knownhosts -x 'c[-1,-l]' -k '()' -X 'Remote user name'  -- slogin
+#compctl -x 'n[0,@],s[]' -K c_ssh_knownhosts - \
+#	'c[-1,-l]' -k '()' -X 'Remote user name' - \
+#	'C[-1,*@*]' -k '(kiekeboe)' -- ssh
+
+## As above, but do 'ssh [host] [-l user] [command]' where
+## <command> is a separate command line (i.e., to be executed
+## via ssh as <user> on <host>).
+#compctl -x 'p[1], p[2] C[-1,-*]' -K c_ssh_knownhosts \
+#  - 'c[-1,-l]' -K userlist -- \
+#  + -x 'w[2,-l] p[4,-1],p[2,-1]' -l '' -- ssh
+
+
+############################################################################
+# Program development
+
+# strip, profile, and debug only executables.  The compctls for the
+# debuggers could be better, of course.
+compctl -g '*(*)' strip gprof gdb ddd
+
+# GCC completion, based on Andrew Main's; updated for gcc 2.95.2 .
+# completes to filenames (*.c, *.C, *.o, etc.); to miscellaneous options after
+# a -; to various -f options after -f (and similarly -W, -g and -m); and to a
+# couple of other things at different points.
+# The -m completion should be tailored to each system; the one below is i386.
+compctl -g '*.([cCmisSoa]|cc|cxx|cpp|ii)' -x \
+        's[-l]' -s '${(s.:.)^LD_LIBRARY_PATH}/lib*.a(:t:r:s/lib//)' - \
+        'c[-1,-x]' -k '(none c objective-c c-header c++ cpp-output assembler ass
+embler-with-cpp)' - \
+        'c[-1,-o]' -f - \
+        'C[-1,-i(nclude|macros)]' -g '*.h' - \
+        'C[-1,-i(dirafter|prefix)]' -g '*(-/)' - \
+        's[-B][-I][-L]' -g '*(-/)' - \
+        's[-fno-],s[-f]' -k '(lang-isoc9x
+          allow-single-precision cond-mismatch asm
+          builtin freestanding hosted signed-bitfields signed-char
+          unsigned-bitfields unsigned-char writable-strings 
+          access-control check-new conserve-space dollars-in-identifiers 
+          elide-constructors external-templates for-scope gnu-keywords 
+          guiding-decls handle-signatures honor-std huge-objects
+          implicit-templates init-priority implement-inlines 
+          name-mangling-version-N default-inline operator-names optional-diags 
+          permissive repo strict-prototype squangle template-depth-N
+          this-is-variable vtable-chunks
+          syntax-only
+          all-virtual dollars-in-identifiers elide-constructors enum-int-equiv 
+          memoize-lookups nonnull-objects
+          dump-unnumbered pretend-float profile-arcs test-coverage 
+	  branch-probabilities optimize-register-moves caller-saves 
+          cse-follow-jumps cse-skip-blocks delayed-branch 
+          expensive-optimizations fast-math float-store force-addr force-mem 
+          data-sections function-sections gcse inline-functions inline-limit-3
+          keep-inline-functions default-inline defer-pop function-cse inline 
+          peephole omit-frame-pointer regmove rerun-cse-after-loop 
+          rerun-loop-opt schedule-insns schedule-insns2 strength-reduce 
+          thread-jumps unroll-all-loops unroll-loops move-all-movables 
+          reduce-all-givs strict-aliasing
+          call-saved- call-used- exceptions fixed- inhibit-size-directive 
+          check-memory-usage prefix-function-name common ident gnu-linker 
+          pcc-struct-return pic PIC reg-struct-return shared-data short-enums 
+          short-double volatile volatile-global volatile-static verbose-asm 
+          pack-struct stack-check argument-alias argument-noalias 
+          argument-noalias-global leading-underscore)' - \
+        's[-g]' -k '(gdb stabs stabs+ coff xcoff xcoff+ dwarf dwarf+ 
+          dwarf-2)' - \
+        's[-mno-][-mno][-m]' -k '(486 ieee-fp no-fancy-math-387 fp-ret-in-387
+          soft-float svr3-shlib no-wide-multiply rtd align-double align-jumps=
+          align-loops= align-functions= preferred-stack-boundary=)' - \
+        's[-Wno-][-W]' -k '(
+          all aggregate-return bad-function-cast cast-align cast-qual
+          char-subscripts comment conversion error format id-clash-8
+          implicit implicit-int implicit-function-declaration import
+          error-implicit-function-declaration inline larger-than-64
+          long-long main missing-declarations missing-noreturn
+          missing-prototypes multichar nested-externs import parentheses 
+          pointer-arith redundant-decls return-type shadow sign-compare 
+          strict-prototypes switch traditional trigraphs undef uninitialized 
+          unused write-strings unknown-pragmas
+          template-debugging 
+          ctor-dtor-privacy deprecated effc++ non-template-friend
+          non-virtual-dtor old-style-cast overloaded-virtual pmf-conversions
+          reorder sign-promo synth)' - \
+        's[-]' -k '(pipe ansi traditional traditional-cpp trigraphs pedantic 
+          pedantic-errors nostartfiles nostdlib static shared symbolic include 
+          imacros idirafter iprefix iwithprefix nostdinc nostdinc++ undef
+          print-file-name= print-libgcc-file-name print-prog-name= 
+          -print-search-dirs -save-temps)' \
+          -X 'Use "-f", "-g", "-m" or "-W" for more options' -- gcc g++
+
+compctl -x 's[--]' -S '' -k '(verbose\  prefix= exec-prefix= help\  build= host=
+	norecursion\  program-prefix= program-suffix= program-transform-name= 
+	site= srcdir= target= tmpdir= with- without- enable- disable- )' -- \
+	./configure
+
+compctl -g '*(/)' \
+	-x 's[-]' -P '-' -k '(
+	sign clearsign detachsign encrypt symmetric store decrypt verify 
+	listkeys listsigs checksigs fingerprint listsecretkeys genkey 
+	deletekey editkey genrevoke export import listpackets
+	armor localuser remoteuser textmode output verbose batch yes 
+	no keyring secretkeyring defaultkey options debug debugall 
+	statusfd nocomment completesneeded marginalsneeded 
+	loadextension rfc1991 s2kmode s2kdigestalgo s2kcipheralgo 
+	cipheralgo digestalgo compressalgo throwkeyid)' -- gpg
+
+# procps
+#   ps
+#   uptime
+compctl -x 'p[1]' -k '(-V)' -- uptime
+compctl -x 'p[1]' -k '(-V)' + -k '(-s -d)' -- tload
+
+
+############################################################################
+# Administrative commands
+
+compctl -u -x 'w[2,-c] p[3,-1]' -l '' - \
+	's[--]' -s 'fast help login preserve-environment shell version' -- su
+
+#if type rpm >/dev/null; then
+#function pkg_glob () {
+#    if [[ ${REDHAT_PACKAGES:-0} = 0 ]]; then
+#        export REDHAT_PACKAGES="`rpm -qa`"
+#    fi
+#    reply=(${=REDHAT_PACKAGES})
+#}
+#function refreshpkgcache () {
+#    export REDHAT_PACKAGES="`rpm -qa`"
+#}
+#compctl -f -x \
+#    'c[-1,--root]' -g '*(/)' - \
+#    'W[1,-(-install|i*)] s[--]' -k (hash percent force test replacepkgs replacefiles search root) - \
+#    'W[1,-(-upgrade|u*)] s[--]' -k (hash percent force test search oldpackage root) - \
+#    'C[-1,--(install|upgrade)] s[-],p[1] s[-i],p[1] s[-U]' -X "(h)ash (v)erbose" - \
+#    'W[1,-(-erase|e|-verify|V|y)] s[--]' -k (root) - \
+#    'W[1,-(-erase|e)]' -K pkg_glob - \
+#    'w[1,--query] s[-],p[1] s[-q],p[1] s[-V],p[1] s[-y]' -X \
+#"(a)ll (f)ile+ (F)ile-stdin (p)kg+ (P)kg-Stdin \
+#(i)nfo (l)ist-of-files (s)tates-of-files (d)ocumentation (c)onfiguration" - \
+#    'w[1,--verify] s[-],p[1] s[-V],p[1] s[-y]' -X \
+#"(a)ll (f)ile+ (F)ile-stdin (p)kg+ (P)kg-Stdin" - \
+#    'W[1,-(-verify|-query|q*|V*|y*)] C[-1,*f]' -f - \
+#    'W[1,-(-verify|-query|q*|V*|y*)] C[-1,*p*]' -g '*(D-/) *.rpm(N)' - \
+#    'W[1,-(-verify|-query|q*|V*|y*)]' -K pkg_glob - \
+#    'W[1,--(where|checksig)]' -K pkg_glob - \
+#    'W[1,--rebuild] s[-]' -k (v) - \
+#    'p[1] s[-b]' -X "(p)rep (l)ist (c)ompile (i)install (b)inary (a)ll" - \
+#    'p[2] C[-1,-b*] s[--]' -k (short-circuit clean sign keep-temps test time-check) - \
+#    's[--]' -k (help version install upgrade query verify erase rebuild where checksig) - \
+#    's[-]' -k (- i U q V e b) - \
+#    'c[-1,rpm]' -X "$(rpm)" -- rpm
+#fi #if rpm exists
+
+
+compctl -k '(if of conv ibs obs bs cbs files skip file seek count)' \
+        -S '=' -x 's[if=], s[of=]' -f - 'C[0,conv=*,*] n[-1,,], s[conv=]' \
+        -k '(ascii ebcdic ibm block unblock lcase ucase swap noerror sync)' \
+        -q -S ',' - 'n[-1,=]' -X ''  -- dd
+
+
+############################################################################
+# Debian specific
+source "/usr/share/doc/zsh/examples/compctl.dpkg"
+
+compctl -x 'c[-1,-x]' -g '*.dsc' + -g '*(/)' - \
+	   'c[-1,-b]' -g '*(/)' -- dpkg-source
+compctl -g '*.deb' + -g '*(/)' lintian
+compctl -g '*.changes' + -g '*(/)' dupload
+
+#compctl \
+#	-x 'p[1]s[--]' \
+#		-k '(setup-lab remove-lab check check-part unpack remove \
+#		     help verbose version debug)' -- \
+#	+ -x 's[--]' -k '(help verbose version debug)' -- \
+#	+ -g '*.deb' + -g '*(/)' \
+#	lintian
+
+
--- zsh-4.3.10.orig/debian/examples/compctl.dpkg
+++ zsh-4.3.10/debian/examples/compctl.dpkg
@@ -0,0 +1,92 @@
+#############################################################################
+# Dpkg completion control for zsh.
+#
+# NOTE: Completion for these commands (dpkg, dpkg-source, bug)
+# are included # upstream as part of the new completion system.
+# Seriously consider using that instead.
+#
+# Originally by Joey Hess <joey@kite.ml.org>, GPL copyright.
+# Contributions and fixes from Karl Hegbloom, Fabien Ninoles,
+# Gregor Hoffleit, Csaba Benedek, &c.
+#
+# Currently doesn't handle correctly:
+#       Options after -D or --debug.
+#       --force- and friends,--ignore-depends,--root= and friends.
+
+# A function to return all available package names.
+# This could be done without grep and awk by replacing that line with
+# reply=(${${(M)${(f)"$(</var/lib/dpkg/status)"}:#Package:*}#Package: })
+function DpkgPackages {
+        reply=(`grep '^Package:' /var/lib/dpkg/status | awk '{ print $2 }'`)
+}
+
+# This array lists all the dpkg options and actions.
+dpkg_options=(-i --install --unpack --configure -r --remove --purge -A \
+--avail --update-avail --merge-avail --yet-to-unpack -l --list -L \
+--listfiles -C --audit -S --search -s --status --help -c --contents -I \
+--info -B --auto-deconfigure -D --debug --largemem --smallmem --no-act \
+-R --recursive -G -O --selected-only -E -e --control --skip-same-version \
+-x --extract -f --field --fsys-tarfile -X --vextract --licence --version \
+-b --build)
+
+# This string lists all dpkg actions that operate on *.deb files, 
+# separated by |'s. There can't be any extra whitespace in it!
+dpkg_deb_actions="-i|--install|--unpack|-A|--avail|-c|--contents|-I|--info|-e"
+dpkg_deb_actions="$dpkg_deb_actions|--control|-x|--extract|-f|--field"
+dpkg_deb_actions="$dpkg_deb_actions|--fsys-tarfile|-X|--vextract|-info"
+
+# This string lists all dpkg actions that normally operate on *.deb files,
+# but can operate on directory names if the --recursive option is given to 
+# dpkg.
+dpkg_deb_rec_actions="-i|--install|--unpack|-A|--avail"
+
+# This string lists all other dpkg actions that take a directory name as 
+# their first parameter, and a filename as their second parameter.
+dpkg_df_actions="-b|--build"
+
+# This string lists dpkg actions that take a directory name as 
+# their second parameter.
+dpkg_dir2_actions="-e|--control|-x|--extract|--vextract"
+
+# This string lists all dpkg actions that take a filename as their first
+# parameter (ie, a Packages file).
+dpkg_file_actions="-S|--search|--update-avail|--merge-avail"
+
+# This string lists all dpkg actions that operate on the names of packages
+# and can also be used with the --pending option.
+dpkg_pkg_pending_actions="--configure|-r|--remove|--purge|-s|--status"
+
+# This string lists all other dpkg actions that operate on the names of 
+# packages.
+dpkg_pkg_actions="-L|--listfiles|-s|--status|-l|--list"
+
+# Now the command that puts it all together..
+compctl -k dpkg_options \
+  -x "C[-1,$dpkg_deb_rec_actions],R[-R|--recursive,]" -g '*(-/D)' \
+  - "C[-1,$dpkg_deb_actions]" -g '*.deb' + -g '*(-/D)' \
+  - "C[-1,$dpkg_pkg_pending_actions]" -K DpkgPackages + -k "(-a,--pending)" \
+  - "C[-1,$dpkg_pkg_actions]" -K DpkgPackages \
+  - "C[-1,$dpkg_file_actions],C[-2,$dpkg_df_actions]" -f \
+  - "C[-2,$dpkg_dir2_actions],C[-1,$dpkg_df_actions]" -g '*(-/D)' \
+  -- dpkg
+
+# Also, set up package name completion for bug program.
+compctl -K DpkgPackages bug
+
+# This section by Karl M. Hegbloom
+
+dpkg_source_options=(-x -b -c -l -F -V -T -D -U \
+-sa -sk -sp -su -sr -ss -sn -sA -sK -sP -sU -sR \
+-h --help)
+
+compctl -k dpkg_source_options \
+ -x "C[-1,-x]" -g '*.dsc' \
+ - "C[-1,-b]" -g '*(-/D)' \
+ -- dpkg-source
+
+# Unset the temporary variables.
+unset dpkg_deb_actions dpkg_deb_rec_actions dpkg_df_actions \
+        dpkg_dir2_actions dpkg_file_actions dpkg_pkg_pending_actions \
+        dpkg_pkg_actions # dpkg_source_options dpkg_options
+
+#############################################################################
--- zsh-4.3.10.orig/debian/examples/ssh_completion2
+++ zsh-4.3.10/debian/examples/ssh_completion2
@@ -0,0 +1,37 @@
+NOTE: In order for this to work with newer versions of ssh, you must  
+insure that "HashKnownHosts" is set to "no".
+
+This is what I would call overkill, but it should help illustrate
+what some people like to do with ssh completion.
+----------
+
+zstyle ':completion:*' format 'Completing %d'
+zstyle ':completion:*' group-name ''
+
+zstyle ':completion:*:scp:*' tag-order \
+	'hosts:-host hosts:-domain:domain hosts:-ipaddr:IP\ address *'
+zstyle ':completion:*:scp:*' group-order \
+	users files all-files hosts-domain hosts-host hosts-ipaddr
+zstyle ':completion:*:ssh:*' tag-order \
+	users 'hosts:-host hosts:-domain:domain hosts:-ipaddr:IP\ address *'
+zstyle ':completion:*:ssh:*' group-order \
+	hosts-domain hosts-host users hosts-ipaddr
+
+zstyle ':completion:*:(ssh|scp):*:hosts-host' ignored-patterns \
+	'*.*' loopback localhost
+zstyle ':completion:*:(ssh|scp):*:hosts-domain' ignored-patterns \
+	'<->.<->.<->.<->' '^*.*' '*@*'
+zstyle ':completion:*:(ssh|scp):*:hosts-ipaddr' ignored-patterns \
+	'^<->.<->.<->.<->' '127.0.0.<->'
+zstyle ':completion:*:(ssh|scp):*:users' ignored-patterns \
+	adm bin daemon halt lp named shutdown sync
+
+zstyle -e ':completion:*:(ssh|scp):*' hosts 'reply=(
+	${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) \
+			/dev/null)"}%%[# ]*}//,/ }
+	${=${(f)"$(cat /etc/hosts(|)(N) <<(ypcat hosts 2>/dev/null))"}%%\#*}
+	)'
+
+zstyle ':completion:*:(ssh|scp):*:my-accounts' users-hosts \
+	my.secret.account@student.uu.se
+
--- zsh-4.3.10.orig/Src/hist.c
+++ zsh-4.3.10/Src/hist.c
@@ -1156,6 +1156,7 @@
 	zfree(chline, hlinesz);
 	zfree(chwords, chwordlen*sizeof(short));
 	chline = NULL;
+	chwords = NULL;
 	histactive = 0;
 	unqueue_signals();
 	return 1;
@@ -1270,6 +1271,7 @@
     zfree(chline, hlinesz);
     zfree(chwords, chwordlen*sizeof(short));
     chline = NULL;
+    chwords = NULL;
     histactive = 0;
     if (isset(SHAREHISTORY)? histfileIsLocked() : isset(INCAPPENDHISTORY))
 	savehistfile(hf, 0, HFILE_USE_OPTIONS | HFILE_FAST);
--- zsh-4.3.10.orig/Src/system.h
+++ zsh-4.3.10/Src/system.h
@@ -37,7 +37,7 @@
 #endif
 #endif
 
-#if defined(__linux) || defined(__GNU__)
+#if defined(__linux) || defined(__GNU__) || defined(__GLIBC__)
 /*
  * Turn on numerous extensions.
  * This is in order to get the functions for manipulating /dev/ptmx.
--- zsh-4.3.10.orig/Doc/zshmodules.1
+++ zsh-4.3.10/Doc/zshmodules.1
@@ -1435,7 +1435,7 @@
 available, the \fBRCS\fP option is set, and the \fBPRIVILEGED\fP option is not
 set (all three are true by default)\&.  This takes
 place immediately after commands in the global \fBzshenv\fP file (typically
-\fB/etc/zshenv\fP), if any, have been executed\&.  If the module is not
+\fB/etc/zsh/zshenv\fP), if any, have been executed\&.  If the module is not
 available it is silently ignored by the shell; the module may safely be
 removed from \fB$MODULE_PATH\fP by the administrator if it is not required\&.
 .PP
@@ -1464,7 +1464,7 @@
 The \fBzsh/newuser\fP module is then unconditionally unloaded\&.
 .PP
 Note that it is possible to achieve exactly the same effect as the
-\fBzsh/newuser\fP module by adding code to \fB/etc/zshenv\fP\&.  The module
+\fBzsh/newuser\fP module by adding code to \fB/etc/zsh/zshenv\fP\&.  The module
 exists simply to allow the shell to make arrangements for new users without
 the need for intervention by package maintainers and system administrators\&.
 .PP
--- zsh-4.3.10.orig/Doc/ztexi.yo
+++ zsh-4.3.10/Doc/ztexi.yo
@@ -71,7 +71,7 @@
   NOTRANS(@ifinfo)+NL()\
   NOTRANS(@dircategory Utilities)+NL()\
   NOTRANS(@direntry)+NL()\
-  NOTRANS(     * ZSH: (zsh).                     The Z Shell Manual.)+NL()\
+  NOTRANS(* ZSH: (zsh).                     The Z Shell Manual.)+NL()\
   NOTRANS(@end direntry)+NL()\
   NOTRANS(@end ifinfo)+NL()\
 )
--- zsh-4.3.10.orig/Doc/zshall.1
+++ zsh-4.3.10/Doc/zshall.1
@@ -439,7 +439,7 @@
 files\&.
 .\" Yodl file: Zsh/files.yo
 .SH "STARTUP/SHUTDOWN FILES"
-Commands are first read from \fB/etc/zshenv\fP; this cannot be overridden\&.
+Commands are first read from \fB/etc/zsh/zshenv\fP; this cannot be overridden\&.
 Subsequent behaviour is modified by the \fBRCS\fP and
 \fBGLOBAL_RCS\fP options; the former affects all startup files, while the
 second only affects global startup files (those shown here with an
@@ -452,14 +452,14 @@
 .PP
 Commands are then read from \fB$ZDOTDIR/\&.zshenv\fP\&.
 If the shell is a login shell, commands
-are read from \fB/etc/zprofile\fP and then \fB$ZDOTDIR/\&.zprofile\fP\&.
+are read from \fB/etc/zsh/zprofile\fP and then \fB$ZDOTDIR/\&.zprofile\fP\&.
 Then, if the shell is interactive,
-commands are read from \fB/etc/zshrc\fP and then \fB$ZDOTDIR/\&.zshrc\fP\&.
-Finally, if the shell is a login shell, \fB/etc/zlogin\fP and
+commands are read from \fB/etc/zsh/zshrc\fP and then \fB$ZDOTDIR/\&.zshrc\fP\&.
+Finally, if the shell is a login shell, \fB/etc/zsh/zlogin\fP and
 \fB$ZDOTDIR/\&.zlogin\fP are read\&.
 .PP
 When a login shell exits, the files \fB$ZDOTDIR/\&.zlogout\fP and then
-\fB/etc/zlogout\fP are read\&.  This happens with either an explicit exit
+\fB/etc/zsh/zlogout\fP are read\&.  This happens with either an explicit exit
 via the \fBexit\fP or \fBlogout\fP commands, or an implicit exit by reading
 end\-of\-file from the terminal\&.  However, if the shell terminates due
 to \fBexec\fP'ing another process, the logout files are not read\&.
@@ -472,7 +472,7 @@
 Files listed above as being in \fB/etc\fP may be in another
 directory, depending on the installation\&.
 .PP
-As \fB/etc/zshenv\fP is run for all instances of zsh, it is important that
+As \fB/etc/zsh/zshenv\fP is run for all instances of zsh, it is important that
 it be kept as small as possible\&.  In particular, it is a good idea to
 put code that does not need to be run for every single shell behind
 a test of the form `\fBif [[ \-o rcs ]]; then \&.\&.\&.\fP' so that it will not
@@ -514,15 +514,15 @@
 .TP
 \fB${TMPPREFIX}*\fP   (default is /tmp/zsh*)
 .TP
-\fB/etc/zshenv\fP
+\fB/etc/zsh/zshenv\fP
 .TP
-\fB/etc/zprofile\fP
+\fB/etc/zsh/zprofile\fP
 .TP
-\fB/etc/zshrc\fP
+\fB/etc/zsh/zshrc\fP
 .TP
-\fB/etc/zlogin\fP
+\fB/etc/zsh/zlogin\fP
 .TP
-\fB/etc/zlogout\fP    (installation\-specific \- \fB/etc\fP is the default)
+\fB/etc/zsh/zlogout\fP    (installation\-specific \- \fB/etc\fP is the default)
 .PD
 .\" Yodl file: Zsh/seealso.yo
 .SH "SEE ALSO"
--- zsh-4.3.10.orig/Doc/zshtcpsys.1
+++ zsh-4.3.10/Doc/zshtcpsys.1
@@ -468,7 +468,7 @@
 .RE
 .RE
 .PP
-.SH "TCP USER\-DEFINED FUNCTIONS"
+.SH "TCP USER\e\-DEFINED FUNCTIONS"
 .PP
 Certain functions, if defined by the user, will be called by the function
 system in certain contexts\&.  This facility depends on the module
@@ -724,7 +724,7 @@
 May be set directly\&.  Currently this is only used by the function
 \fBtcp_command\fP, see above\&.
 .PP
-.SH "TCP USER\-DEFINED PARAMETERS"
+.SH "TCP USER\e\-DEFINED PARAMETERS"
 .PP
 The following parameters are not set by the function system, but have
 a special effect if set by the user\&.
--- zsh-4.3.10.orig/Doc/zsh.1
+++ zsh-4.3.10/Doc/zsh.1
@@ -442,7 +442,7 @@
 files\&.
 .\" Yodl file: Zsh/files.yo
 .SH "STARTUP/SHUTDOWN FILES"
-Commands are first read from \fB/etc/zshenv\fP; this cannot be overridden\&.
+Commands are first read from \fB/etc/zsh/zshenv\fP; this cannot be overridden\&.
 Subsequent behaviour is modified by the \fBRCS\fP and
 \fBGLOBAL_RCS\fP options; the former affects all startup files, while the
 second only affects global startup files (those shown here with an
@@ -455,14 +455,14 @@
 .PP
 Commands are then read from \fB$ZDOTDIR/\&.zshenv\fP\&.
 If the shell is a login shell, commands
-are read from \fB/etc/zprofile\fP and then \fB$ZDOTDIR/\&.zprofile\fP\&.
+are read from \fB/etc/zsh/zprofile\fP and then \fB$ZDOTDIR/\&.zprofile\fP\&.
 Then, if the shell is interactive,
-commands are read from \fB/etc/zshrc\fP and then \fB$ZDOTDIR/\&.zshrc\fP\&.
-Finally, if the shell is a login shell, \fB/etc/zlogin\fP and
+commands are read from \fB/etc/zsh/zshrc\fP and then \fB$ZDOTDIR/\&.zshrc\fP\&.
+Finally, if the shell is a login shell, \fB/etc/zsh/zlogin\fP and
 \fB$ZDOTDIR/\&.zlogin\fP are read\&.
 .PP
 When a login shell exits, the files \fB$ZDOTDIR/\&.zlogout\fP and then
-\fB/etc/zlogout\fP are read\&.  This happens with either an explicit exit
+\fB/etc/zsh/zlogout\fP are read\&.  This happens with either an explicit exit
 via the \fBexit\fP or \fBlogout\fP commands, or an implicit exit by reading
 end\-of\-file from the terminal\&.  However, if the shell terminates due
 to \fBexec\fP\&'ing another process, the logout files are not read\&.
@@ -475,7 +475,7 @@
 Files listed above as being in \fB/etc\fP may be in another
 directory, depending on the installation\&.
 .PP
-As \fB/etc/zshenv\fP is run for all instances of zsh, it is important that
+As \fB/etc/zsh/zshenv\fP is run for all instances of zsh, it is important that
 it be kept as small as possible\&.  In particular, it is a good idea to
 put code that does not need to be run for every single shell behind
 a test of the form `\fBif [[ \-o rcs ]]; then \&.\&.\&.\fP\&' so that it will not
@@ -501,15 +501,15 @@
 .TP
 \fB${TMPPREFIX}*\fP   (default is /tmp/zsh*)
 .TP
-\fB/etc/zshenv\fP
+\fB/etc/zsh/zshenv\fP
 .TP
-\fB/etc/zprofile\fP
+\fB/etc/zsh/zprofile\fP
 .TP
-\fB/etc/zshrc\fP
+\fB/etc/zsh/zshrc\fP
 .TP
-\fB/etc/zlogin\fP
+\fB/etc/zsh/zlogin\fP
 .TP
-\fB/etc/zlogout\fP    (installation\-specific \- \fB/etc\fP is the default)
+\fB/etc/zsh/zlogout\fP    (installation\-specific \- \fB/etc\fP is the default)
 .PD
 .\" Yodl file: Zsh/seealso.yo
 .SH "SEE ALSO"
--- zsh-4.3.10.orig/Doc/zsh.texi
+++ zsh-4.3.10/Doc/zsh.texi
@@ -1,4 +1,3 @@
-
 \input texinfo.tex
 @c %**start of header
 @iftex
@@ -20,7 +19,7 @@
 @ifinfo
 @dircategory Utilities
 @direntry
-     * ZSH: (zsh).                     The Z Shell Manual.
+* ZSH: (zsh).                     The Z Shell Manual.
 @end direntry
 @end ifinfo
 
@@ -1049,7 +1048,7 @@
 @pindex NO_GLOBAL_RCS, use of
 @vindex ZDOTDIR, use of
 @cindex zshenv
-Commands are first read from @t{/etc/zshenv}; this cannot be overridden.
+Commands are first read from @t{/etc/zsh/zshenv}; this cannot be overridden.
 Subsequent behaviour is modified by the @t{RCS} and
 @t{GLOBAL_RCS} options; the former affects all startup files, while the
 second only affects global startup files (those shown here with an
@@ -1065,18 +1064,18 @@
 @pindex LOGIN, use of
 @cindex zprofile
 If the shell is a login shell, commands
-are read from @t{/etc/zprofile} and then @t{$ZDOTDIR/.zprofile}.
+are read from @t{/etc/zsh/zprofile} and then @t{$ZDOTDIR/.zprofile}.
 @cindex zshrc
 Then, if the shell is interactive,
-commands are read from @t{/etc/zshrc} and then @t{$ZDOTDIR/.zshrc}.
+commands are read from @t{/etc/zsh/zshrc} and then @t{$ZDOTDIR/.zshrc}.
 @cindex zlogin
-Finally, if the shell is a login shell, @t{/etc/zlogin} and
+Finally, if the shell is a login shell, @t{/etc/zsh/zlogin} and
 @t{$ZDOTDIR/.zlogin} are read.
 
 @noindent
 @cindex zlogout
 When a login shell exits, the files @t{$ZDOTDIR/.zlogout} and then
-@t{/etc/zlogout} are read.  This happens with either an explicit exit
+@t{/etc/zsh/zlogout} are read.  This happens with either an explicit exit
 via the @t{exit} or @t{logout} commands, or an implicit exit by reading
 end-of-file from the terminal.  However, if the shell terminates due
 to @t{exec}'ing another process, the logout files are not read.
@@ -1092,7 +1091,7 @@
 directory, depending on the installation.
 
 @noindent
-As @t{/etc/zshenv} is run for all instances of zsh, it is important that
+As @t{/etc/zsh/zshenv} is run for all instances of zsh, it is important that
 it be kept as small as possible.  In particular, it is a good idea to
 put code that does not need to be run for every single shell behind
 a test of the form `@t{if [[ -o rcs ]]; then ...}' so that it will not
@@ -1109,11 +1108,11 @@
 @item @t{$ZDOTDIR/.zlogin}
 @item @t{$ZDOTDIR/.zlogout}
 @item @t{$@{TMPPREFIX@}*}   (default is /tmp/zsh*)
-@item @t{/etc/zshenv}
-@item @t{/etc/zprofile}
-@item @t{/etc/zshrc}
-@item @t{/etc/zlogin}
-@item @t{/etc/zlogout}    (installation-specific - @t{/etc} is the default)
+@item @t{/etc/zsh/zshenv}
+@item @t{/etc/zsh/zprofile}
+@item @t{/etc/zsh/zshrc}
+@item @t{/etc/zsh/zlogin}
+@item @t{/etc/zsh/zlogout}    (installation-specific - @t{/etc/zsh} is the Debian default)
 @item
 @end table
 @c (avoiding a yodl bug)
@@ -8796,8 +8795,8 @@
 @cindex startup files, global, inhibiting
 @cindex files, global startup, inhibiting
 @item @t{GLOBAL_RCS} (@t{-d}) <D>
-If this option is unset, the startup files @t{/etc/zprofile},
-@t{/etc/zshrc}, @t{/etc/zlogin} and @t{/etc/zlogout} will not be run.  It
+If this option is unset, the startup files @t{/etc/zsh/zprofile},
+@t{/etc/zsh/zshrc}, @t{/etc/zsh/zlogin} and @t{/etc/zsh/zlogout} will not be run.  It
 can be disabled and re-enabled at any time, including inside local startup
 files (@t{.zshrc}, etc.).
 
@@ -8806,11 +8805,11 @@
 @pindex NORCS
 @cindex startup files, sourcing
 @item @t{RCS} (@t{+f}) <D>
-After @t{/etc/zshenv} is sourced on startup, source the
-@t{.zshenv}, @t{/etc/zprofile}, @t{.zprofile},
-@t{/etc/zshrc}, @t{.zshrc}, @t{/etc/zlogin}, @t{.zlogin}, and @t{.zlogout}
+After @t{/etc/zsh/zshenv} is sourced on startup, source the
+@t{.zshenv}, @t{/etc/zsh/zprofile}, @t{.zprofile},
+@t{/etc/zsh/zshrc}, @t{.zshrc}, @t{/etc/zsh/zlogin}, @t{.zlogin}, and @t{.zlogout}
 files, as described in @ref{Files}.
-If this option is unset, the @t{/etc/zshenv} file is still sourced, but any
+If this option is unset, the @t{/etc/zsh/zshenv} file is still sourced, but any
 of the others will not be; it can be set at any time to prevent the
 remaining startup files after the currently executing one from
 being sourced.
@@ -24425,7 +24424,7 @@
 available, the @t{RCS} option is set, and the @t{PRIVILEGED} option is not
 set (all three are true by default).  This takes
 place immediately after commands in the global @t{zshenv} file (typically
-@t{/etc/zshenv}), if any, have been executed.  If the module is not
+@t{/etc/zsh/zshenv}), if any, have been executed.  If the module is not
 available it is silently ignored by the shell; the module may safely be
 removed from @t{$MODULE_PATH} by the administrator if it is not required.
 
@@ -24459,7 +24458,7 @@
 
 @noindent
 Note that it is possible to achieve exactly the same effect as the
-@t{zsh/newuser} module by adding code to @t{/etc/zshenv}.  The module
+@t{zsh/newuser} module by adding code to @t{/etc/zsh/zshenv}.  The module
 exists simply to allow the shell to make arrangements for new users without
 the need for intervention by package maintainers and system administrators.
 
@@ -27394,22 +27393,27 @@
 it returns status 0 and sets elements of the associative
 array @t{reply} as follows:
 @table @asis
-@item timeNL()The time as a string of digits in the same units as
+@item time
+The time as a string of digits in the same units as
 @t{$EPOCHSECONDS}
 @item text1
 The text from the line not including the date and time of the
 event, but including any @t{WARN} or @t{RPT} keywords and values.
-@item warntimeNL()Any warning time given by the @t{WARN} keyword as a string
+@item warntime
+Any warning time given by the @t{WARN} keyword as a string
 of digits containing the time at which to warn in the same units as
 @t{$EPOCHSECONDS}.  (Note this is an absolute time, not the relative time
 passed down.)  Not set no @t{WARN} keyword and value were
 matched.
-@item warnstrNL()The raw string matched after the @t{WARN} keyword, else unset.
-@item rpttimeNL()Any recurrence time given by the @t{RPT} keyword as a string
+@item warnstr
+The raw string matched after the @t{WARN} keyword, else unset.
+@item rpttime
+Any recurrence time given by the @t{RPT} keyword as a string
 of digits containing the time of the recurrence in the same units
 as @t{$EPOCHSECONDS}.  (Note this is an absolute time.)  Not set if
 no @t{RPT} keyword and value were matched.
-@item rptstrNL()The raw string matched after the @t{RPT} keyword, else unset.
+@item rptstr
+The raw string matched after the @t{RPT} keyword, else unset.
 @item text2
 The text from the line after removal of the date and any
 keywords and values.
--- zsh-4.3.10.orig/Doc/zshoptions.1
+++ zsh-4.3.10/Doc/zshoptions.1
@@ -579,17 +579,17 @@
 .RE
 .TP
 \fBGLOBAL_RCS\fP (\fB\-d\fP) <D>
-If this option is unset, the startup files \fB/etc/zprofile\fP,
-\fB/etc/zshrc\fP, \fB/etc/zlogin\fP and \fB/etc/zlogout\fP will not be run\&.  It
+If this option is unset, the startup files \fB/etc/zsh/zprofile\fP,
+\fB/etc/zsh/zshrc\fP, \fB/etc/zsh/zlogin\fP and \fB/etc/zsh/zlogout\fP will not be run\&.  It
 can be disabled and re\-enabled at any time, including inside local startup
 files (\fB\&.zshrc\fP, etc\&.)\&.
 .TP
 \fBRCS\fP (\fB+f\fP) <D>
-After \fB/etc/zshenv\fP is sourced on startup, source the
-\fB\&.zshenv\fP, \fB/etc/zprofile\fP, \fB\&.zprofile\fP,
-\fB/etc/zshrc\fP, \fB\&.zshrc\fP, \fB/etc/zlogin\fP, \fB\&.zlogin\fP, and \fB\&.zlogout\fP
+After \fB/etc/zsh/zshenv\fP is sourced on startup, source the
+\fB\&.zshenv\fP, \fB/etc/zsh/zprofile\fP, \fB\&.zprofile\fP,
+\fB/etc/zsh/zshrc\fP, \fB\&.zshrc\fP, \fB/etc/zsh/zlogin\fP, \fB\&.zlogin\fP, and \fB\&.zlogout\fP
 files, as described in the section `Files\&'\&.
-If this option is unset, the \fB/etc/zshenv\fP file is still sourced, but any
+If this option is unset, the \fB/etc/zsh/zshenv\fP file is still sourced, but any
 of the others will not be; it can be set at any time to prevent the
 remaining startup files after the currently executing one from
 being sourced\&.
--- zsh-4.3.10.orig/Completion/Unix/Command/_bzr
+++ zsh-4.3.10/Completion/Unix/Command/_bzr
@@ -331,6 +331,16 @@
 	)
     ;;
 
+(switch)
+    args+=(
+	'--force[Switch even if local commits will be lost]'
+	'(-q --quiet -v --verbose)'{--quiet,-q}'[be quiet]'
+	'(-v --verbose -q --quiet)'{--verbose,-v}'[display more information]'
+	'*:local repository:_files -/'
+	)
+    _bzr_completeParents
+    ;;
+
 (help)
     args=(
 	'(-l --long)'{--long,-l}'[use long format]'
--- zsh-4.3.10.orig/Completion/Debian/Command/_bts
+++ zsh-4.3.10/Completion/Debian/Command/_bts
@@ -26,7 +26,7 @@
       reassign merge unmerge tag tags severity forwarded notforwarded help \
       clone submitter found notfound block unblock user usertag usertags \
       package owner noowner reportspam cache cleancache claim unclaim \
-      subscribe unsubscribe
+      subscribe unsubscribe fixed notfixed
   return
 fi
 
@@ -147,7 +147,7 @@
       _wanted sep expl 'separator' compadd -S ' ' , .
     fi
   ;;
-  (found|notfound)
+  (found|notfound|fixed|notfixed)
     if [[ CURRENT -eq 2 ]]; then
       _message -e bugnum 'bug number'
     elif [[ CURRENT -eq 3 ]]; then
--- zsh-4.3.10.orig/Completion/Debian/Command/_bug
+++ zsh-4.3.10/Completion/Debian/Command/_bug
@@ -41,7 +41,6 @@
       '(-x --no-cc)'{-x,--no-cc}'[do not cc submitter]' \
       '(-z --no-compress)'{-z,--no-compress}'[send configs verbatim]' \
       '(-a --af)'{-a,--af}'[use af instead of editor]' \
-      '(-b --no-bts-query)'{-b,--no-bts-query}'[do not check bts]' \
       '(-g --gpg --gnupg)'{-g,--gpg,--gnupg}'[sign report with GnuPG]' \
       '(-i --include)'{-i,--include}'[include text]:include file:_files' \
       '(-A --attach)'{-A,--attach=}'[attach file]:attachment:_files' \
@@ -82,7 +81,7 @@
       '--list-cc=:carbon copy:' \
       '--report-quiet' \
       '(-O --offline)'{-O,--offline}'[disable external queries]' \
-      '(-n --no-query-bts --query-bts)'{-b,--no-query-bts}'[do not query BTS]' \
+      '(-b --no-query-bts --query-bts)'{-b,--no-query-bts}'[do not query BTS]' \
       '(-b --no-query-bts)--query-bts' \
       '(-T --tags)'{-T,--tags=}'[add specified tags]:tags' \
       '(-m)--maintonly' \