[SVN] r655 - /trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch

debian at incase.de debian at incase.de
Tue Oct 10 13:27:54 UTC 2006


Author: sven
Date: Tue Oct 10 15:27:44 2006
New Revision: 655

URL: https://mail.incase.de/viewcvs?rev=655&root=cyrus22&view=rev
Log:
Revert most of the previous commit, it contained a lot of unintended garbage

Modified:
    trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch?rev=655&root=cyrus22&r1=654&r2=655&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch Tue Oct 10 15:27:44 2006
@@ -6,45197 +6,9 @@
 ## DP: (64bit-quota and potentially DRAC)
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13~/autom4te.cache/output.0 cyrus-imapd-2.2.13/autom4te.cache/output.0
---- cyrus-imapd-2.2.13~/autom4te.cache/output.0	1970-01-01 00:00:00.000000000 +0000
-+++ cyrus-imapd-2.2.13/autom4te.cache/output.0	2006-10-10 13:08:19.000000000 +0000
-@@ -0,0 +1,20030 @@
-+@%:@! /bin/sh
-+@%:@ Guess values for system-dependent variables and create Makefiles.
-+@%:@ Generated by GNU Autoconf 2.60a.
-+@%:@ 
-+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+@%:@ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+@%:@ This configure script is free software; the Free Software Foundation
-+@%:@ gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+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
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_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'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+if test "x$CONFIG_SHELL" = x; then
-+  if (eval ":") 2>/dev/null; then
-+  as_have_required=yes
-+else
-+  as_have_required=no
-+fi
-+
-+  if test $as_have_required = yes && 	 (eval ":
-+(as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+  as_lineno_1=\$LINENO
-+  as_lineno_2=\$LINENO
-+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+  :
-+else
-+  as_candidate_shells=
-+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  case $as_dir in
-+	 /*)
-+	   for as_base in sh bash ksh sh5; do
-+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+	   done;;
-+       esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+      for as_shell in $as_candidate_shells $SHELL; do
-+	 # Try only shells that exist, to save several forks.
-+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+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
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+:
-+_ASEOF
-+}; then
-+  CONFIG_SHELL=$as_shell
-+	       as_have_required=yes
-+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+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
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+:
-+(as_func_return () {
-+  (exit $1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  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
-+
-+
-+
-+(eval "as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+  echo No shell found that supports shell functions.
-+  echo Please tell autoconf at gnu.org about your system,
-+  echo including any error possibly output before this
-+  echo message
-+}
-+
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
-+  # line-number line 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
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+  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'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
-+else
-+  as_executable_p=:
-+fi
-+rm -f conf$$.file
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+
-+exec 7<&0 </dev/null 6>&1
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+#
-+# Initializations.
-+#
-+ac_default_prefix=/usr/local
-+ac_clean_files=
-+ac_config_libobj_dir=.
-+LIB@&t at OBJS=
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+
-+ac_unique_file="imap/imapd.c"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# ifdef HAVE_STDLIB_H
-+#  include <stdlib.h>
-+# endif
-+#endif
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-+#  include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#ifdef HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+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
-+WARNERROR
-+MAKEDEPEND
-+cyrus_prefix
-+service_path
-+cyrus_user
-+cyrus_group
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+RANLIB
-+SET_MAKE
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+CPP
-+GREP
-+EGREP
-+AWK
-+LIB@&t at OBJS
-+LIB_SOCKET
-+IPV6_OBJS
-+PRE_SUBDIRS
-+EXTRA_SUBDIRS
-+DEPLIBS
-+LOCALDEFS
-+BDB_INC
-+BDB_LIB
-+CYRUSDB_OBJS
-+SIEVE_OBJS
-+SIEVE_LIBS
-+SIEVE_CPPFLAGS
-+YACC
-+YFLAGS
-+LEX
-+LEX_OUTPUT_ROOT
-+LEXLIB
-+SIEVE_SUBDIRS
-+WITH_NONBLOCK
-+WITH_GMTOFF
-+WITH_MAP
-+WITH_LOCK
-+cyrus_sigveclib
-+AFS_LIBS
-+AFS_LDFLAGS
-+LDAP_CPPFLAGS
-+LDAP_LDFLAGS
-+LDAP_LIBS
-+SERVER_SUBDIRS
-+OPENSSL_INC
-+OPENSSL_LIB
-+ZEPHYR_LIBS
-+ZEPHYR_CPPFLAGS
-+WITH_IDLE
-+IMAP_PROGS
-+COMPILE_ET
-+COM_ERR_LIBS
-+COM_ERR_LDFLAGS
-+COM_ERR_CPPFLAGS
-+LIB_CRYPT
-+GSSAPI_LIBS
-+GSSAPIBASE_LIBS
-+LIB_DYN_SASL
-+DYNSASLFLAGS
-+LIB_SASL
-+SASLFLAGS
-+PERL
-+PERL_CCCDLFLAGS
-+MD5OBJ
-+SNMP_SUBDIRS
-+CMU_LIB_SUBDIR
-+LIB_WRAP
-+SNMP_CONFIG
-+LIB_UCDSNMP
-+LIB_RT
-+IMAP_COM_ERR_LIBS
-+IMAP_LIBS
-+PERL_SUBDIRS
-+PERL_DEPSUBDIRS
-+LTLIBOBJS'
-+ac_subst_files=''
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+CPP
-+YACC
-+YFLAGS'
-+
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+cache_file=/dev/null
-+exec_prefix=NONE
-+no_create=
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# and all the variables that are supposed to be based on exec_prefix
-+# by default will actually change.
-+# Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-+
-+ac_prev=
-+ac_dashdash=
-+for ac_option
-+do
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$ac_prev"; then
-+    eval $ac_prev=\$ac_option
-+    ac_prev=
-+    continue
-+  fi
-+
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
-+
-+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+    ac_prev=bindir ;;
-+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+    bindir=$ac_optarg ;;
-+
-+  -build | --build | --buil | --bui | --bu)
-+    ac_prev=build_alias ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build_alias=$ac_optarg ;;
-+
-+  -cache-file | --cache-file | --cache-fil | --cache-fi \
-+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+    ac_prev=cache_file ;;
-+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+    cache_file=$ac_optarg ;;
-+
-+  --config-cache | -C)
-+    cache_file=config.cache ;;
-+
-+  -datadir | --datadir | --datadi | --datad)
-+    ac_prev=datadir ;;
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-+    datadir=$ac_optarg ;;
-+
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-+  -disable-* | --disable-*)
-+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { 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 ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
-+
-+  -enable-* | --enable-*)
-+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { 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 ;;
-+
-+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-+  | --exec | --exe | --ex)
-+    ac_prev=exec_prefix ;;
-+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+  | --exec=* | --exe=* | --ex=*)
-+    exec_prefix=$ac_optarg ;;
-+
-+  -gas | --gas | --ga | --g)
-+    # Obsolete; use --with-gas.
-+    with_gas=yes ;;
-+
-+  -help | --help | --hel | --he | -h)
-+    ac_init_help=long ;;
-+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+    ac_init_help=recursive ;;
-+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+    ac_init_help=short ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host_alias ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host_alias=$ac_optarg ;;
-+
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-+  -includedir | --includedir | --includedi | --included | --include \
-+  | --includ | --inclu | --incl | --inc)
-+    ac_prev=includedir ;;
-+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+  | --includ=* | --inclu=* | --incl=* | --inc=*)
-+    includedir=$ac_optarg ;;
-+
-+  -infodir | --infodir | --infodi | --infod | --info | --inf)
-+    ac_prev=infodir ;;
-+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+    infodir=$ac_optarg ;;
-+
-+  -libdir | --libdir | --libdi | --libd)
-+    ac_prev=libdir ;;
-+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+    libdir=$ac_optarg ;;
-+
-+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+  | --libexe | --libex | --libe)
-+    ac_prev=libexecdir ;;
-+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+  | --libexe=* | --libex=* | --libe=*)
-+    libexecdir=$ac_optarg ;;
-+
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-+    localstatedir=$ac_optarg ;;
-+
-+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+    ac_prev=mandir ;;
-+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+    mandir=$ac_optarg ;;
-+
-+  -nfp | --nfp | --nf)
-+    # Obsolete; use --without-fp.
-+    with_fp=no ;;
-+
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c | -n)
-+    no_create=yes ;;
-+
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    no_recursion=yes ;;
-+
-+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+  | --oldin | --oldi | --old | --ol | --o)
-+    ac_prev=oldincludedir ;;
-+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+    oldincludedir=$ac_optarg ;;
-+
-+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+    ac_prev=prefix ;;
-+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+    prefix=$ac_optarg ;;
-+
-+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+  | --program-pre | --program-pr | --program-p)
-+    ac_prev=program_prefix ;;
-+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+    program_prefix=$ac_optarg ;;
-+
-+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+  | --program-suf | --program-su | --program-s)
-+    ac_prev=program_suffix ;;
-+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+    program_suffix=$ac_optarg ;;
-+
-+  -program-transform-name | --program-transform-name \
-+  | --program-transform-nam | --program-transform-na \
-+  | --program-transform-n | --program-transform- \
-+  | --program-transform | --program-transfor \
-+  | --program-transfo | --program-transf \
-+  | --program-trans | --program-tran \
-+  | --progr-tra | --program-tr | --program-t)
-+    ac_prev=program_transform_name ;;
-+  -program-transform-name=* | --program-transform-name=* \
-+  | --program-transform-nam=* | --program-transform-na=* \
-+  | --program-transform-n=* | --program-transform-=* \
-+  | --program-transform=* | --program-transfor=* \
-+  | --program-transfo=* | --program-transf=* \
-+  | --program-trans=* | --program-tran=* \
-+  | --progr-tra=* | --program-tr=* | --program-t=*)
-+    program_transform_name=$ac_optarg ;;
-+
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil)
-+    silent=yes ;;
-+
-+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+    ac_prev=sbindir ;;
-+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+  | --sbi=* | --sb=*)
-+    sbindir=$ac_optarg ;;
-+
-+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+  | --sharedst | --shareds | --shared | --share | --shar \
-+  | --sha | --sh)
-+    ac_prev=sharedstatedir ;;
-+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+  | --sha=* | --sh=*)
-+    sharedstatedir=$ac_optarg ;;
-+
-+  -site | --site | --sit)
-+    ac_prev=site ;;
-+  -site=* | --site=* | --sit=*)
-+    site=$ac_optarg ;;
-+
-+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+    ac_prev=srcdir ;;
-+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+    srcdir=$ac_optarg ;;
-+
-+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+  | --syscon | --sysco | --sysc | --sys | --sy)
-+    ac_prev=sysconfdir ;;
-+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+    sysconfdir=$ac_optarg ;;
-+
-+  -target | --target | --targe | --targ | --tar | --ta | --t)
-+    ac_prev=target_alias ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target_alias=$ac_optarg ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers | -V)
-+    ac_init_version=: ;;
-+
-+  -with-* | --with-*)
-+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { 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 ;;
-+
-+  -without-* | --without-*)
-+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { 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 ;;
-+
-+  --x)
-+    # Obsolete; use --with-x.
-+    with_x=yes ;;
-+
-+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+  | --x-incl | --x-inc | --x-in | --x-i)
-+    ac_prev=x_includes ;;
-+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+    x_includes=$ac_optarg ;;
-+
-+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+    ac_prev=x_libraries ;;
-+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+  | --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; }; }
-+    ;;
-+
-+  *=*)
-+    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; }; }
-+    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
-+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+    ;;
-+
-+  esac
-+done
-+
-+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; }; }
-+fi
-+
-+# Be sure to have absolute directory names.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
-+do
-+  eval ac_val=\$$ac_var
-+  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; }; }
-+done
-+
-+# There might be people who depend on the old broken behavior: `$host'
-+# used to hold the argument of --host etc.
-+# FIXME: To remove some day.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: To remove some day.
-+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.
-+    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
-+  fi
-+fi
-+
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
-+
-+
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  { echo "$as_me: error: Working directory cannot be determined" >&2
-+   { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+   { (exit 1); exit 1; }; }
-+
-+
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+  ac_srcdir_defaulted=yes
-+  # Try the directory containing this script, then 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" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  srcdir=$ac_confdir
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-+    srcdir=..
-+  fi
-+else
-+  ac_srcdir_defaulted=no
-+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; }; }
-+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; }; }
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+  # Omit some internal or obsolete options to make the list less imposing.
-+  # This message is too long to be a string in the A/UX 3.1 sh.
-+  cat <<_ACEOF
-+\`configure' configures this package to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE.  See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+  -h, --help              display this help and exit
-+      --help=short        display options specific to this package
-+      --help=recursive    display the short help of all the included packages
-+  -V, --version           display version information and exit
-+  -q, --quiet, --silent   do not print \`checking...' messages
-+      --cache-file=FILE   cache test results in FILE [disabled]
-+  -C, --config-cache      alias for \`--cache-file=config.cache'
-+  -n, --no-create         do not create output files
-+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-+
-+Installation directories:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+			  [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+			  [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+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]
-+_ACEOF
-+
-+  cat <<\_ACEOF
-+
-+System types:
-+  --build=BUILD     configure for building on BUILD [guessed]
-+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+
-+  cat <<\_ACEOF
-+
-+Optional Features:
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+  --enable-warnings-are-errors   add -Werror to most gcc calls
-+  --disable-sieve         disable Sieve support
-+  --enable-krb5afspts     compile afskrb PTS module with krb5 support
-+  --disable-server        disable compiling servers
-+  --enable-statickrb      link Kerberos statically
-+  --enable-nntp           enable NNTP support (experimental)
-+  --enable-murder         enable IMAP Murder support
-+  --enable-cmulocal       enable CMU-specific local support
-+  --enable-oldsievename   enable the use of 'imap' as the sieve service name
-+  --enable-listext        enable IMAP List extensions
-+  --enable-netscapehack   enable Netscape hack for the menu option
-+                          in Communicator to Administrate Mail
-+  --enable-gssapi=<DIR>   enable GSSAPI authentication [yes]
-+
-+Optional Packages:
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --with-extraident=STRING   use STRING as extra version information
-+
-+  --with-cyrus-prefix=DIR    use DIR as cyrus server install directory
-+  --with-service-path=DIR    use DIR as service install directory
-+  --with-cyrus-user=USERID   use USERID cyrus userid
-+  --with-cyrus-group=GROUPID use GROUPID cyrus group
-+  --with-bdb=DIR          use Berkeley DB (in DIR) [yes] 
-+  --with-bdb-libdir=DIR   Berkeley DB lib files are in DIR
-+  --with-bdb-incdir=DIR   Berkeley DB include files are in DIR
-+  --with-lock=METHOD      force use of METHOD for locking (flock or fcntl)
-+  --with-afs=PATH         use AFS libraries from PATH
-+  --with-ldap=DIR         use LDAP (in DIR) (experimental) /usr/local 
-+  --with-krb=PATH         use Kerberos from PATH
-+  --with-krbimpl=\kth|mit\         assume Kerberos 4 from KTH or MIT
-+  --with-krbdes           use Kerberos DES implementation [yes]
-+  --with-openssl=PATH     use OpenSSL from PATH
-+  --with-egd-socket=FILE  Entropy Gathering Daemon socket pathname
-+                          for systems without /dev/urandom
-+  --with-zephyr=PATH    enable Zephyr notification (installed on PATH)
-+  --with-pidfile=PATH   pidfile in PATH (/var/run/cyrus-master.pid)
-+  --with-idle=METHOD      use METHOD for IMAP IDLE
-+                          METHOD is poll, idled or no
-+  --with-com_err=PATH     use com_err from path -- includes in PATH/include,
-+                          libs in PATH/lib, and compile_et in PATH/bin
-+  --with-syslogfacility=FACILITY set the syslog facility to use (default LOCAL6)
-+  --with-gss_impl={heimdal|mit|cybersafe|seam|auto} 
-+                          choose specific GSSAPI implementation [[auto]]
-+  --with-sasl=DIR         Compile with libsasl2 in <DIR>
-+  --with-staticsasl=DIR   Compile with staticly linked libsasl2 in <DIR>
-+  --with-perl=PERL        use PERL for perl
-+  --with-lib-subdir=DIR   Find libraries in DIR instead of lib
-+  --with-libwrap=DIR      use libwrap (rooted in DIR) yes 
-+  --with-snmp=DIR         use ucd|net snmp (rooted in DIR) yes 
-+
-+Some influential environment variables:
-+  CC          C compiler command
-+  CFLAGS      C compiler flags
-+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-+              nonstandard directory <lib dir>
-+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
-+  CPP         C preprocessor
-+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-+              the first program found out of: `bison -y', `byacc', `yacc'.
-+  YFLAGS      The list of arguments that will be passed by default to $YACC.
-+              This script will default YFLAGS to the empty string to avoid a
-+              default value of `-d' given by some make applications.
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+_ACEOF
-+ac_status=$?
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+  # If there are subdirs, report their specific --help.
-+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+    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,^\.[\\/],,'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-+    else
-+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-+  done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+  cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.60a
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+  exit
-+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.60a.  Invocation command line was
-+
-+  $ $0 $@
-+
-+_ACEOF
-+exec 5>>config.log
-+{
-+cat <<_ASUNAME
-+@%:@@%:@ --------- @%:@@%:@
-+@%:@@%:@ Platform. @%:@@%:@
-+@%:@@%:@ --------- @%:@@%:@
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-+
-+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-+
-+_ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  echo "PATH: $as_dir"
-+done
-+IFS=$as_save_IFS
-+
-+} >&5
-+
-+cat >&5 <<_ACEOF
-+
-+
-+@%:@@%:@ ----------- @%:@@%:@
-+@%:@@%:@ Core tests. @%:@@%:@
-+@%:@@%:@ ----------- @%:@@%:@
-+
-+_ACEOF
-+
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+  for ac_arg
-+  do
-+    case $ac_arg in
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-+      continue ;;
-+    *\'*)
-+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    case $ac_pass in
-+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+    2)
-+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+      if test $ac_must_keep_next = true; then
-+	ac_must_keep_next=false # Got value, back to normal.
-+      else
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-+      fi
-+      ac_configure_args="$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; }
-+
-+# When interrupted or exit'd, cleanup temporary files, and complete
-+# config.log.  We remove comments because anyway the quotes in there
-+# would cause problems or look ugly.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-+trap 'exit_status=$?
-+  # Save into config.log some information that might help in debugging.
-+  {
-+    echo
-+
-+    cat <<\_ASBOX
-+@%:@@%:@ ---------------- @%:@@%:@
-+@%:@@%:@ Cache variables. @%:@@%:@
-+@%:@@%:@ ---------------- @%:@@%:@
-+_ASBOX
-+    echo
-+    # The following way of writing the cache mishandles newlines in values,
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      sed -n \
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-+    *)
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+)
-+    echo
-+
-+    cat <<\_ASBOX
-+@%:@@%:@ ----------------- @%:@@%:@
-+@%:@@%:@ Output variables. @%:@@%:@
-+@%:@@%:@ ----------------- @%:@@%:@
-+_ASBOX
-+    echo
-+    for ac_var in $ac_subst_vars
-+    do
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      echo "$ac_var='\''$ac_val'\''"
-+    done | sort
-+    echo
-+
-+    if test -n "$ac_subst_files"; then
-+      cat <<\_ASBOX
-+@%:@@%:@ ------------------- @%:@@%:@
-+@%:@@%:@ File substitutions. @%:@@%:@
-+@%:@@%:@ ------------------- @%:@@%:@
-+_ASBOX
-+      echo
-+      for ac_var in $ac_subst_files
-+      do
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	echo "$ac_var='\''$ac_val'\''"
-+      done | sort
-+      echo
-+    fi
-+
-+    if test -s confdefs.h; then
-+      cat <<\_ASBOX
-+@%:@@%:@ ----------- @%:@@%:@
-+@%:@@%:@ confdefs.h. @%:@@%:@
-+@%:@@%:@ ----------- @%:@@%:@
-+_ASBOX
-+      echo
-+      cat confdefs.h
-+      echo
-+    fi
-+    test "$ac_signal" != 0 &&
-+      echo "$as_me: caught signal $ac_signal"
-+    echo "$as_me: exit $exit_status"
-+  } >&5
-+  rm -f core *.core 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
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -f -r conftest* 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
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
-+# Prefer explicitly selected file to automatically selected ones.
-+if test -n "$CONFIG_SITE"; then
-+  set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+  set x "$ac_default_prefix/share/config.site" \
-+	"$ac_default_prefix/etc/config.site"
-+fi
-+shift
-+for ac_site_file
-+do
-+  if test -r "$ac_site_file"; then
-+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
-+    sed 's/^/| /' "$ac_site_file" >&5
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
-+  # 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;}
-+    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;}
-+  >$cache_file
-+fi
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in $ac_precious_vars; do
-+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+  eval ac_new_set=\$ac_env_${ac_var}_set
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-+  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;}
-+      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;}
-+      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=:
-+      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=$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'" ;;
-+    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
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+ac_config_headers="$ac_config_headers config.h"
-+
-+ac_aux_dir=
-+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-+  if test -f "$ac_dir/install-sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install-sh -c"
-+    break
-+  elif test -f "$ac_dir/install.sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install.sh -c"
-+    break
-+  elif test -f "$ac_dir/shtool"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/shtool install -c"
-+    break
-+  fi
-+done
-+if test -z "$ac_aux_dir"; then
-+  { { 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; }; }
-+fi
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
-+
-+# Make sure we can run config.sub.
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  { { 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
-+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; }; }
-+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; }; }
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$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; }; };;
-+esac
-+build=$ac_cv_build
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+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
-+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; }; }
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$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; }; };;
-+esac
-+host=$ac_cv_host
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
-+
-+WARNERROR=-W
-+# Check whether --enable-warnings-are-errors was given.
-+if test "${enable_warnings_are_errors+set}" = set; then
-+  enableval=$enable_warnings_are_errors;  if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi 
-+fi
-+
-+
-+
-+
-+# Check whether --with-extraident was given.
-+if test "${with_extraident+set}" = set; then
-+  withval=$with_extraident; 
-+cat >>confdefs.h <<_ACEOF
-+@%:@define EXTRA_IDENT "$withval"
-+_ACEOF
-+
-+fi
-+
-+
-+# Extract the first word of "makedepend", so it can be a program name with args.
-+set dummy makedepend; 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_MAKEDEPEND+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$MAKEDEPEND"; then
-+  ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_MAKEDEPEND="makedepend"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep"
-+fi
-+fi
-+MAKEDEPEND=$ac_cv_prog_MAKEDEPEND
-+if test -n "$MAKEDEPEND"; then
-+  { echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
-+echo "${ECHO_T}$MAKEDEPEND" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+if test "$MAKEDEPEND" != "makedepend"; then
-+        { echo "$as_me:$LINENO: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&5
-+echo "$as_me: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&2;}
-+fi
-+
-+
-+# Check whether --with-login was given.
-+if test "${with_login+set}" = set; then
-+  withval=$with_login; { { echo "$as_me:$LINENO: error: --with-login is no longer supported.
-+Configure SASL appropriately instead." >&5
-+echo "$as_me: error: --with-login is no longer supported.
-+Configure SASL appropriately instead." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+
-+# Check whether --with-cyrus-prefix was given.
-+if test "${with_cyrus_prefix+set}" = set; then
-+  withval=$with_cyrus_prefix; cyrus_prefix="$withval"
-+else
-+  cyrus_prefix="/usr/cyrus"
-+fi
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define CYRUS_PATH "$cyrus_prefix"
-+_ACEOF
-+
-+
-+# Check whether --with-service-path was given.
-+if test "${with_service_path+set}" = set; then
-+  withval=$with_service_path; service_path="$withval"
-+else
-+  service_path="$cyrus_prefix/bin"
-+fi
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SERVICE_PATH "$service_path"
-+_ACEOF
-+
-+
-+# Check whether --with-cyrus-user was given.
-+if test "${with_cyrus_user+set}" = set; then
-+  withval=$with_cyrus_user; cyrus_user="$withval"
-+else
-+  cyrus_user="cyrus"
-+fi
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define CYRUS_USER "$cyrus_user"
-+_ACEOF
-+
-+
-+# Check whether --with-cyrus-group was given.
-+if test "${with_cyrus_group+set}" = set; then
-+  withval=$with_cyrus_group; cyrus_group="$withval"
-+else
-+  cyrus_group="mail"
-+fi
-+
-+
-+
-+if test $sysconfdir = '${prefix}/etc'; then
-+  sysconfdir="/etc"
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SYSCONFDIR "$sysconfdir"
-+_ACEOF
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+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
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+  ac_ct_CC=$CC
-+  # Extract the first word of "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
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="gcc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+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
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}cc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  fi
-+fi
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+       ac_prog_rejected=yes
-+       continue
-+     fi
-+    ac_cv_prog_CC="cc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $@%:@ != 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+  fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in cl.exe
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+    test -n "$CC" && break
-+  done
-+fi
-+if test -z "$CC"; then
-+  ac_ct_CC=$CC
-+  for ac_prog in cl.exe
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_CC" && break
-+done
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+fi
-+
-+fi
-+
-+
-+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; }; }
-+
-+# 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"
-+case "(($ac_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); }
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+# Try to create an executable without -o first, disregard a.out.
-+# It will help us diagnose broken compilers, and finding out an intuition
-+# of exeext.
-+{ 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.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+  esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link_default") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
-+do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.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;
-+	then :; else
-+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	fi
-+	# We set ac_cv_exeext here because the later test for it is not
-+	# safe: cross compilers may not add the suffix if given an `-o'
-+	# argument, so we may need to know it at that point already.
-+	# Even if this section looks crufty: it has the advantage of
-+	# actually working.
-+	break;;
-+    * )
-+	break;;
-+  esac
-+done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
-+else
-+  ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { 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; }; }
-+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
-+# 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
-+  *\"* | *\`* | *\\*) 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
-+    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.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+  fi
-+fi
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+ac_clean_files=$ac_clean_files_save
-+# Check 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"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  # 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
-+# `rm'.
-+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_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; }; }
-+fi
-+
-+rm -f conftest$ac_cv_exeext
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-+if test "${ac_cv_objext+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 ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  for ac_file in 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_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+       break;;
-+  esac
-+done
-+else
-+  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; }; }
-+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; }
-+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
-+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 ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_compiler_gnu=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	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`
-+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
-+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
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_prog_cc_g=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	CFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    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
-+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
-+/* end confdefs.h.  */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+  xno)
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  ac_ct_RANLIB=$RANLIB
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+{ 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_RANLIB+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    RANLIB=$ac_ct_RANLIB
-+  fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
-+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
-+else
-+  cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
-+all:
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
-+_ACEOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
-+rm -f conftest.make
-+fi
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+  SET_MAKE=
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+# Find a good install program.  We prefer a C program (faster),
-+# so one script is as good as another.  But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# 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; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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/* | \
-+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+  /usr/ucb/* ) ;;
-+  *)
-+    # OSF1 and SCO ODT 3.0 have their own names for install.
-+    # Don't use installbsd from OSF since it installs stuff as root
-+    # by default.
-+    for ac_prog in ginstall scoinst install; do
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+	  if test $ac_prog = install &&
-+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  elif test $ac_prog = install &&
-+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # 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
-+	  fi
-+	fi
-+      done
-+    done
-+    ;;
-+esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+  if test "${ac_cv_path_install+set}" = set; then
-+    INSTALL=$ac_cv_path_install
-+  else
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    INSTALL=$ac_install_sh
-+  fi
-+fi
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+  if test "${ac_cv_prog_CPP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+      # Double quotes because CPP needs to be expanded
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+@%:@ifdef __STDC__
-+@%:@ include <limits.h>
-+@%:@else
-+@%:@ include <assert.h>
-+@%:@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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  # 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
-+/* 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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  # 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
-+  break
-+fi
-+
-+    done
-+    ac_cv_prog_CPP=$CPP
-+  
-+fi
-+  CPP=$ac_cv_prog_CPP
-+else
-+  ac_cv_prog_CPP=$CPP
-+fi
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+@%:@ifdef __STDC__
-+@%:@ include <limits.h>
-+@%:@else
-+@%:@ include <assert.h>
-+@%:@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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  # 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
-+/* 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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  # 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
-+  :
-+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; }; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in grep ggrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-+    # Check for GNU ac_path_GREP and select it if it is found.
-+  # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    echo 'GREP' >> "conftest.nl"
-+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    ac_count=`expr $ac_count + 1`
-+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_GREP="$ac_path_GREP"
-+      ac_path_GREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+    $ac_path_GREP_found && break 3
-+  done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_GREP=$GREP
-+fi
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+ 
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+   then ac_cv_path_EGREP="$GREP -E"
-+   else
-+     # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_path_EGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in egrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-+    # Check for GNU ac_path_EGREP and select it if it is found.
-+  # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    echo 'EGREP' >> "conftest.nl"
-+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    ac_count=`expr $ac_count + 1`
-+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_EGREP="$ac_path_EGREP"
-+      ac_path_EGREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+    $ac_path_EGREP_found && break 3
-+  done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+   fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+ 
-+
-+
-+{ echo "$as_me:$LINENO: checking for AIX" >&5
-+echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef _AIX
-+  yes
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "yes" >/dev/null 2>&1; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define _ALL_SOURCE 1
-+_ACEOF
-+
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+rm -f conftest*
-+
-+
-+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
-+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
-+if test "${ac_cv_search_strerror+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any 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 strerror ();
-+int
-+main ()
-+{
-+return strerror ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' cposix; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_search_strerror=$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_strerror+set}" = set; then
-+  break
-+fi
-+done
-+if test "${ac_cv_search_strerror+set}" = set; then
-+  :
-+else
-+  ac_cv_search_strerror=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
-+ac_res=$ac_cv_search_strerror
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+fi
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$AWK" && break
-+done
-+
-+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-+if test "${ac_cv_c_const+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+  /* Ultrix mips cc rejects this.  */
-+  typedef int charset[2];
-+  const charset cs;
-+  /* SunOS 4.1.1 cc rejects this.  */
-+  char const *const *pcpcc;
-+  char **ppc;
-+  /* NEC SVR4.0.2 mips cc rejects this.  */
-+  struct point {int x, y;};
-+  static struct point const zero = {0,0};
-+  /* AIX XL C 1.02.0.0 rejects this.
-+     It does not let you subtract one const X* pointer from another in
-+     an arm of an if-expression whose if-part is not a constant
-+     expression */
-+  const char *g = "string";
-+  pcpcc = &g + (g ? g-g : 0);
-+  /* HPUX 7.0 cc rejects these. */
-+  ++pcpcc;
-+  ppc = (char**) pcpcc;
-+  pcpcc = (char const *const *) ppc;
-+  { /* SCO 3.2v4 cc rejects this.  */
-+    char *t;
-+    char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+    *t++ = 0;
-+    if (s) return 0;
-+  }
-+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-+    int x[] = {25, 17};
-+    const int *foo = &x[0];
-+    ++foo;
-+  }
-+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+    typedef const int *iptr;
-+    iptr p = 0;
-+    ++p;
-+  }
-+  { /* AIX XL C 1.02.0.0 rejects this saying
-+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+    struct s { int j; const int *ap[3]; };
-+    struct s *b; b->j = 5;
-+  }
-+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+    const int foo = 10;
-+    if (!foo) return 0;
-+  }
-+  return !cs[0] && !zero.x;
-+#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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_c_const=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	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; }
-+if test $ac_cv_c_const = no; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define const 
-+_ACEOF
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for inline" >&5
-+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-+if test "${ac_cv_c_inline+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_c_inline=$ac_kw
-+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
-+  test "$ac_cv_c_inline" != no && break
-+done
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-+
-+
-+case $ac_cv_c_inline in
-+  inline | yes) ;;
-+  *)
-+    case $ac_cv_c_inline in
-+      no) ac_val=;;
-+      *) ac_val=$ac_cv_c_inline;;
-+    esac
-+    cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
-+#endif
-+_ACEOF
-+    ;;
-+esac
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for __attribute__" >&5
-+echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6; }
-+if test "${ac_cv___attribute__+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdlib.h>
-+
-+int
-+main ()
-+{
-+
-+static void foo(void) __attribute__ ((noreturn));
-+
-+static void
-+foo(void)
-+{
-+  exit(1);
-+}
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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___attribute__=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv___attribute__=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+if test "$ac_cv___attribute__" = "yes"; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE___ATTRIBUTE__ 1
-+_ACEOF
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
-+echo "${ECHO_T}$ac_cv___attribute__" >&6; }
-+
-+
-+{ echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
-+echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6; }
-+if test "${ac_cv_fpic+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+save_CFLAGS=$CFLAGS
-+CFLAGS="${CFLAGS} -fPIC"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdlib.h>
-+
-+int
-+main ()
-+{
-+
-+static void
-+foo(void)
-+{
-+  exit(1);
-+}
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_fpic=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_fpic=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS=$save_CFLAGS
-+
-+fi
-+
-+if test "$ac_cv_fpic" = "yes"; then
-+    FPIC_CFLAGS="-fPIC"
-+else
-+    FPIC_CFLAGS=""
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
-+echo "${ECHO_T}$ac_cv_fpic" >&6; }
-+
-+
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_header_stdc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	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
-+/* end confdefs.h.  */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "memchr" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "free" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then
-+  :
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+	|| toupper (i) != TOUPPER (i))
-+      return 2;
-+  return 0;
-+}
-+_ACEOF
-+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
-+
-+( exit $ac_status )
-+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
-+fi
-+
-+
-+fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define STDC_HEADERS 1
-+_ACEOF
-+
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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
-+  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
-+ 
-+fi
-+
-+done
-+
-+
-+{ echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-+if test "${ac_cv_type_long+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 long 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_type_long=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_type_long=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_lo=0 ac_mid=0
-+  while :; do
-+    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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+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
-+	        typedef long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=-1 ac_mid=-1
-+  while :; do
-+    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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo= ac_hi=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long=$ac_lo;;
-+'') if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi ;;
-+esac
-+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 long ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+@%:@include <stdio.h>
-+@%:@include <stdlib.h>
-+int
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
-+  return ferror (f) || fclose (f) != 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_sizeof_long=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.val
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
-+
-+
-+
-+
-+   # CMU GUESS RUNPATH SWITCH
-+    andrew_runpath_switch="none"
-+
-+
-+
-+
-+
-+
-+for ac_header in unistd.h sys/select.h sys/param.h stdarg.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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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 memmove strcasecmp ftruncate strerror
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+ 
-+else
-+  case " $LIB@&t at OBJS " in
-+  *" $ac_func.$ac_objext "* ) ;;
-+  *) LIB@&t at OBJS="$LIB@&t at OBJS $ac_func.$ac_objext"
-+ ;;
-+esac
-+
-+fi
-+done
-+
-+
-+
-+
-+for ac_func in strlcat strlcpy
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+
-+
-+
-+
-+
-+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
-+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 <$ac_hdr>
-+
-+int
-+main ()
-+{
-+if ((DIR *) 0)
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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
-+  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_hdr" | $as_tr_cpp` 1
-+_ACEOF
-+
-+ac_header_dirent=$ac_hdr; break
-+fi
-+
-+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
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char opendir ();
-+int
-+main ()
-+{
-+return opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' dir; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_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
-+  break
-+fi
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  :
-+else
-+  ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+fi
-+
-+else
-+  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char opendir ();
-+int
-+main ()
-+{
-+return opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' x; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_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
-+  break
-+fi
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  :
-+else
-+  ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+fi
-+
-+fi
-+
-+
-+
-+	save_LIBS="$LIBS"
-+	LIB_SOCKET=""
-+	{ echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
-+if test "${ac_cv_func_connect+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define connect innocuous_connect
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char connect (); 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 connect
-+
-+/* 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 connect ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_connect || defined __stub___connect
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return connect ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_connect=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_connect=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_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
-+if test $ac_cv_func_connect = yes; then
-+  :
-+else
-+  { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $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 gethostbyname ();
-+int
-+main ()
-+{
-+return gethostbyname ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_nsl_gethostbyname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_nsl_gethostbyname=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_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
-+if test $ac_cv_lib_nsl_gethostbyname = yes; then
-+  LIB_SOCKET="-lnsl $LIB_SOCKET"
-+fi
-+
-+		{ echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_connect+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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
-+/* 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 connect ();
-+int
-+main ()
-+{
-+return connect ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_socket_connect=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_socket_connect=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_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
-+if test $ac_cv_lib_socket_connect = yes; then
-+  LIB_SOCKET="-lsocket $LIB_SOCKET"
-+fi
-+
-+	
-+fi
-+
-+	LIBS="$LIB_SOCKET $save_LIBS"
-+	{ echo "$as_me:$LINENO: checking for res_search" >&5
-+echo $ECHO_N "checking for res_search... $ECHO_C" >&6; }
-+if test "${ac_cv_func_res_search+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 res_search to an innocuous variant, in case <limits.h> declares res_search.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define res_search innocuous_res_search
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char res_search (); 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 res_search
-+
-+/* 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 res_search ();
-+/* 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_res_search || defined __stub___res_search
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return res_search ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_res_search=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_res_search=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_res_search" >&5
-+echo "${ECHO_T}$ac_cv_func_res_search" >&6; }
-+if test $ac_cv_func_res_search = yes; then
-+  :
-+else
-+  LIBS="-lresolv $LIB_SOCKET $save_LIBS"
-+		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 <netinet/in.h>
-+#include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-+#include <arpa/nameser_compat.h>
-+#endif
-+#include <resolv.h>
-+int
-+main ()
-+{
-+
-+const char host[12]="openafs.org";
-+u_char ans[1024];
-+res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
-+return 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  LIB_SOCKET="-lresolv $LIB_SOCKET"
-+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 conftest.$ac_ext
-+        
-+fi
-+
-+	LIBS="$LIB_SOCKET $save_LIBS"
-+	
-+
-+for ac_func in dn_expand dns_lookup
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+	LIBS="$save_LIBS"
-+	
-+	
-+LIBS="$LIBS ${LIB_SOCKET}"
-+
-+cyrus_cv_getaddrinfo=yes
-+
-+{ echo "$as_me:$LINENO: checking for getaddrinfo" >&5
-+echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; }
-+if test "${ac_cv_func_getaddrinfo+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 getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define getaddrinfo innocuous_getaddrinfo
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char getaddrinfo (); 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 getaddrinfo
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char getaddrinfo ();
-+/* 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_getaddrinfo || defined __stub___getaddrinfo
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return getaddrinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_getaddrinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_getaddrinfo=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_getaddrinfo" >&5
-+echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6; }
-+if test $ac_cv_func_getaddrinfo = yes; then
-+    ac_cv_lib_socket_getaddrinfo=no
-+  ac_cv_lib_inet6_getaddrinfo=no
-+
-+else
-+    { echo "$as_me:$LINENO: checking for getaddrinfo in -lsocket" >&5
-+echo $ECHO_N "checking for getaddrinfo in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-+/* 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 getaddrinfo ();
-+int
-+main ()
-+{
-+return getaddrinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_socket_getaddrinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_socket_getaddrinfo=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_socket_getaddrinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_getaddrinfo" >&6; }
-+if test $ac_cv_lib_socket_getaddrinfo = yes; then
-+      LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_getaddrinfo=no
-+  
-+else
-+      { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
-+echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; }
-+    if test "${ipv6_cv_dir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done
-+fi
-+    { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
-+echo "${ECHO_T}$ipv6_cv_dir" >&6; }
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_getaddrinfo=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      { echo "$as_me:$LINENO: checking for getaddrinfo in -linet6" >&5
-+echo $ECHO_N "checking for getaddrinfo in -linet6... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-linet6  $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 getaddrinfo ();
-+int
-+main ()
-+{
-+return getaddrinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_inet6_getaddrinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_inet6_getaddrinfo=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_inet6_getaddrinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6; }
-+if test $ac_cv_lib_inet6_getaddrinfo = yes; then
-+  	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi
-+fi
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi
-+fi
-+
-+fi
-+ipv6_cv_getaddrinfo=no
-+if test $ac_cv_func_getaddrinfo = yes -o $ac_cv_lib_socket_getaddrinfo = yes \
-+     -o $ac_cv_lib_inet6_getaddrinfo = yes
-+then
-+  ipv6_cv_getaddrinfo=yes
-+fi
-+if test $ipv6_cv_getaddrinfo = no; then
-+  if test getaddrinfo = getaddrinfo; then
-+    for ipv6_cv_pfx in o n; do
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <netdb.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then
-+  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getaddrinfo" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}getaddrinfo... $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 ${ipv6_cv_pfx}getaddrinfo to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}getaddrinfo.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define ${ipv6_cv_pfx}getaddrinfo innocuous_${ipv6_cv_pfx}getaddrinfo
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char ${ipv6_cv_pfx}getaddrinfo (); 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 ${ipv6_cv_pfx}getaddrinfo
-+
-+/* 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 ${ipv6_cv_pfx}getaddrinfo ();
-+/* 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_${ipv6_cv_pfx}getaddrinfo || defined __stub___${ipv6_cv_pfx}getaddrinfo
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return ${ipv6_cv_pfx}getaddrinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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; }
-+
-+fi
-+rm -f conftest*
-+
-+      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getaddrinfo = Xyes; then
-+        
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETADDRINFO 
-+_ACEOF
-+
-+        ipv6_cv_getaddrinfo=yes
-+        break
-+      fi
-+    done
-+  fi
-+fi
-+if test $ipv6_cv_getaddrinfo = yes; then
-+  
-+{ echo "$as_me:$LINENO: checking for gai_strerror" >&5
-+echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6; }
-+if test "${ac_cv_func_gai_strerror+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 gai_strerror to an innocuous variant, in case <limits.h> declares gai_strerror.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define gai_strerror innocuous_gai_strerror
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char gai_strerror (); 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 gai_strerror
-+
-+/* 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 gai_strerror ();
-+/* 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_gai_strerror || defined __stub___gai_strerror
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return gai_strerror ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_gai_strerror=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_gai_strerror=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_gai_strerror" >&5
-+echo "${ECHO_T}$ac_cv_func_gai_strerror" >&6; }
-+if test $ac_cv_func_gai_strerror = yes; then
-+    ac_cv_lib_socket_gai_strerror=no
-+  ac_cv_lib_inet6_gai_strerror=no
-+
-+else
-+    { echo "$as_me:$LINENO: checking for gai_strerror in -lsocket" >&5
-+echo $ECHO_N "checking for gai_strerror in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-+/* 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 gai_strerror ();
-+int
-+main ()
-+{
-+return gai_strerror ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_socket_gai_strerror=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_socket_gai_strerror=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_socket_gai_strerror" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_gai_strerror" >&6; }
-+if test $ac_cv_lib_socket_gai_strerror = yes; then
-+      LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_gai_strerror=no
-+  
-+else
-+      { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
-+echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; }
-+    if test "${ipv6_cv_dir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done
-+fi
-+    { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
-+echo "${ECHO_T}$ipv6_cv_dir" >&6; }
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_gai_strerror=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      { echo "$as_me:$LINENO: checking for gai_strerror in -linet6" >&5
-+echo $ECHO_N "checking for gai_strerror in -linet6... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-linet6  $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 gai_strerror ();
-+int
-+main ()
-+{
-+return gai_strerror ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_inet6_gai_strerror=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_inet6_gai_strerror=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_inet6_gai_strerror" >&5
-+echo "${ECHO_T}$ac_cv_lib_inet6_gai_strerror" >&6; }
-+if test $ac_cv_lib_inet6_gai_strerror = yes; then
-+  	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi
-+fi
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi
-+fi
-+
-+fi
-+ipv6_cv_gai_strerror=no
-+if test $ac_cv_func_gai_strerror = yes -o $ac_cv_lib_socket_gai_strerror = yes \
-+     -o $ac_cv_lib_inet6_gai_strerror = yes
-+then
-+  ipv6_cv_gai_strerror=yes
-+fi
-+if test $ipv6_cv_gai_strerror = no; then
-+  if test gai_strerror = getaddrinfo; then
-+    for ipv6_cv_pfx in o n; do
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <netdb.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then
-+  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}gai_strerror" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}gai_strerror... $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 ${ipv6_cv_pfx}gai_strerror to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}gai_strerror.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define ${ipv6_cv_pfx}gai_strerror innocuous_${ipv6_cv_pfx}gai_strerror
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char ${ipv6_cv_pfx}gai_strerror (); 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 ${ipv6_cv_pfx}gai_strerror
-+
-+/* 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 ${ipv6_cv_pfx}gai_strerror ();
-+/* 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_${ipv6_cv_pfx}gai_strerror || defined __stub___${ipv6_cv_pfx}gai_strerror
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return ${ipv6_cv_pfx}gai_strerror ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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; }
-+
-+fi
-+rm -f conftest*
-+
-+      if eval test X\$ac_cv_func_${ipv6_cv_pfx}gai_strerror = Xyes; then
-+        
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETADDRINFO 
-+_ACEOF
-+
-+        ipv6_cv_gai_strerror=yes
-+        break
-+      fi
-+    done
-+  fi
-+fi
-+if test $ipv6_cv_gai_strerror = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETADDRINFO 
-+_ACEOF
-+
-+else
-+  cyrus_cv_getaddrinfo=no
-+fi
-+else
-+  cyrus_cv_getaddrinfo=no
-+fi
-+
-+if test $cyrus_cv_getaddrinfo = no; then
-+	IPV6_OBJS="getaddrinfo.o"
-+fi
-+
-+cyrus_cv_getnameinfo=yes
-+
-+{ echo "$as_me:$LINENO: checking for getnameinfo" >&5
-+echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6; }
-+if test "${ac_cv_func_getnameinfo+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 getnameinfo to an innocuous variant, in case <limits.h> declares getnameinfo.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define getnameinfo innocuous_getnameinfo
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char getnameinfo (); 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 getnameinfo
-+
-+/* 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 getnameinfo ();
-+/* 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_getnameinfo || defined __stub___getnameinfo
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return getnameinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_getnameinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_getnameinfo=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_getnameinfo" >&5
-+echo "${ECHO_T}$ac_cv_func_getnameinfo" >&6; }
-+if test $ac_cv_func_getnameinfo = yes; then
-+    ac_cv_lib_socket_getnameinfo=no
-+  ac_cv_lib_inet6_getnameinfo=no
-+
-+else
-+    { echo "$as_me:$LINENO: checking for getnameinfo in -lsocket" >&5
-+echo $ECHO_N "checking for getnameinfo in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-+/* 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 getnameinfo ();
-+int
-+main ()
-+{
-+return getnameinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_socket_getnameinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_socket_getnameinfo=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_socket_getnameinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_getnameinfo" >&6; }
-+if test $ac_cv_lib_socket_getnameinfo = yes; then
-+      LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_getnameinfo=no
-+  
-+else
-+      { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
-+echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; }
-+    if test "${ipv6_cv_dir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done
-+fi
-+    { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
-+echo "${ECHO_T}$ipv6_cv_dir" >&6; }
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_getnameinfo=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      { echo "$as_me:$LINENO: checking for getnameinfo in -linet6" >&5
-+echo $ECHO_N "checking for getnameinfo in -linet6... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-linet6  $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 getnameinfo ();
-+int
-+main ()
-+{
-+return getnameinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_inet6_getnameinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_inet6_getnameinfo=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_inet6_getnameinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_inet6_getnameinfo" >&6; }
-+if test $ac_cv_lib_inet6_getnameinfo = yes; then
-+  	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi
-+fi
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi
-+fi
-+
-+fi
-+ipv6_cv_getnameinfo=no
-+if test $ac_cv_func_getnameinfo = yes -o $ac_cv_lib_socket_getnameinfo = yes \
-+     -o $ac_cv_lib_inet6_getnameinfo = yes
-+then
-+  ipv6_cv_getnameinfo=yes
-+fi
-+if test $ipv6_cv_getnameinfo = no; then
-+  if test getnameinfo = getaddrinfo; then
-+    for ipv6_cv_pfx in o n; do
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <netdb.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then
-+  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getnameinfo" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}getnameinfo... $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 ${ipv6_cv_pfx}getnameinfo to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}getnameinfo.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define ${ipv6_cv_pfx}getnameinfo innocuous_${ipv6_cv_pfx}getnameinfo
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char ${ipv6_cv_pfx}getnameinfo (); 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 ${ipv6_cv_pfx}getnameinfo
-+
-+/* 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 ${ipv6_cv_pfx}getnameinfo ();
-+/* 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_${ipv6_cv_pfx}getnameinfo || defined __stub___${ipv6_cv_pfx}getnameinfo
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return ${ipv6_cv_pfx}getnameinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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; }
-+
-+fi
-+rm -f conftest*
-+
-+      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getnameinfo = Xyes; then
-+        
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETADDRINFO 
-+_ACEOF
-+
-+        ipv6_cv_getnameinfo=yes
-+        break
-+      fi
-+    done
-+  fi
-+fi
-+if test $ipv6_cv_getnameinfo = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETNAMEINFO 
-+_ACEOF
-+
-+else
-+  cyrus_cv_getnameinfo=no
-+fi
-+
-+if test $cyrus_cv_getnameinfo = no; then
-+	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5
-+echo $ECHO_N "checking whether you have ss_family in struct sockaddr_storage... $ECHO_C" >&6; }
-+if test "${ipv6_cv_ss_family+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/socket.h>
-+int
-+main ()
-+{
-+struct sockaddr_storage ss; int i = ss.ss_family;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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
-+  ipv6_cv_ss_family=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ipv6_cv_ss_family=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+if test $ipv6_cv_ss_family = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_SS_FAMILY 
-+_ACEOF
-+
-+else
-+  :
-+fi
-+{ echo "$as_me:$LINENO: result: $ipv6_cv_ss_family" >&5
-+echo "${ECHO_T}$ipv6_cv_ss_family" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking whether you have sa_len in struct sockaddr" >&5
-+echo $ECHO_N "checking whether you have sa_len in struct sockaddr... $ECHO_C" >&6; }
-+if test "${ipv6_cv_sa_len+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/socket.h>
-+int
-+main ()
-+{
-+struct sockaddr sa; int i = sa.sa_len;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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
-+  ipv6_cv_sa_len=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ipv6_cv_sa_len=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+if test $ipv6_cv_sa_len = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_SOCKADDR_SA_LEN 
-+_ACEOF
-+
-+else
-+  :
-+fi
-+{ echo "$as_me:$LINENO: result: $ipv6_cv_sa_len" >&5
-+echo "${ECHO_T}$ipv6_cv_sa_len" >&6; }
-+
-+
-+
-+
-+for ac_header in sys/time.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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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
-+
-+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-+if test "${ac_cv_header_time+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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/time.h>
-+#include <time.h>
-+
-+int
-+main ()
-+{
-+if ((struct tm *) 0)
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_header_time=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	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; }
-+if test $ac_cv_header_time = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define TIME_WITH_SYS_TIME 1
-+_ACEOF
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
-+if test "${ac_cv_struct_tm+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 <time.h>
-+
-+int
-+main ()
-+{
-+struct tm *tp; tp->tm_sec;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_struct_tm=time.h
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_struct_tm=sys/time.h
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-+echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
-+if test $ac_cv_struct_tm = sys/time.h; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define TM_IN_SYS_TIME 1
-+_ACEOF
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-+echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
-+if test "${ac_cv_member_struct_tm_tm_zone+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 <$ac_cv_struct_tm>
-+
-+
-+int
-+main ()
-+{
-+static struct tm ac_aggr;
-+if (ac_aggr.tm_zone)
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_member_struct_tm_tm_zone=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>
-+#include <$ac_cv_struct_tm>
-+
-+
-+int
-+main ()
-+{
-+static struct tm ac_aggr;
-+if (sizeof ac_aggr.tm_zone)
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_member_struct_tm_tm_zone=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_member_struct_tm_tm_zone=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_tm_tm_zone" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
-+if test $ac_cv_member_struct_tm_tm_zone = yes; then
-+  
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_STRUCT_TM_TM_ZONE 1
-+_ACEOF
-+
-+
-+fi
-+
-+if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_TM_ZONE 1
-+_ACEOF
-+
-+else
-+  { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
-+echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
-+if test "${ac_cv_have_decl_tzname+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 <time.h>
-+
-+int
-+main ()
-+{
-+#ifndef tzname
-+  char *p = (char *) tzname;
-+  return !p;
-+#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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_have_decl_tzname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_have_decl_tzname=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
-+if test $ac_cv_have_decl_tzname = yes; then
-+  
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_TZNAME 1
-+_ACEOF
-+
-+
-+else
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_TZNAME 0
-+_ACEOF
-+
-+
-+fi
-+
-+
-+  { echo "$as_me:$LINENO: checking for tzname" >&5
-+echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
-+if test "${ac_cv_var_tzname+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 <time.h>
-+#if !HAVE_DECL_TZNAME
-+extern char *tzname[];
-+#endif
-+
-+int
-+main ()
-+{
-+return tzname[0][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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_var_tzname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_var_tzname=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_var_tzname" >&5
-+echo "${ECHO_T}$ac_cv_var_tzname" >&6; }
-+  if test $ac_cv_var_tzname = yes; then
-+    
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_TZNAME 1
-+_ACEOF
-+
-+  fi
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_func in vprintf
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+ 
-+{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-+echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
-+if test "${ac_cv_func__doprnt+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 _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define _doprnt innocuous__doprnt
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char _doprnt (); 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 _doprnt
-+
-+/* 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 _doprnt ();
-+/* 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__doprnt || defined __stub____doprnt
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return _doprnt ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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__doprnt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func__doprnt=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__doprnt" >&5
-+echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
-+if test $ac_cv_func__doprnt = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_DOPRNT 1
-+_ACEOF
-+
-+fi
-+
-+fi
-+done
-+
-+
-+
-+
-+CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
-+
-+
-+
-+# Check whether --with-bdb was given.
-+if test "${with_bdb+set}" = set; then
-+  withval=$with_bdb; with_bdb=$withval
-+else
-+  with_bdb="yes"
-+fi
-+
-+
-+
-+# Check whether --with-dbdir was given.
-+if test "${with_dbdir+set}" = set; then
-+  withval=$with_dbdir; with_bdb=$withval
-+fi
-+
-+
-+case "$with_bdb" in
-+  no)
-+	use_berkeley="no"
-+	;;
-+  yes)
-+	use_berkeley="yes"
-+	with_bdb_lib=none
-+	with_bdb_inc=none
-+	;;
-+  
-+  *)
-+	use_berkeley="yes"
-+	with_bdb_lib="$with_bdb/lib"
-+	with_bdb_inc="$with_bdb/include"
-+	;;
-+esac
-+
-+if test "$use_berkeley" != "no"; then
-+  
-+
-+# Check whether --with-bdb-libdir was given.
-+if test "${with_bdb_libdir+set}" = set; then
-+  withval=$with_bdb_libdir; with_bdb_lib=$withval
-+else
-+   test "${with_bdb_lib+set}" = set || with_bdb_lib=none
-+fi
-+
-+
-+# Check whether --with-bdb-incdir was given.
-+if test "${with_bdb_incdir+set}" = set; then
-+  withval=$with_bdb_incdir; with_bdb_inc=$withval
-+else
-+   test "${with_bdb_inc+set}" = set || with_bdb_inc=none 
-+fi
-+
-+
-+
-+	
-+
-+	cmu_save_CPPFLAGS=$CPPFLAGS
-+
-+	if test -d $with_bdb_inc; then
-+	    CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
-+	    BDB_INCADD="-I$with_bdb_inc"
-+	else
-+	    BDB_INCADD=""
-+	fi
-+
-+	                if test "${ac_cv_header_db_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for db.h" >&5
-+echo $ECHO_N "checking for db.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_db_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
-+echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking db.h usability" >&5
-+echo $ECHO_N "checking db.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <db.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 db.h presence" >&5
-+echo $ECHO_N "checking db.h 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 <db.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: db.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: db.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: db.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: db.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: db.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: db.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: db.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: db.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: db.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: db.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for db.h" >&5
-+echo $ECHO_N "checking for db.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_db_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_db_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
-+echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_db_h = yes; then
-+  
-+	BDB_SAVE_LDFLAGS=$LDFLAGS
-+
-+	if test -d $with_bdb_lib; then
-+	    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
-+  else
-+	LDFLAGS="-L$with_bdb_lib ${LDFLAGS} $andrew_runpath_switch$with_bdb_lib"
-+  fi
-+
-+	    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD}"
-+  else
-+	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD} $andrew_runpath_switch$with_bdb_lib"
-+  fi
-+
-+	else
-+	    BDB_LIBADD=""
-+	fi
-+
-+	saved_LIBS=$LIBS
-+        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+          do
-+	    LIBS="$saved_LIBS -l$dbname"
-+	    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <db.h>
-+int
-+main ()
-+{
-+db_create(NULL, NULL, 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	dblib="no"
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+	    if test "$dblib" = "berkeley"; then break; fi
-+          done
-+        if test "$dblib" = "no"; then
-+	    LIBS="$saved_LIBS -ldb"
-+	    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <db.h>
-+int
-+main ()
-+{
-+db_open(NULL, 0, 0, 0, NULL, NULL, NULL);
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	dblib="no"
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+        fi
-+	LIBS=$saved_LIBS
-+
-+	LDFLAGS=$BDB_SAVE_LDFLAGS
-+
-+else
-+  dblib="no"
-+fi
-+
-+
-+
-+	CPPFLAGS=$cmu_save_CPPFLAGS
-+
-+
-+  if test "$dblib" = "no"; then
-+    { { echo "$as_me:$LINENO: error: Berkeley DB 3.x or later was not found.  You may need to 
-+    supply the --with-bdb-libdir or --with-bdb-incdir configure options." >&5
-+echo "$as_me: error: Berkeley DB 3.x or later was not found.  You may need to 
-+    supply the --with-bdb-libdir or --with-bdb-incdir configure options." >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+
-+  if test "$with_bdb_lib" != "none"; then
-+    
-+  # this is CMU ADD LIBPATH
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
-+  else
-+	LDFLAGS="-L$with_bdb_lib $andrew_runpath_switch$with_bdb_lib ${LDFLAGS}"
-+  fi
-+
-+  fi
-+
-+  BDB_INC=${BDB_INCADD}
-+  BDB_LIB=${BDB_LIBADD}
-+  
-+  
-+
-+  LIBS="${LIBS} ${BDB_LIBADD}"
-+  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
-+
-+  CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_BDB 
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+SIEVE_SUBDIRS=""
-+sievedir="sieve"
-+# Check whether --enable-sieve was given.
-+if test "${enable_sieve+set}" = set; then
-+  enableval=$enable_sieve; if test "$enableval" = no; then
-+ 		sievedir="no"
-+	fi
-+fi
-+
-+
-+if test "$sievedir" != "no"; then
-+	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-+	
-+	SIEVE_LIBS="../${sievedir}/libsieve.a"
-+	
-+	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
-+	
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define USE_SIEVE 
-+_ACEOF
-+
-+
-+		for ac_prog in 'bison -y' byacc
-+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_YACC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$YACC"; then
-+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_YACC="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+YACC=$ac_cv_prog_YACC
-+if test -n "$YACC"; then
-+  { echo "$as_me:$LINENO: result: $YACC" >&5
-+echo "${ECHO_T}$YACC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$YACC" && break
-+done
-+test -n "$YACC" || YACC="yacc"
-+
-+	for ac_prog in flex lex
-+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_LEX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$LEX"; then
-+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_LEX="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+LEX=$ac_cv_prog_LEX
-+if test -n "$LEX"; then
-+  { echo "$as_me:$LINENO: result: $LEX" >&5
-+echo "${ECHO_T}$LEX" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$LEX" && break
-+done
-+test -n "$LEX" || LEX=":"
-+
-+if test "x$LEX" != "x:"; then
-+  cat >conftest.l <<_ACEOF
-+%%
-+a { ECHO; }
-+b { REJECT; }
-+c { yymore (); }
-+d { yyless (1); }
-+e { yyless (input () != 0); }
-+f { unput (yytext[0]); }
-+. { BEGIN INITIAL; }
-+%%
-+#ifdef YYTEXT_POINTER
-+extern char *yytext;
-+#endif
-+int
-+main (void)
-+{
-+  return ! yylex () + ! yywrap ();
-+}
-+_ACEOF
-+{ (ac_try="$LEX conftest.l"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$LEX conftest.l") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+{ echo "$as_me:$LINENO: checking lex output file root" >&5
-+echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_lex_root+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+if test -f lex.yy.c; then
-+  ac_cv_prog_lex_root=lex.yy
-+elif test -f lexyy.c; then
-+  ac_cv_prog_lex_root=lexyy
-+else
-+  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-+echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
-+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-+
-+if test -z "${LEXLIB+set}"; then
-+  { echo "$as_me:$LINENO: checking lex library" >&5
-+echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_lex+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+    ac_save_LIBS=$LIBS
-+    ac_cv_lib_lex='none needed'
-+    for ac_lib in '' -lfl -ll; do
-+      LIBS="$ac_lib $ac_save_LIBS"
-+      cat >conftest.$ac_ext <<_ACEOF
-+`cat $LEX_OUTPUT_ROOT.c`
-+_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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_lex=$ac_lib
-+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 conftest.$ac_ext
-+      test "$ac_cv_lib_lex" != 'none needed' && break
-+    done
-+    LIBS=$ac_save_LIBS
-+  
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
-+echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
-+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-+echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # POSIX says lex can declare yytext either as a pointer or an array; the
-+# default is implementation-dependent.  Figure out which it is, since
-+# not all implementations provide the %pointer and %array declarations.
-+ac_cv_prog_lex_yytext_pointer=no
-+ac_save_LIBS=$LIBS
-+LIBS="$LEXLIB $ac_save_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#define YYTEXT_POINTER 1
-+`cat $LEX_OUTPUT_ROOT.c`
-+_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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_prog_lex_yytext_pointer=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_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_save_LIBS
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-+echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
-+if test $ac_cv_prog_lex_yytext_pointer = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define YYTEXT_POINTER 1
-+_ACEOF
-+
-+fi
-+rm -f conftest.l $LEX_OUTPUT_ROOT.c
-+
-+fi
-+	
-+{ echo "$as_me:$LINENO: checking for main in -lfl" >&5
-+echo $ECHO_N "checking for main in -lfl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_fl_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lfl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_fl_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_fl_main=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_fl_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_fl_main" >&6; }
-+if test $ac_cv_lib_fl_main = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_LIBFL 1
-+_ACEOF
-+
-+  LIBS="-lfl $LIBS"
-+
-+fi
-+
-+
-+ 	{ echo "$as_me:$LINENO: checking for library containing regcomp" >&5
-+echo $ECHO_N "checking for library containing regcomp... $ECHO_C" >&6; }
-+if test "${ac_cv_search_regcomp+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any 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 regcomp ();
-+int
-+main ()
-+{
-+return regcomp ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' rx regex; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_search_regcomp=$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_regcomp+set}" = set; then
-+  break
-+fi
-+done
-+if test "${ac_cv_search_regcomp+set}" = set; then
-+  :
-+else
-+  ac_cv_search_regcomp=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5
-+echo "${ECHO_T}$ac_cv_search_regcomp" >&6; }
-+ac_res=$ac_cv_search_regcomp
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+ 			
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define ENABLE_REGEX 
-+_ACEOF
-+
-+		 	if test "${ac_cv_header_rxposix_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for rxposix.h" >&5
-+echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_rxposix_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
-+echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking rxposix.h usability" >&5
-+echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <rxposix.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 rxposix.h presence" >&5
-+echo $ECHO_N "checking rxposix.h 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 <rxposix.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: rxposix.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: rxposix.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: rxposix.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: rxposix.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: rxposix.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: rxposix.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: rxposix.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for rxposix.h" >&5
-+echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_rxposix_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_rxposix_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
-+echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_rxposix_h = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_RX 
-+_ACEOF
-+
-+fi
-+
-+
-+fi
-+
-+  		
-+
-+	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
-+	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
-+fi
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for strerror" >&5
-+echo $ECHO_N "checking for strerror... $ECHO_C" >&6; }
-+if test "${ac_cv_func_strerror+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 strerror to an innocuous variant, in case <limits.h> declares strerror.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define strerror innocuous_strerror
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char strerror (); 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 strerror
-+
-+/* 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 strerror ();
-+/* 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_strerror || defined __stub___strerror
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return strerror ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_strerror=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_strerror=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_strerror" >&5
-+echo "${ECHO_T}$ac_cv_func_strerror" >&6; }
-+if test $ac_cv_func_strerror = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAS_STRERROR 
-+_ACEOF
-+
-+else
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define NEED_SYS_ERRLIST 
-+_ACEOF
-+
-+fi
-+
-+
-+
-+for ac_header in sys/resource.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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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 setrlimit
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+
-+for ac_func in getrlimit
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+
-+
-+
-+for ac_func in daemon setsid
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+
-+
-+for ac_func in shutdown
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/socket.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "socklen_t" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_SOCKLEN_T 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/socket.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "sockaddr_storage" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_STRUCT_SOCKADDR_STORAGE 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/resource.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "rlim_t" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_RLIM_T 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+
-+spt_type=""
-+{ 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_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
-+  spt_type=SPT_BUILTIN
-+fi
-+
-+if test "$spt_type" = ""; then
-+		{ echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5
-+echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_util_setproctitle+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil  $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 setproctitle ();
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_util_setproctitle=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_util_setproctitle=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_util_setproctitle" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6; }
-+if test $ac_cv_lib_util_setproctitle = yes; then
-+  spt_type=SPT_BUILTIN
-+			LIBS="${LIBS} -lutil"
-+fi
-+
-+fi
-+if test "$spt_type" = ""; then
-+	if test "${ac_cv_header_sys_pstat_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
-+echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sys_pstat_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sys/pstat.h usability" >&5
-+echo $ECHO_N "checking sys/pstat.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sys/pstat.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sys/pstat.h presence" >&5
-+echo $ECHO_N "checking sys/pstat.h 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 <sys/pstat.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sys/pstat.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sys/pstat.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sys/pstat.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sys/pstat.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sys/pstat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
-+echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sys_pstat_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sys_pstat_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sys_pstat_h = yes; then
-+  spt_type=SPT_PSTAT
-+fi
-+
-+
-+fi
-+if test "$spt_type" = ""; then
-+	if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
-+echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sys/sysnews.h usability" >&5
-+echo $ECHO_N "checking sys/sysnews.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sys/sysnews.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sys/sysnews.h presence" >&5
-+echo $ECHO_N "checking sys/sysnews.h 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 <sys/sysnews.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sys/sysnews.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sys/sysnews.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
-+echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sys_sysnews_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sys_sysnews_h = yes; then
-+  spt_type=SPT_SYSMIPS
-+fi
-+
-+
-+fi
-+if test "$spt_type" = ""; then
-+	{ echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
-+echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6; }
-+	if test "${cyrus_cv_sys_psstrings+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 <machine/vmparam.h>
-+#include <sys/exec.h>
-+#ifndef PS_STRINGS
-+#include </nonexistent>
-+#endif
-+_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  cyrus_cv_sys_psstrings=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  cyrus_cv_sys_psstrings=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+
-+	if test $cyrus_cv_sys_psstrings = yes; then
-+		spt_type=SPT_PSSTRINGS
-+	fi
-+	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6; }
-+fi
-+if test "$spt_type" = ""; then
-+	{ echo "$as_me:$LINENO: checking for SCO" >&5
-+echo $ECHO_N "checking for SCO... $ECHO_C" >&6; }
-+	if test "${cyrus_cv_sys_sco+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.  */
-+
-+#ifndef _SCO_unix_
-+#include </nonexistent>
-+#endif
-+_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  cyrus_cv_sys_sco=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  cyrus_cv_sys_sco=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+
-+	if test $cyrus_cv_sys_sco = yes; then
-+		spt_type=SPT_SCO
-+	fi
-+	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_sco" >&6; }
-+fi
-+if test "$spt_type" = ""; then
-+	{ echo "$as_me:$LINENO: checking for setproctitle usability" >&5
-+echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6; }
-+	if test "${cyrus_cv_sys_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.  */
-+
-+#if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
-+#include </nonexistent>
-+#endif
-+_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  cyrus_cv_sys_setproctitle=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  cyrus_cv_sys_setproctitle=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+
-+	if test $cyrus_cv_sys_setproctitle = no; then
-+		spt_type=SPT_NONE
-+	fi
-+	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_setproctitle" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_setproctitle" >&6; }
-+fi
-+if test "$spt_type" != ""; then
-+	
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SPT_TYPE $spt_type
-+_ACEOF
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking nonblocking method" >&5
-+echo $ECHO_N "checking nonblocking method... $ECHO_C" >&6; }
-+if test "${cyrus_cv_sys_nonblock+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/file.h>
-+#include <fcntl.h>
-+#ifndef	FNDELAY
-+#define FNDELAY		O_NDELAY
-+#endif
-+int
-+main ()
-+{
-+fcntl(0, F_GETFL, 0)&FNDELAY
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  cyrus_cv_sys_nonblock=fcntl
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	cyrus_cv_sys_nonblock=ioctl
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+
-+WITH_NONBLOCK=$cyrus_cv_sys_nonblock
-+
-+{ echo "$as_me:$LINENO: result: $WITH_NONBLOCK" >&5
-+echo "${ECHO_T}$WITH_NONBLOCK" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking timezone GMT offset method" >&5
-+echo $ECHO_N "checking timezone GMT offset method... $ECHO_C" >&6; }
-+if test "${cyrus_cv_struct_sys_gmtoff+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 <time.h>
-+int
-+main ()
-+{
-+struct tm tm;
-+tm.tm_gmtoff = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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
-+  cyrus_cv_struct_sys_gmtoff=tm
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	cyrus_cv_struct_sys_gmtoff=gmtime
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
-+
-+{ echo "$as_me:$LINENO: result: $WITH_GMTOFF" >&5
-+echo "${ECHO_T}$WITH_GMTOFF" >&6; }
-+{ echo "$as_me:$LINENO: checking for shared mmap" >&5
-+echo $ECHO_N "checking for shared mmap... $ECHO_C" >&6; }
-+if test "${cyrus_cv_func_mmap_shared+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  cyrus_cv_func_mmap_shared=no
-+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/mman.h>
-+#include <fcntl.h>
-+main() {
-+char *base;
-+int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-+if (fd == -1) exit(1);
-+if (write(fd, "test", 4) != 4) exit(1);
-+fsync(fd);
-+base = mmap((caddr_t)0, 100, PROT_READ, MAP_SHARED
-+#ifdef MAP_FILE
-+| MAP_FILE
-+#endif
-+#ifdef MAP_VARIABLE
-+| MAP_VARIABLE
-+#endif
-+, fd, 0L);
-+if (base == (caddr_t)-1) exit(1);
-+if (strncmp(base, "test", 4) != 0) exit(1);
-+if (write(fd, "test", 4) != 4) exit(1);
-+fsync(fd);
-+if (strncmp(base+4, "test", 4) != 0) exit(1);
-+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
-+  cyrus_cv_func_mmap_shared=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 )
-+cyrus_cv_func_mmap_shared=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: $cyrus_cv_func_mmap_shared" >&5
-+echo "${ECHO_T}$cyrus_cv_func_mmap_shared" >&6; }
-+if test $cyrus_cv_func_mmap_shared = yes; then
-+	WITH_MAP="shared"
-+else
-+{ echo "$as_me:$LINENO: checking for stupid shared mmap" >&5
-+echo $ECHO_N "checking for stupid shared mmap... $ECHO_C" >&6; }
-+if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  cyrus_cv_func_mmap_stupidshared=no
-+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/mman.h>
-+#include <fcntl.h>
-+main() {
-+char *base;
-+int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-+if (fd == -1) exit(1);
-+if (write(fd, "test", 4) != 4) exit(1);
-+fsync(fd);
-+base = mmap((caddr_t)0, 4, PROT_READ, MAP_SHARED
-+#ifdef MAP_FILE
-+| MAP_FILE
-+#endif
-+#ifdef MAP_VARIABLE
-+| MAP_VARIABLE
-+#endif
-+, fd, 0L);
-+if (base == (caddr_t)-1) exit(1);
-+if (strncmp(base, "test", 4) != 0) exit(1);
-+lseek(fd, 0L, 0);	
-+if (write(fd, "xyzz", 4) != 4) exit(1);
-+fsync(fd);
-+if (strncmp(base, "xyzz", 4) != 0) exit(1);
-+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
-+  cyrus_cv_func_mmap_stupidshared=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 )
-+cyrus_cv_func_mmap_stupidshared=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: $cyrus_cv_func_mmap_stupidshared" >&5
-+echo "${ECHO_T}$cyrus_cv_func_mmap_stupidshared" >&6; }
-+if test $cyrus_cv_func_mmap_stupidshared = yes; then
-+	WITH_MAP="stupidshared"
-+else
-+	{ echo "$as_me:$LINENO: WARNING: *** This system does not have a working mmap()" >&5
-+echo "$as_me: WARNING: *** This system does not have a working mmap()" >&2;}
-+	{ echo "$as_me:$LINENO: WARNING: *** Expect a considerable performance penalty" >&5
-+echo "$as_me: WARNING: *** Expect a considerable performance penalty" >&2;}
-+	WITH_MAP=nommap
-+fi
-+fi
-+
-+
-+
-+# Check whether --with-lock was given.
-+if test "${with_lock+set}" = set; then
-+  withval=$with_lock; WITH_LOCK="$withval"
-+else
-+  
-+  { echo "$as_me:$LINENO: checking for fcntl" >&5
-+echo $ECHO_N "checking for fcntl... $ECHO_C" >&6; }
-+if test "${ac_cv_func_fcntl+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 fcntl to an innocuous variant, in case <limits.h> declares fcntl.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define fcntl innocuous_fcntl
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char fcntl (); 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 fcntl
-+
-+/* 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 fcntl ();
-+/* 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_fcntl || defined __stub___fcntl
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return fcntl ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_fcntl=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_fcntl=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_fcntl" >&5
-+echo "${ECHO_T}$ac_cv_func_fcntl" >&6; }
-+if test $ac_cv_func_fcntl = yes; then
-+  WITH_LOCK="fcntl"
-+else
-+  
-+		{ echo "$as_me:$LINENO: checking for flock" >&5
-+echo $ECHO_N "checking for flock... $ECHO_C" >&6; }
-+if test "${ac_cv_func_flock+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 flock to an innocuous variant, in case <limits.h> declares flock.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define flock innocuous_flock
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char flock (); 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 flock
-+
-+/* 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 flock ();
-+/* 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_flock || defined __stub___flock
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return flock ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_flock=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_flock=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_flock" >&5
-+echo "${ECHO_T}$ac_cv_func_flock" >&6; }
-+if test $ac_cv_func_flock = yes; then
-+  WITH_LOCK="flock"
-+else
-+  
-+				{ { echo "$as_me:$LINENO: error: unable to detect locking method" >&5
-+echo "$as_me: error: unable to detect locking method" >&2;}
-+   { (exit 1); exit 1; }; }
-+			      
-+fi
-+
-+		
-+fi
-+
-+  
-+fi
-+
-+
-+
-+
-+LIB_RT=""
-+{ echo "$as_me:$LINENO: checking for fdatasync" >&5
-+echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6; }
-+if test "${ac_cv_func_fdatasync+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 fdatasync to an innocuous variant, in case <limits.h> declares fdatasync.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define fdatasync innocuous_fdatasync
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char fdatasync (); 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 fdatasync
-+
-+/* 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 fdatasync ();
-+/* 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_fdatasync || defined __stub___fdatasync
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return fdatasync ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_fdatasync=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_fdatasync=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_fdatasync" >&5
-+echo "${ECHO_T}$ac_cv_func_fdatasync" >&6; }
-+if test $ac_cv_func_fdatasync = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_FDATASYNC 
-+_ACEOF
-+
-+else
-+  
-+  { echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
-+echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrt  $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 fdatasync ();
-+int
-+main ()
-+{
-+return fdatasync ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_rt_fdatasync=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_rt_fdatasync=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_rt_fdatasync" >&5
-+echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6; }
-+if test $ac_cv_lib_rt_fdatasync = yes; then
-+  
-+	LIB_RT="-lrt"
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_FDATASYNC 
-+_ACEOF
-+
-+  
-+fi
-+
-+
-+fi
-+
-+
-+cant_find_sigvec=no
-+if test "${cyrus_sigveclib+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+  { echo "$as_me:$LINENO: checking for sigvec" >&5
-+echo $ECHO_N "checking for sigvec... $ECHO_C" >&6; }
-+if test "${ac_cv_func_sigvec+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 sigvec to an innocuous variant, in case <limits.h> declares sigvec.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define sigvec innocuous_sigvec
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char sigvec (); 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 sigvec
-+
-+/* 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 sigvec ();
-+/* 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_sigvec || defined __stub___sigvec
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return sigvec ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_sigvec=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_sigvec=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_sigvec" >&5
-+echo "${ECHO_T}$ac_cv_func_sigvec" >&6; }
-+if test $ac_cv_func_sigvec = yes; then
-+  
-+	cyrus_sigveclib=""
-+  
-+else
-+  
-+    { echo "$as_me:$LINENO: checking for sigvec in -lBSD" >&5
-+echo $ECHO_N "checking for sigvec in -lBSD... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_BSD_sigvec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lBSD  $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 sigvec ();
-+int
-+main ()
-+{
-+return sigvec ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_BSD_sigvec=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_BSD_sigvec=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_BSD_sigvec" >&5
-+echo "${ECHO_T}$ac_cv_lib_BSD_sigvec" >&6; }
-+if test $ac_cv_lib_BSD_sigvec = yes; then
-+  cyrus_sigveclib="-lBSD"
-+else
-+  
-+        SAVE_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
-+    { echo "$as_me:$LINENO: checking for sigvec in -lucb" >&5
-+echo $ECHO_N "checking for sigvec in -lucb... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ucb_sigvec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lucb  $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 sigvec ();
-+int
-+main ()
-+{
-+return sigvec ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_ucb_sigvec=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_ucb_sigvec=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_ucb_sigvec" >&5
-+echo "${ECHO_T}$ac_cv_lib_ucb_sigvec" >&6; }
-+if test $ac_cv_lib_ucb_sigvec = yes; then
-+  
-+            cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
-+else
-+   cant_find_sigvec=yes 
-+fi
-+
-+    LDFLAGS="$SAVE_LDFLAGS"
-+fi
-+
-+  
-+fi
-+
-+
-+fi
-+
-+
-+
-+# ok, we still look for this stuff because of checking groups, but
-+# all authentication goes through SASL
-+
-+
-+# Check whether --with-afs was given.
-+if test "${with_afs+set}" = set; then
-+  withval=$with_afs; with_afs="${withval}"
-+else
-+  with_afs="no"
-+fi
-+
-+
-+
-+# Check whether --with-ldap was given.
-+if test "${with_ldap+set}" = set; then
-+  withval=$with_ldap; with_ldap="${withval}"
-+else
-+  with_ldap="no"
-+fi
-+
-+
-+# Check whether --enable-krb5afspts was given.
-+if test "${enable_krb5afspts+set}" = set; then
-+  enableval=$enable_krb5afspts; SASL_GSSAPI_LIBS_SET="yes"
-+
-+         
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define AFSPTS_USE_KRB5 
-+_ACEOF
-+
-+fi
-+
-+
-+if test "x$with_afs" != "xno"; then
-+    if test ! -d $with_afs; then
-+        $with_afs=/usr/local
-+    fi
-+    CFLAGS="${CFLAGS} -I${with_afs}/include"
-+    AFS_LIBS="${with_afs}/lib/afs/libkauth.a ${with_afs}/lib/afs/libprot.a  ${with_afs}/lib/afs/libauth.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/librxkad.a ${with_afs}/lib/librx.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/libubik.a  ${with_afs}/lib/liblwp.a ${with_afs}/lib/afs/util.a"
-+    if test -f ${with_afs}/lib/afs/libaudit.a; then
-+    AFS_LIBS="$AFS_LIBS ${with_afs}/lib/afs/libaudit.a"
-+    fi
-+    if test -f /usr/ucblib/libucb.a; then
-+    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS}"
-+  else
-+	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS} $andrew_runpath_switch/usr/ucblib"
-+  fi
-+
-+    AFS_LIBS="$AFS_LIBS -lc -lucb"
-+    fi
-+
-+    if test "${cyrus_afs_sigvec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+        SAVE_LIBS="$LIBS"
-+        LIBS="${with_afs}/lib/liblwp.a"
-+        { echo "$as_me:$LINENO: checking if AFS libraries need sigvec" >&5
-+echo $ECHO_N "checking if AFS libraries need sigvec... $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.  */
-+IOMGR_Initialize();
-+int
-+main ()
-+{
-+IOMGR_Initialize()
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  
-+                                                { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+                        cyrus_afs_sigvec="no"
-+                
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	
-+                                                { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+                        cyrus_afs_sigvec="yes"
-+                
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+        
-+fi
-+
-+    if test "$cyrus_afs_sigvec" = yes; then
-+      if test "$cant_find_sigvec" = yes; then
-+        { echo "$as_me:$LINENO: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&5
-+echo "$as_me: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&2;}
-+      else
-+        AFS_LIBS="${AFS_LIBS} $cyrus_sigveclib"
-+        
-+        
-+        
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_AFSKRB 
-+_ACEOF
-+
-+      fi
-+    else
-+      AFS_LIBS="${AFS_LIBS}"
-+      
-+      
-+      
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_AFSKRB 
-+_ACEOF
-+
-+    fi
-+    LIBS="$SAVE_LIBS"
-+fi
-+
-+LDAP_CPPFLAGS=""
-+LDAP_LDFLAGS=""
-+LDAP_LIBS=""
-+
-+if test "x$with_ldap" != "xno"; then
-+    if test ! -d $with_ldap; then
-+        $with_ldap=/usr/local
-+    fi
-+
-+    LDAP_CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
-+    LDAP_LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
-+    LDAP_LIBS=""
-+
-+    save_CPPFLAGS=$CPPFLAGS
-+    save_LDFLAGS=$LDFLAGS
-+    CPPFLAGS=$LDAP_CPPFLAGS
-+    LDFLAGS=$LDAP_LDFLAGS
-+
-+    { echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
-+echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lldap -llber $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 ldap_initialize ();
-+int
-+main ()
-+{
-+return ldap_initialize ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_ldap_ldap_initialize=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_ldap_ldap_initialize=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_ldap_ldap_initialize" >&5
-+echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6; }
-+if test $ac_cv_lib_ldap_ldap_initialize = yes; then
-+   
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_LDAP 
-+_ACEOF
-+
-+          
-+          
-+          	
-+          LDAP_LIBS="-lldap -llber" 
-+fi
-+
-+
-+    CPPFLAGS=$save_CPPFLAGS
-+    LDFLAGS=$save_LDFLAGS
-+fi
-+
-+if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
-+	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
-+	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define WITH_PTS 
-+_ACEOF
-+
-+fi
-+
-+SERVER_SUBDIRS="master imap"
-+# Check whether --enable-server was given.
-+if test "${enable_server+set}" = set; then
-+  enableval=$enable_server; if test "$enableval" = no; then
-+        	SERVER_SUBDIRS=""
-+	fi
-+fi
-+
-+
-+# We always output a server makefile (just because we can)
-+
-+
-+# Check whether --with-krb was given.
-+if test "${with_krb+set}" = set; then
-+  withval=$with_krb; with_krb="$withval"
-+else
-+  with_krb="no"
-+fi
-+
-+
-+
-+# Check whether --with-krbimpl was given.
-+if test "${with_krbimpl+set}" = set; then
-+  withval=$with_krbimpl; with_krbimpl="$withval"
-+else
-+  with_krbimpl="kth"
-+fi
-+
-+
-+# Check whether --enable-statickrb was given.
-+if test "${enable_statickrb+set}" = set; then
-+  enableval=$enable_statickrb; with_statickrb="yes"
-+else
-+  with_statickrb="no"
-+fi
-+
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-+echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_resolv_res_search+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv  $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 res_search ();
-+int
-+main ()
-+{
-+return res_search ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_resolv_res_search=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_resolv_res_search=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_resolv_res_search" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; }
-+if test $ac_cv_lib_resolv_res_search = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_LIBRESOLV 1
-+_ACEOF
-+
-+  LIBS="-lresolv $LIBS"
-+
-+fi
-+
-+
-+if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
-+      { { echo "$as_me:$LINENO: error: --enable-statickrb specified but --with-krb did not specify a valid directory" >&5
-+echo "$as_me: error: --enable-statickrb specified but --with-krb did not specify a valid directory" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi 
-+
-+if test "$with_krb" != "no"; then
-+
-+# Check whether --with-krbdes was given.
-+if test "${with_krbdes+set}" = set; then
-+  withval=$with_krbdes; with_krbdes="$withval"
-+else
-+  with_krbdes="yes"
-+fi
-+
-+if test "$with_krbdes" = "yes"; then
-+  { echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5
-+echo $ECHO_N "checking for des_ecb_encrypt in -ldes... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldes  $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 des_ecb_encrypt ();
-+int
-+main ()
-+{
-+return des_ecb_encrypt ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_des_des_ecb_encrypt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_des_des_ecb_encrypt=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_des_des_ecb_encrypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_des_des_ecb_encrypt" >&6; }
-+if test $ac_cv_lib_des_des_ecb_encrypt = yes; then
-+  if test "$with_statickrb" = "yes"; then
-+          KRB_LIBS="$with_krb/lib/libdes.a"
-+      else
-+          KRB_LIBS="-ldes"
-+      fi
-+else
-+  { { echo "$as_me:$LINENO: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&5
-+echo "$as_me: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+fi
-+fi
-+
-+if test -d ${with_krb}; then
-+   { echo "$as_me:$LINENO: checking for Kerberos includes" >&5
-+echo $ECHO_N "checking for Kerberos includes... $ECHO_C" >&6; }
-+if test "${cyrus_krbinclude+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+     for krbhloc in include/kerberosIV include
-+     do
-+       if test -f ${with_krb}/${krbhloc}/krb.h ; then
-+         cyrus_krbinclude=${with_krb}/${krbhloc}
-+         break
-+       fi
-+     done
-+     
-+fi
-+{ echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5
-+echo "${ECHO_T}$cyrus_krbinclude" >&6; }
-+
-+   if test -n "${cyrus_krbinclude}"; then
-+     CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-+   fi
-+   
-+  # this is CMU ADD LIBPATH
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LDFLAGS="-L${with_krb}/lib ${LDFLAGS}"
-+  else
-+	LDFLAGS="-L${with_krb}/lib $andrew_runpath_switch${with_krb}/lib ${LDFLAGS}"
-+  fi
-+
-+fi
-+
-+if test "$with_krbimpl" != "kth"; then
-+  KRBLIB="krb4"
-+else
-+  KRBLIB="krb"
-+fi
-+
-+if test "$with_des" != no; then
-+  if test "${ac_cv_header_krb_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for krb.h" >&5
-+echo $ECHO_N "checking for krb.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_krb_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_krb_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking krb.h usability" >&5
-+echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <krb.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 krb.h presence" >&5
-+echo $ECHO_N "checking krb.h 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 <krb.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: krb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: krb.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: krb.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: krb.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: krb.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: krb.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: krb.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for krb.h" >&5
-+echo $ECHO_N "checking for krb.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_krb_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_krb_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_krb_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_krb_h = yes; then
-+  as_ac_Lib=`echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for krb_mk_priv in -l${KRBLIB}" >&5
-+echo $ECHO_N "checking for krb_mk_priv in -l${KRBLIB}... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l${KRBLIB} $KRB_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any 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 krb_mk_priv ();
-+int
-+main ()
-+{
-+return krb_mk_priv ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  eval "$as_ac_Lib=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	eval "$as_ac_Lib=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
-+ac_res=`eval echo '${'$as_ac_Lib'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-+  if test "$with_statickrb" = "yes"; then
-+          KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
-+      else
-+          KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
-+      fi
-+else
-+  { echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
-+echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
-+fi
-+
-+else
-+  { echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
-+echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
-+fi
-+
-+
-+else
-+  { echo "$as_me:$LINENO: WARNING: No DES library found for Kerberos V4 support" >&5
-+echo "$as_me: WARNING: No DES library found for Kerberos V4 support" >&2;}
-+  krb4=no
-+fi
-+
-+if test "${krb4}" != no; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_KRB 
-+_ACEOF
-+
-+fi
-+
-+LIBS="$KRB_LIBS $LIBS"
-+
-+SASL_GSSAPI_LIBS_SET="yes"
-+
-+
-+IMAP_PROGS=""
-+
-+# Check whether --with-openssl was given.
-+if test "${with_openssl+set}" = set; then
-+  withval=$with_openssl; with_openssl="${withval}"
-+fi
-+
-+
-+OPENSSL_INC=
-+OPENSSL_LIB=
-+case "$with_openssl" in
-+	no) with_openssl="no";;
-+	""|yes) 
-+	  	                  LIB_RSAREF=""
-+	        { echo "$as_me:$LINENO: checking for RSAPublicEncrypt in -lrsaref" >&5
-+echo $ECHO_N "checking for RSAPublicEncrypt in -lrsaref... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrsaref  $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 RSAPublicEncrypt ();
-+int
-+main ()
-+{
-+return RSAPublicEncrypt ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_rsaref_RSAPublicEncrypt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_rsaref_RSAPublicEncrypt=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_rsaref_RSAPublicEncrypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6; }
-+if test $ac_cv_lib_rsaref_RSAPublicEncrypt = yes; then
-+  LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
-+else
-+  cmu_have_rsaref=no
-+fi
-+
-+
-+		with_openssl="yes"
-+		{ echo "$as_me:$LINENO: checking for BIO_accept in -lcrypto" >&5
-+echo $ECHO_N "checking for BIO_accept in -lcrypto... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypto $LIB_RSAREF $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 BIO_accept ();
-+int
-+main ()
-+{
-+return BIO_accept ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_crypto_BIO_accept=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_crypto_BIO_accept=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_crypto_BIO_accept" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypto_BIO_accept" >&6; }
-+if test $ac_cv_lib_crypto_BIO_accept = yes; then
-+  LIBS="-lcrypto $LIB_RSAREF ${LIBS}"
-+else
-+  with_openssl="no"
-+fi
-+
-+		{ echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
-+echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lssl -lcrypto $LIB_RSAREF $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 SSL_CTX_new ();
-+int
-+main ()
-+{
-+return SSL_CTX_new ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_ssl_SSL_CTX_new=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_ssl_SSL_CTX_new=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_ssl_SSL_CTX_new" >&5
-+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
-+if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
-+  LIBS="-lssl ${LIBS}"
-+else
-+  with_openssl="no"
-+fi
-+
-+		
-+		;;
-+	*)  OPENSSL_INC="-I${with_openssl}/include"
-+	    OPENSSL_LIBPATH="${with_openssl}/lib"
-+	    OPENSSL_LIB="-L${OPENSSL_LIBPATH}"
-+	    CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
-+	    
-+  # this is CMU ADD LIBPATH
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LDFLAGS="-L${OPENSSL_LIBPATH} ${LDFLAGS}"
-+  else
-+	LDFLAGS="-L${OPENSSL_LIBPATH} $andrew_runpath_switch${OPENSSL_LIBPATH} ${LDFLAGS}"
-+  fi
-+
-+	    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB}"
-+  else
-+	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB} $andrew_runpath_switch${OPENSSL_LIBPATH}"
-+  fi
-+
-+	    LIBS="${LIBS} -lssl -lcrypto";;
-+esac
-+
-+{ echo "$as_me:$LINENO: checking for openssl" >&5
-+echo $ECHO_N "checking for openssl... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $with_openssl" >&5
-+echo "${ECHO_T}$with_openssl" >&6; }
-+
-+if test "$with_openssl" != "no"; then
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_SSL 
-+_ACEOF
-+
-+	IMAP_PROGS="$IMAP_PROGS tls_prune"
-+        if test "${krb4}" != no; then
-+           
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define OPENSSL_ENABLE_OLD_DES_SUPPORT 
-+_ACEOF
-+
-+           
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define OPENSSL_DES_LIBDES_COMPATIBILITY 
-+_ACEOF
-+
-+        fi
-+fi
-+
-+
-+
-+
-+# Check whether --with-egd-socket was given.
-+if test "${with_egd_socket+set}" = set; then
-+  withval=$with_egd_socket;  EGD_SOCKET="$withval" 
-+      
-+fi
-+
-+if test -n "$EGD_SOCKET" ; then
-+      
-+cat >>confdefs.h <<_ACEOF
-+@%:@define EGD_SOCKET "$EGD_SOCKET"
-+_ACEOF
-+
-+fi
-+
-+
-+# Check whether --with-zephyr was given.
-+if test "${with_zephyr+set}" = set; then
-+  withval=$with_zephyr; with_zephyr="${withval}"
-+fi
-+
-+if test -z "$with_zephyr"; then
-+     if test -f /usr/local/lib/libzephyr.a; then
-+	with_zephyr="/usr/local"
-+     elif test -f /usr/lib/libzephyr.a; then
-+        with_zephyr="/usr"
-+     fi
-+fi
-+ZEPHYR_LIBS=""
-+ZEPHYR_CPPFLAGS=""
-+case "$with_zephyr" in
-+	no) true;;
-+	""|yes) { echo "$as_me:$LINENO: checking for ZInitialize in -lzephyr" >&5
-+echo $ECHO_N "checking for ZInitialize in -lzephyr... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lzephyr  $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 ZInitialize ();
-+int
-+main ()
-+{
-+return ZInitialize ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_zephyr_ZInitialize=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_zephyr_ZInitialize=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_zephyr_ZInitialize" >&5
-+echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitialize" >&6; }
-+if test $ac_cv_lib_zephyr_ZInitialize = yes; then
-+  ZEPHYR_LIBS="-lzephyr"
-+else
-+  with_zephyr="no"
-+fi
-+;;
-+       *)  if test -d ${with_zephyr}/include/zephyr; then
-+               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include/zephyr"
-+           else
-+               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include"
-+           fi
-+           ZEPHYR_LIBS="-lzephyr";;
-+esac
-+
-+
-+if test "$with_zephyr" != "no"; then
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_ZEPHYR 
-+_ACEOF
-+
-+fi
-+
-+
-+# Check whether --with-pidfile was given.
-+if test "${with_pidfile+set}" = set; then
-+  withval=$with_pidfile; MASTERPIDFILE="$withval"
-+else
-+  MASTERPIDFILE="/var/run/cyrus-master.pid"
-+fi
-+
-+MASTERPIDFILE="\"$MASTERPIDFILE\""
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define MASTER_PIDFILE $MASTERPIDFILE
-+_ACEOF
-+
-+
-+
-+# Check whether --with-idle was given.
-+if test "${with_idle+set}" = set; then
-+  withval=$with_idle; WITH_IDLE="${withval}"
-+else
-+  WITH_IDLE="poll"
-+fi
-+
-+
-+
-+ENABLE_NNTP=no
-+# Check whether --enable-nntp was given.
-+if test "${enable_nntp+set}" = set; then
-+  enableval=$enable_nntp; ENABLE_NNTP=$enableval
-+        if test "$ENABLE_NNTP" != no; then
-+	  IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
-+        fi
-+fi
-+ 
-+
-+# Check whether --enable-murder was given.
-+if test "${enable_murder+set}" = set; then
-+  enableval=$enable_murder; if test "$enableval" != no; then
-+	  IMAP_PROGS="$IMAP_PROGS proxyd lmtpproxyd mupdate"
-+        fi
-+fi
-+ 
-+
-+
-+
-+
-+# Check whether --with-com_err was given.
-+if test "${with_com_err+set}" = set; then
-+  withval=$with_com_err; 
-+fi
-+
-+if test -z "$with_com_err"; then
-+	# no value supplied
-+	{ echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5
-+echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_com_err_com_err+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcom_err  $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 com_err ();
-+int
-+main ()
-+{
-+return com_err ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_com_err_com_err=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_com_err_com_err=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_com_err_com_err" >&5
-+echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6; }
-+if test $ac_cv_lib_com_err_com_err = yes; then
-+  
-+		# com_err is already in library path
-+		# guess we're okay
-+		# can use system com_err
-+		with_com_err=""
-+		if test "${ac_cv_header_et_com_err_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for et/com_err.h" >&5
-+echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_et_com_err_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking et/com_err.h usability" >&5
-+echo $ECHO_N "checking et/com_err.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <et/com_err.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 et/com_err.h presence" >&5
-+echo $ECHO_N "checking et/com_err.h 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 <et/com_err.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: et/com_err.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: et/com_err.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: et/com_err.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: et/com_err.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: et/com_err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for et/com_err.h" >&5
-+echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_et_com_err_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_et_com_err_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_et_com_err_h = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_ET_COM_ERR_H 
-+_ACEOF
-+
-+else
-+  if test "${ac_cv_header_com_err_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for com_err.h" >&5
-+echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_com_err_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_com_err_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking com_err.h usability" >&5
-+echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <com_err.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 com_err.h presence" >&5
-+echo $ECHO_N "checking com_err.h 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 <com_err.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: com_err.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: com_err.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: com_err.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: com_err.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: com_err.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: com_err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: com_err.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for com_err.h" >&5
-+echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_com_err_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_com_err_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_com_err_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_com_err_h = yes; then
-+  :
-+else
-+  { { echo "$as_me:$LINENO: error: cannot locate com_err.h" >&5
-+echo "$as_me: error: cannot locate com_err.h" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+fi
-+
-+
-+		# Extract the first word of "compile_et", so it can be a program name with args.
-+set dummy compile_et; 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_path_COMPILE_ET+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $COMPILE_ET in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
-+  ;;
-+esac
-+fi
-+COMPILE_ET=$ac_cv_path_COMPILE_ET
-+if test -n "$COMPILE_ET"; then
-+  { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
-+echo "${ECHO_T}$COMPILE_ET" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+	
-+else
-+  
-+	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
-+		with_com_err="/usr/local"
-+		# Extract the first word of "/usr/local/bin/compile_et", so it can be a program name with args.
-+set dummy /usr/local/bin/compile_et; 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_path_COMPILE_ET+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $COMPILE_ET in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
-+  ;;
-+esac
-+fi
-+COMPILE_ET=$ac_cv_path_COMPILE_ET
-+if test -n "$COMPILE_ET"; then
-+  { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
-+echo "${ECHO_T}$COMPILE_ET" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
-+		with_com_err="/usr"
-+		# Extract the first word of "/usr/bin/compile_et", so it can be a program name with args.
-+set dummy /usr/bin/compile_et; 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_path_COMPILE_ET+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $COMPILE_ET in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
-+  ;;
-+esac
-+fi
-+COMPILE_ET=$ac_cv_path_COMPILE_ET
-+if test -n "$COMPILE_ET"; then
-+  { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
-+echo "${ECHO_T}$COMPILE_ET" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+	else
-+		# use ours
-+		with_com_err=yes
-+	fi
-+	
-+fi
-+
-+
-+	if test "${with_com_err}" = "no"; then
-+	  { echo "$as_me:$LINENO: WARNING: com_err is required; included version will be used." >&5
-+echo "$as_me: WARNING: com_err is required; included version will be used." >&2;}
-+	  with_com_err="yes"
-+	fi
-+	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
-+	  { echo "$as_me:$LINENO: WARNING: Parts of com_err distribuion were found, but not compile_et." >&5
-+echo "$as_me: WARNING: Parts of com_err distribuion were found, but not compile_et." >&2;}
-+	  { echo "$as_me:$LINENO: WARNING: Will build com_err from included sources." >&5
-+echo "$as_me: WARNING: Will build com_err from included sources." >&2;}
-+	  with_com_err="yes" # build it ourselves
-+	fi
-+fi
-+
-+case "$with_com_err" in
-+  # built-in et
-+  yes) # use the com_err we're gonna build
-+	  COM_ERR_LIBS="../et/libcom_err.a"
-+	  COMPILE_ET="../et/compile_et"
-+	  COM_ERR_LDFLAGS=""
-+	  COM_ERR_CPPFLAGS="-I\${top_srcdir}/et"
-+	  PRE_SUBDIRS="et ${PRE_SUBDIRS}"
-+	  EXTRA_OUTPUT="${EXTRA_OUTPUT} et/Makefile"
-+	  ;;
-+  "")   # no problem, we already have it in the paths
-+	# we do nothing to pick it up
-+	COM_ERR_LIBS="-lcom_err" # hope it's not shared
-+	# we already set COMPILE_ET, or we didn't get here
-+	COM_ERR_LDFLAGS=""
-+	COM_ERR_CPPFLAGS=""
-+      ;;
-+  *) # use whatever they told us, or whatever we found
-+     COMPILE_ET="${with_com_err}/bin/compile_et"
-+     COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
-+     COM_ERR_CPPFLAGS="-I${with_com_err}/include"
-+     # Ever get the feeling people hide this stuff on purpose?
-+     if test -d "${with_com_err}/include/et" ; then
-+       COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
-+     fi
-+     COMPILE_ET="${with_com_err}/bin/compile_et"
-+esac
-+
-+
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for modern syslog" >&5
-+echo $ECHO_N "checking for modern syslog... $ECHO_C" >&6; }
-+if test "${cyrus_cv_lib_syslog+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 <syslog.h>
-+#ifndef LOG_LOCAL6
-+#include </nonexistent>
-+#endif
-+_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  cyrus_cv_lib_syslog=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  cyrus_cv_lib_syslog=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+
-+if test $cyrus_cv_lib_syslog = no; then
-+	PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
-+	EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
-+	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
-+	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
-+fi
-+{ echo "$as_me:$LINENO: result: $cyrus_cv_lib_syslog" >&5
-+echo "${ECHO_T}$cyrus_cv_lib_syslog" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking which syslog facility to use" >&5
-+echo $ECHO_N "checking which syslog facility to use... $ECHO_C" >&6; }
-+SYSLOG_FACILITY=LOG_LOCAL6
-+
-+# Check whether --with-syslogfacility was given.
-+if test "${with_syslogfacility+set}" = set; then
-+  withval=$with_syslogfacility;  if test "$withval" != "yes" -a "$withval" != "no" ; then
-+                       SYSLOG_FACILITY=LOG_$withval
-+               fi; 
-+fi
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SYSLOG_FACILITY $SYSLOG_FACILITY
-+_ACEOF
-+
-+{ echo "$as_me:$LINENO: result: $SYSLOG_FACILITY" >&5
-+echo "${ECHO_T}$SYSLOG_FACILITY" >&6; }
-+
-+
-+for ac_func in getdtablesize
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+ 
-+else
-+  case " $LIB@&t at OBJS " in
-+  *" $ac_func.$ac_objext "* ) ;;
-+  *) LIB@&t at OBJS="$LIB@&t at OBJS $ac_func.$ac_objext"
-+ ;;
-+esac
-+
-+fi
-+done
-+
-+
-+# Check whether --enable-cmulocal was given.
-+if test "${enable_cmulocal+set}" = set; then
-+  enableval=$enable_cmulocal; if test "$enableval" = yes; then
-+		EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
-+		EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
-+	fi
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking to use old sieve service name" >&5
-+echo $ECHO_N "checking to use old sieve service name... $ECHO_C" >&6; }
-+# Check whether --enable-oldsievename was given.
-+if test "${enable_oldsievename+set}" = set; then
-+  enableval=$enable_oldsievename; if test "$enableval" = yes; then
-+		{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+		
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define OLD_SIEVE_SERVICE_NAME 
-+_ACEOF
-+
-+	else
-+		{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+	fi
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Check whether --enable-listext was given.
-+if test "${enable_listext+set}" = set; then
-+  enableval=$enable_listext; if test "$enableval" = yes; then
-+		
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define ENABLE_LISTEXT 
-+_ACEOF
-+
-+	fi
-+fi
-+
-+
-+# Check whether --enable-netscapehack was given.
-+if test "${enable_netscapehack+set}" = set; then
-+  enableval=$enable_netscapehack; if test "$enableval" = yes; then
-+		
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define ENABLE_X_NETSCAPE_HACK 
-+_ACEOF
-+
-+	fi
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-+if test "${ac_cv_func_dlopen+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 dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define dlopen innocuous_dlopen
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char dlopen (); 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 dlopen
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+/* 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_dlopen || defined __stub___dlopen
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_dlopen=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_dlopen=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_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-+if test $ac_cv_func_dlopen = yes; then
-+  :
-+else
-+  
-+{ 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
-+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
-+/* 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 dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_dl_dlopen=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	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
-+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
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_LIBDL 1
-+_ACEOF
-+
-+  LIBS="-ldl $LIBS"
-+
-+fi
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for crypt" >&5
-+echo $ECHO_N "checking for crypt... $ECHO_C" >&6; }
-+if test "${ac_cv_func_crypt+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 crypt to an innocuous variant, in case <limits.h> declares crypt.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define crypt innocuous_crypt
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char crypt (); 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 crypt
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char crypt ();
-+/* 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_crypt || defined __stub___crypt
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return crypt ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_crypt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_crypt=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_crypt" >&5
-+echo "${ECHO_T}$ac_cv_func_crypt" >&6; }
-+if test $ac_cv_func_crypt = yes; then
-+  cmu_have_crypt=yes
-+else
-+  { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypt  $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 crypt ();
-+int
-+main ()
-+{
-+return crypt ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_crypt_crypt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_crypt_crypt=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_crypt_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
-+if test $ac_cv_lib_crypt_crypt = yes; then
-+  LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
-+else
-+  cmu_have_crypt=no
-+fi
-+
-+fi
-+
-+
-+
-+
-+
-+# Check whether --enable-gssapi was given.
-+if test "${enable_gssapi+set}" = set; then
-+  enableval=$enable_gssapi; gssapi=$enableval
-+else
-+  gssapi=yes
-+fi
-+
-+
-+# Check whether --with-gss_impl was given.
-+if test "${with_gss_impl+set}" = set; then
-+  withval=$with_gss_impl; gss_impl=$withval
-+else
-+  gss_impl=auto
-+fi
-+
-+
-+if test "$gssapi" != no; then
-+  platform=
-+  case "${host}" in
-+    *-*-linux*)
-+      platform=__linux
-+      ;;
-+    *-*-hpux*)
-+      platform=__hpux
-+      ;;
-+    *-*-irix*)
-+      platform=__irix
-+      ;;
-+    *-*-solaris2*)
-+# When should we use __sunos?
-+      platform=__solaris
-+      ;;
-+    *-*-aix*)
-+###_AIX
-+      platform=__aix
-+      ;;
-+    *)
-+      { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
-+echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
-+      if test "$gss_impl" = "cybersafe"; then
-+        { { echo "$as_me:$LINENO: error: CyberSafe was forced, cannot continue as platform is not supported" >&5
-+echo "$as_me: error: CyberSafe was forced, cannot continue as platform is not supported" >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+      ;;
-+  esac
-+
-+  cmu_saved_CPPFLAGS=$CPPFLAGS
-+
-+  if test -d ${gssapi}; then
-+    CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-+# We want to keep -I in our CPPFLAGS, but only if we succeed
-+    cmu_saved_CPPFLAGS=$CPPFLAGS
-+### I am not sure how useful is this (and whether this is required at all
-+### especially when we have to provide two -L flags for new CyberSafe
-+    LDFLAGS="$LDFLAGS -L$gssapi/lib"
-+
-+    if test -n "$platform"; then
-+      if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
-+        CPPFLAGS="$CPPFLAGS -D$platform"
-+        if test -d "${gssapi}/appsec-sdk/include"; then
-+          CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
-+        fi
-+      fi
-+    fi
-+  fi
-+  if test "${ac_cv_header_gssapi_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_gssapi_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking gssapi.h usability" >&5
-+echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <gssapi.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 gssapi.h presence" >&5
-+echo $ECHO_N "checking gssapi.h 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 <gssapi.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: gssapi.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: gssapi.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: gssapi.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: gssapi.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: gssapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_gssapi_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_gssapi_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_gssapi_h = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSSAPI_H 
-+_ACEOF
-+
-+else
-+  if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5
-+echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <gssapi/gssapi.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 gssapi/gssapi.h presence" >&5
-+echo $ECHO_N "checking gssapi/gssapi.h 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 <gssapi/gssapi.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_gssapi_gssapi_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_gssapi_gssapi_h = yes; then
-+  :
-+else
-+  { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no include files found" >&5
-+echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
-+fi
-+
-+
-+fi
-+
-+
-+
-+  CPPFLAGS=$cmu_saved_CPPFLAGS
-+
-+fi
-+
-+if test "$gssapi" != no; then
-+  # We need to find out which gssapi implementation we are
-+  # using. Supported alternatives are: MIT Kerberos 5,
-+  # Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
-+  # CyberSafe Kerberos 5 (http://www.cybersafe.com/)
-+  # and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
-+  #
-+  # The choice is reflected in GSSAPIBASE_LIBS
-+
-+  
-+{ echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-+echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_resolv_res_search+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv  $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 res_search ();
-+int
-+main ()
-+{
-+return res_search ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_resolv_res_search=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_resolv_res_search=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_resolv_res_search" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; }
-+if test $ac_cv_lib_resolv_res_search = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_LIBRESOLV 1
-+_ACEOF
-+
-+  LIBS="-lresolv $LIBS"
-+
-+fi
-+
-+  if test -d ${gssapi}; then
-+     gssapi_dir="${gssapi}/lib"
-+     GSSAPIBASE_LIBS="-L$gssapi_dir"
-+     GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
-+  else
-+     # FIXME: This is only used for building cyrus, and then only as
-+     # a real hack.  it needs to be fixed.
-+     gssapi_dir="/usr/local/lib"
-+  fi
-+
-+  # Check a full link against the Heimdal libraries.
-+  # If this fails, check a full link against the MIT libraries.
-+  # If this fails, check a full link against the CyberSafe libraries.
-+  # If this fails, check a full link against the Solaris 8 and up libgss.
-+
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
-+    gss_failed=0
-+    { echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi" >&5
-+echo $ECHO_N "checking for gss_unwrap in -lgssapi... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $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 gss_unwrap ();
-+int
-+main ()
-+{
-+return gss_unwrap ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_gssapi_gss_unwrap=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_gssapi_gss_unwrap=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_gssapi_gss_unwrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_gssapi_gss_unwrap" >&6; }
-+if test $ac_cv_lib_gssapi_gss_unwrap = yes; then
-+  gss_impl="heimdal"
-+else
-+  gss_failed=1
-+fi
-+
-+    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
-+      gss_impl="failed"
-+    fi
-+  fi
-+
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
-+    # check for libkrb5support first
-+    { echo "$as_me:$LINENO: checking for krb5int_getspecific in -lkrb5support" >&5
-+echo $ECHO_N "checking for krb5int_getspecific in -lkrb5support... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_krb5support_krb5int_getspecific+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lkrb5support ${LIB_SOCKET} $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 krb5int_getspecific ();
-+int
-+main ()
-+{
-+return krb5int_getspecific ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_krb5support_krb5int_getspecific=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_krb5support_krb5int_getspecific=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_krb5support_krb5int_getspecific" >&5
-+echo "${ECHO_T}$ac_cv_lib_krb5support_krb5int_getspecific" >&6; }
-+if test $ac_cv_lib_krb5support_krb5int_getspecific = yes; then
-+  K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a
-+fi
-+
-+
-+    gss_failed=0
-+    { echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi_krb5" >&5
-+echo $ECHO_N "checking for gss_unwrap in -lgssapi_krb5... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gssapi_krb5_gss_unwrap+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET} $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 gss_unwrap ();
-+int
-+main ()
-+{
-+return gss_unwrap ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_gssapi_krb5_gss_unwrap=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_gssapi_krb5_gss_unwrap=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_gssapi_krb5_gss_unwrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6; }
-+if test $ac_cv_lib_gssapi_krb5_gss_unwrap = yes; then
-+  gss_impl="mit"
-+else
-+  gss_failed=1
-+fi
-+
-+    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
-+      gss_impl="failed"
-+    fi
-+  fi
-+
-+  # For Cybersafe one has to set a platform define in order to make compilation work
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
-+
-+    cmu_saved_CPPFLAGS=$CPPFLAGS
-+    cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
-+# FIXME - Note that the libraries are in .../lib64 for 64bit kernels
-+    if test -d "${gssapi}/appsec-rt/lib"; then
-+      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
-+    fi
-+    CPPFLAGS="$CPPFLAGS -D$platform"
-+    if test -d "${gssapi}/appsec-sdk/include"; then
-+      CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
-+    fi
-+
-+    gss_failed=0
-+
-+# Check for CyberSafe with two libraries first, than fall back to a single 
-+# library (older CyberSafe)
-+
-+    unset ac_cv_lib_gss_csf_gss_acq_user
-+    { echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
-+echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgss ${GSSAPIBASE_LIBS} -lgss -lcstbk5 $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 csf_gss_acq_user ();
-+int
-+main ()
-+{
-+return csf_gss_acq_user ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_gss_csf_gss_acq_user=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_gss_csf_gss_acq_user=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_gss_csf_gss_acq_user" >&5
-+echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
-+if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
-+  gss_impl="cybersafe03"
-+else
-+  unset ac_cv_lib_gss_csf_gss_acq_user;
-+                  { echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
-+echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgss $GSSAPIBASE_LIBS -lgss $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 csf_gss_acq_user ();
-+int
-+main ()
-+{
-+return csf_gss_acq_user ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_gss_csf_gss_acq_user=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_gss_csf_gss_acq_user=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_gss_csf_gss_acq_user" >&5
-+echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
-+if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
-+  gss_impl="cybersafe"
-+else
-+  gss_failed=1
-+fi
-+
-+fi
-+
-+
-+    if test "$gss_failed" = "1"; then
-+# Restore variables
-+      GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
-+      CPPFLAGS=$cmu_saved_CPPFLAGS
-+
-+      if test "$gss_impl" != "auto"; then
-+        gss_impl="failed"
-+      fi
-+    fi
-+  fi
-+
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
-+    gss_failed=0
-+    { echo "$as_me:$LINENO: checking for gss_unwrap in -lgss" >&5
-+echo $ECHO_N "checking for gss_unwrap in -lgss... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgss -lgss $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 gss_unwrap ();
-+int
-+main ()
-+{
-+return gss_unwrap ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_gss_gss_unwrap=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_gss_gss_unwrap=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_gss_gss_unwrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_gss_gss_unwrap" >&6; }
-+if test $ac_cv_lib_gss_gss_unwrap = yes; then
-+  gss_impl="seam"
-+else
-+  gss_failed=1
-+fi
-+
-+    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
-+      gss_impl="failed"
-+    fi
-+  fi
-+
-+  if test "$gss_impl" = "mit"; then
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
-+    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
-+  elif test "$gss_impl" = "heimdal"; then
-+    CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-+    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-+  elif test "$gss_impl" = "cybersafe03"; then
-+# Version of CyberSafe with two libraries
-+    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
-+    # there is no static libgss for CyberSafe
-+    GSSAPIBASE_STATIC_LIBS=none
-+  elif test "$gss_impl" = "cybersafe"; then
-+    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
-+    # there is no static libgss for CyberSafe
-+    GSSAPIBASE_STATIC_LIBS=none
-+  elif test "$gss_impl" = "seam"; then
-+    GSSAPIBASE_LIBS=-lgss
-+    # there is no static libgss on Solaris 8 and up
-+    GSSAPIBASE_STATIC_LIBS=none
-+  elif test "$gss_impl" = "failed"; then
-+    gssapi="no"
-+    GSSAPIBASE_LIBS=
-+    GSSAPIBASE_STATIC_LIBS=
-+    { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - specified library not found" >&5
-+echo "$as_me: WARNING: Disabling GSSAPI - specified library not found" >&2;}
-+  else
-+    gssapi="no"
-+    GSSAPIBASE_LIBS=
-+    GSSAPIBASE_STATIC_LIBS=
-+    { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no library" >&5
-+echo "$as_me: WARNING: Disabling GSSAPI - no library" >&2;}
-+  fi
-+fi
-+
-+#
-+# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME
-+# in gssapi\rfckrb5.h
-+#
-+if test "$gssapi" != "no"; then
-+  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi/gssapi.h>
-+                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
-+                    hostbased_service_gss_nt_yes
-+                  #endif
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "hostbased_service_gss_nt_yes" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
-+_ACEOF
-+
-+else
-+  { echo "$as_me:$LINENO: WARNING: Cybersafe define not found" >&5
-+echo "$as_me: WARNING: Cybersafe define not found" >&2;}
-+fi
-+rm -f conftest*
-+
-+
-+  elif test "$ac_cv_header_gssapi_h" = "yes"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+  elif test "$ac_cv_header_gssapi_gssapi_h"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi/gssapi.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+  fi
-+
-+  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi/gssapi.h>
-+                  #ifdef GSS_C_NT_USER_NAME
-+                   user_name_yes_gss_nt
-+                  #endif
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "user_name_yes_gss_nt" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_USER_NAME 
-+_ACEOF
-+
-+else
-+  { echo "$as_me:$LINENO: WARNING: Cybersafe define not found" >&5
-+echo "$as_me: WARNING: Cybersafe define not found" >&2;}
-+fi
-+rm -f conftest*
-+
-+  elif test "$ac_cv_header_gssapi_h" = "yes"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_USER_NAME 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+  elif test "$ac_cv_header_gssapi_gssapi_h"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi/gssapi.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_USER_NAME 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+  fi
-+fi
-+
-+GSSAPI_LIBS=""
-+{ echo "$as_me:$LINENO: checking GSSAPI" >&5
-+echo $ECHO_N "checking GSSAPI... $ECHO_C" >&6; }
-+if test "$gssapi" != no; then
-+  { echo "$as_me:$LINENO: result: with implementation ${gss_impl}" >&5
-+echo "${ECHO_T}with implementation ${gss_impl}" >&6; }
-+  { echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-+echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_resolv_res_search+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv  $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 res_search ();
-+int
-+main ()
-+{
-+return res_search ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_resolv_res_search=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_resolv_res_search=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_resolv_res_search" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; }
-+if test $ac_cv_lib_resolv_res_search = yes; then
-+  GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
-+fi
-+
-+  SASL_MECHS="$SASL_MECHS libgssapiv2.la"
-+  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
-+  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
-+
-+  cmu_save_LIBS="$LIBS"
-+  LIBS="$LIBS $GSSAPIBASE_LIBS"
-+  
-+for ac_func in gsskrb5_register_acceptor_identity
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+  LIBS="$cmu_save_LIBS"
-+else
-+  { echo "$as_me:$LINENO: result: disabled" >&5
-+echo "${ECHO_T}disabled" >&6; }
-+fi
-+
-+
-+
-+
-+
-+
-+# Check whether --with-sasl was given.
-+if test "${with_sasl+set}" = set; then
-+  withval=$with_sasl; with_sasl="$withval"
-+else
-+  with_sasl="yes"
-+fi
-+
-+
-+
-+# Check whether --with-staticsasl was given.
-+if test "${with_staticsasl+set}" = set; then
-+  withval=$with_staticsasl; with_staticsasl="$withval";
-+             if test $with_staticsasl != "no"; then
-+               using_static_sasl="static"
-+             fi
-+else
-+  with_staticsasl="no"; using_static_sasl="no"
-+fi
-+
-+
-+SASLFLAGS=""
-+LIB_SASL=""
-+
-+cmu_saved_CPPFLAGS=$CPPFLAGS
-+cmu_saved_LDFLAGS=$LDFLAGS
-+cmu_saved_LIBS=$LIBS
-+
-+if test ${with_staticsasl} != "no"; then
-+  if test -d ${with_staticsasl}; then
-+    if test -d ${with_staticsasl}/lib64 ; then
-+      ac_cv_sasl_where_lib=${with_staticsasl}/lib64
-+    else
-+      ac_cv_sasl_where_lib=${with_staticsasl}/lib
-+    fi
-+    ac_cv_sasl_where_lib=${with_staticsasl}/lib
-+    ac_cv_sasl_where_inc=${with_staticsasl}/include
-+
-+    SASLFLAGS="-I$ac_cv_sasl_where_inc"
-+    LIB_SASL="-L$ac_cv_sasl_where_lib"
-+    CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
-+    LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
-+  else
-+    with_staticsasl="/usr"
-+  fi
-+
-+  if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
-+echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sasl/sasl.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sasl/sasl.h presence" >&5
-+echo $ECHO_N "checking sasl/sasl.h 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 <sasl/sasl.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sasl_sasl_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sasl_sasl_h = yes; then
-+  if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
-+echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sasl/saslutil.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sasl/saslutil.h presence" >&5
-+echo $ECHO_N "checking sasl/saslutil.h 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 <sasl/saslutil.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sasl_saslutil_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sasl_saslutil_h = yes; then
-+  for i42 in lib64 lib; do
-+                                      if test -r ${with_staticsasl}/$i42/libsasl2.a; then
-+                                        ac_cv_found_sasl=yes
-+                                        { echo "$as_me:$LINENO: checking for static libsasl" >&5
-+echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6; }
-+                                        LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
-+                                      fi
-+                                    done
-+                                    if test ! "$ac_cv_found_sasl" = "yes"; then
-+                                      { echo "$as_me:$LINENO: checking for static libsasl" >&5
-+echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6; }
-+                                      { { echo "$as_me:$LINENO: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&5
-+echo "$as_me: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&2;}
-+   { (exit 1); exit 1; }; }
-+                                    fi
-+fi
-+
-+
-+fi
-+
-+
-+
-+  { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+
-+  if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
-+    LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
-+  else
-+    SASL_GSSAPI_LIBS_SET=""
-+    cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS" 
-+  fi
-+fi
-+
-+if test -d ${with_sasl}; then
-+  ac_cv_sasl_where_lib=${with_sasl}/lib
-+  ac_cv_sasl_where_inc=${with_sasl}/include
-+
-+  DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
-+  if test "$ac_cv_sasl_where_lib" != ""; then
-+    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL}"
-+  else
-+	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL} $andrew_runpath_switch$ac_cv_sasl_where_lib"
-+  fi
-+
-+  fi
-+  LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
-+  CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
-+  LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
-+fi
-+
-+# be sure to check for a SASLv2 specific function
-+if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
-+echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sasl/sasl.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sasl/sasl.h presence" >&5
-+echo $ECHO_N "checking sasl/sasl.h 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 <sasl/sasl.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sasl_sasl_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sasl_sasl_h = yes; then
-+  if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
-+echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sasl/saslutil.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sasl/saslutil.h presence" >&5
-+echo $ECHO_N "checking sasl/saslutil.h 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 <sasl/saslutil.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sasl_saslutil_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sasl_saslutil_h = yes; then
-+  { echo "$as_me:$LINENO: checking for prop_get in -lsasl2" >&5
-+echo $ECHO_N "checking for prop_get in -lsasl2... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsasl2  $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 prop_get ();
-+int
-+main ()
-+{
-+return prop_get ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_sasl2_prop_get=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_sasl2_prop_get=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_sasl2_prop_get" >&5
-+echo "${ECHO_T}$ac_cv_lib_sasl2_prop_get" >&6; }
-+if test $ac_cv_lib_sasl2_prop_get = yes; then
-+  ac_cv_found_sasl=yes
-+else
-+  ac_cv_found_sasl=no
-+fi
-+
-+else
-+  ac_cv_found_sasl=no
-+fi
-+
-+
-+else
-+  ac_cv_found_sasl=no
-+fi
-+
-+
-+
-+if test "$ac_cv_found_sasl" = "yes"; then
-+  if test "$ac_cv_sasl_where_lib" != ""; then
-+    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL}"
-+  else
-+	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL} $andrew_runpath_switch$ac_cv_sasl_where_lib"
-+  fi
-+
-+  fi
-+  DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
-+  if test "$using_static_sasl" != "static"; then
-+    LIB_SASL=$DYNLIB_SASL
-+    SASLFLAGS=$DYNSASLFLAGS
-+  fi
-+else
-+  DYNLIB_SASL=""
-+  DYNSASLFLAGS=""
-+  using_static_sasl="staticonly"
-+fi
-+
-+if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
-+  SASL_GSSAPI_LIBS_SET=""
-+  cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS" 
-+fi
-+
-+LIBS="$cmu_saved_LIBS"
-+LDFLAGS="$cmu_saved_LDFLAGS"
-+CPPFLAGS="$cmu_saved_CPPFLAGS"
-+
-+
-+
-+
-+
-+
-+
-+if test "$ac_cv_found_sasl" != "yes"; then
-+  { { echo "$as_me:$LINENO: error: Cannot continue without libsasl2.
-+Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." >&5
-+echo "$as_me: error: Cannot continue without libsasl2.
-+Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+cmu_saved_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$CPPFLAGS $SASLFLAGS"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <sasl/sasl.h>
-+
-+#ifndef SASL_VERSION_MAJOR
-+#error SASL_VERSION_MAJOR not defined
-+#endif
-+#ifndef SASL_VERSION_MINOR
-+#error SASL_VERSION_MINOR not defined
-+#endif
-+#ifndef SASL_VERSION_STEP
-+#error SASL_VERSION_STEP not defined
-+#endif
-+
-+#if SASL_VERSION_MAJOR < 2 || SASL_VERSION_MINOR < 1 || SASL_VERSION_STEP < 7
-+#error SASL version is less than 2.1.7
-+#endif
-+
-+_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  { { echo "$as_me:$LINENO: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&5
-+echo "$as_me: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+
-+CPPFLAGS=$cmu_saved_CPPFLAGS
-+
-+
-+
-+cmu_saved_LDFLAGS=$LDFLAGS
-+
-+LDFLAGS="$LDFLAGS $LIB_SASL"
-+
-+{ echo "$as_me:$LINENO: checking for sasl_checkapop in -lsasl2" >&5
-+echo $ECHO_N "checking for sasl_checkapop in -lsasl2... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsasl2  $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 sasl_checkapop ();
-+int
-+main ()
-+{
-+return sasl_checkapop ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_sasl2_sasl_checkapop=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_sasl2_sasl_checkapop=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_sasl2_sasl_checkapop" >&5
-+echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_checkapop" >&6; }
-+if test $ac_cv_lib_sasl2_sasl_checkapop = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_APOP 
-+_ACEOF
-+
-+else
-+  { { echo "$as_me:$LINENO: error: libsasl2 without working sasl_checkapop.  Cannot continue." >&5
-+echo "$as_me: error: libsasl2 without working sasl_checkapop.  Cannot continue." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+LDFLAGS=$cmu_saved_LDFLAGS
-+
-+
-+
-+# Check whether --with-perl was given.
-+if test "${with_perl+set}" = set; then
-+  withval=$with_perl; with_perl="$withval"
-+else
-+  with_perl="perl"
-+fi
-+
-+
-+if test "${with_perl}" = yes; then
-+    with_perl="perl"
-+fi
-+if test "${with_perl}" != no; then
-+    if test ${using_static_sasl} = "staticonly"; then
-+	{ echo "$as_me:$LINENO: WARNING: Cannot compile perl utilities using static libsasl" >&5
-+echo "$as_me: WARNING: Cannot compile perl utilities using static libsasl" >&2;}
-+	with_perl="no"
-+    else 
-+	for ac_prog in ${with_perl} perl
-+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_PERL+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$PERL"; then
-+  ac_cv_prog_PERL="$PERL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_PERL="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+PERL=$ac_cv_prog_PERL
-+if test -n "$PERL"; then
-+  { echo "$as_me:$LINENO: result: $PERL" >&5
-+echo "${ECHO_T}$PERL" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$PERL" && break
-+done
-+test -n "$PERL" || PERL="with_perl=notfound"
-+
-+    fi
-+fi
-+if test "$with_perl" = "notfound"; then
-+    { echo "$as_me:$LINENO: WARNING: Perl not found: Administrative tools won't be available" >&5
-+echo "$as_me: WARNING: Perl not found: Administrative tools won't be available" >&2;}
-+elif test "${with_perl}" != "no"; then
-+    EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
-+    PERL_SUBDIRS="imap"
-+    PERL="${with_perl}"
-+    PERL_CCCDLFLAGS="$cccdlflags"
-+    
-+fi
-+
-+if test "$sievedir" != "no"; then
-+	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} timsieved notifyd"
-+	EXTRA_OUTPUT="${EXTRA_OUTPUT} timsieved/Makefile notifyd/Makefile"
-+
-+	PERL_SUBDIRS="${PERL_SUBDIRS} sieve"
-+	PERL_DEPSUBDIRS="sieve"
-+	EXTRA_OUTPUT="${EXTRA_OUTPUT} perl/sieve/Makefile perl/sieve/lib/Makefile"
-+else
-+	PERL_DEPSUBDIRS="none"
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for MD5Init" >&5
-+echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6; }
-+if test "${ac_cv_func_MD5Init+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 MD5Init to an innocuous variant, in case <limits.h> declares MD5Init.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define MD5Init innocuous_MD5Init
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char MD5Init (); 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 MD5Init
-+
-+/* 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 MD5Init ();
-+/* 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_MD5Init || defined __stub___MD5Init
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return MD5Init ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_MD5Init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_MD5Init=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_MD5Init" >&5
-+echo "${ECHO_T}$ac_cv_func_MD5Init" >&6; }
-+if test $ac_cv_func_MD5Init = yes; then
-+  :
-+else
-+  { echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5
-+echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_md_MD5Init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmd  $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 MD5Init ();
-+int
-+main ()
-+{
-+return MD5Init ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_md_MD5Init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_md_MD5Init=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_md_MD5Init" >&5
-+echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6; }
-+if test $ac_cv_lib_md_MD5Init = yes; then
-+  LIBS="${LIBS} -lmd"
-+else
-+  MD5OBJ="md5.o"
-+fi
-+
-+fi
-+
-+
-+
-+SNMP_SUBDIRS=""
-+
-+
-+
-+# Check whether --with-lib-subdir was given.
-+if test "${with_lib_subdir+set}" = set; then
-+  withval=$with_lib_subdir; 
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-+if test "${ac_cv_type_long+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 long 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_type_long=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_type_long=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_lo=0 ac_mid=0
-+  while :; do
-+    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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+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
-+	        typedef long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=-1 ac_mid=-1
-+  while :; do
-+    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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo= ac_hi=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long=$ac_lo;;
-+'') if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi ;;
-+esac
-+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 long ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+@%:@include <stdio.h>
-+@%:@include <stdlib.h>
-+int
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
-+  return ferror (f) || fclose (f) != 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_sizeof_long=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.val
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
-+
-+
-+{ echo "$as_me:$LINENO: checking what directory libraries are found in" >&5
-+echo $ECHO_N "checking what directory libraries are found in... $ECHO_C" >&6; }
-+if test "${ac_cv_cmu_lib_subdir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
-+test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
-+if test "X$with_lib_subdir" = "X" ; then
-+  ac_cv_cmu_lib_subdir=lib
-+  if test $ac_cv_sizeof_long -eq 4 ; then
-+    test -d /usr/lib32 && ac_cv_cmu_lib_subdir=lib32
-+  fi
-+  if test $ac_cv_sizeof_long -eq 8 ; then
-+    test -d /usr/lib64 && ac_cv_cmu_lib_subdir=lib64
-+  fi
-+else
-+  ac_cv_cmu_lib_subdir=$with_lib_subdir
-+fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_cmu_lib_subdir" >&5
-+echo "${ECHO_T}$ac_cv_cmu_lib_subdir" >&6; }
-+CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
-+
-+
-+
-+
-+  
-+  
-+# Check whether --with-libwrap was given.
-+if test "${with_libwrap+set}" = set; then
-+  withval=$with_libwrap; with_libwrap=$withval
-+else
-+  with_libwrap=yes
-+fi
-+
-+  if test "$with_libwrap" != no; then
-+    if test -d "$with_libwrap"; then
-+      CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
-+      LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
-+    fi
-+    cmu_save_LIBS="$LIBS"
-+    { echo "$as_me:$LINENO: checking for request_init in -lwrap" >&5
-+echo $ECHO_N "checking for request_init in -lwrap... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_wrap_request_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lwrap ${LIB_SOCKET} $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 request_init ();
-+int
-+main ()
-+{
-+return request_init ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_wrap_request_init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_wrap_request_init=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_wrap_request_init" >&5
-+echo "${ECHO_T}$ac_cv_lib_wrap_request_init" >&6; }
-+if test $ac_cv_lib_wrap_request_init = yes; then
-+  
-+		 if test "${ac_cv_header_tcpd_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for tcpd.h" >&5
-+echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_tcpd_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
-+echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking tcpd.h usability" >&5
-+echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <tcpd.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 tcpd.h presence" >&5
-+echo $ECHO_N "checking tcpd.h 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 <tcpd.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: tcpd.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: tcpd.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: tcpd.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: tcpd.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: tcpd.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: tcpd.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for tcpd.h" >&5
-+echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_tcpd_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_tcpd_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
-+echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_tcpd_h = yes; then
-+  :
-+else
-+  with_libwrap=no
-+fi
-+
-+
-+else
-+  with_libwrap=no
-+fi
-+
-+    LIBS="$cmu_save_LIBS"
-+  fi
-+  { echo "$as_me:$LINENO: checking libwrap support" >&5
-+echo $ECHO_N "checking libwrap support... $ECHO_C" >&6; }
-+  { echo "$as_me:$LINENO: result: $with_libwrap" >&5
-+echo "${ECHO_T}$with_libwrap" >&6; }
-+  LIB_WRAP=""
-+  if test "$with_libwrap" != no; then
-+    
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_LIBWRAP 
-+_ACEOF
-+
-+    LIB_WRAP="-lwrap"
-+    { echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
-+echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $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 yp_get_default_domain ();
-+int
-+main ()
-+{
-+return yp_get_default_domain ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_nsl_yp_get_default_domain=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_nsl_yp_get_default_domain=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_nsl_yp_get_default_domain" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
-+if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
-+  LIB_WRAP="${LIB_WRAP} -lnsl"
-+fi
-+
-+  fi
-+  
-+
-+
-+
-+  
-+  
-+# Check whether --with-snmp was given.
-+if test "${with_snmp+set}" = set; then
-+  withval=$with_snmp; with_snmp=$withval
-+else
-+  with_snmp=yes
-+fi
-+
-+
-+        
-+# Check whether --with-ucdsnmp was given.
-+if test "${with_ucdsnmp+set}" = set; then
-+  withval=$with_ucdsnmp; with_snmp=$withval
-+fi
-+
-+
-+if test "$with_snmp" != "no"; then
-+
-+        if test "$with_snmp" = "yes"; then
-+    # Extract the first word of "net-snmp-config", so it can be a program name with args.
-+set dummy net-snmp-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_path_SNMP_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $SNMP_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_dummy="/usr/local/bin:$PATH"
-+for as_dir in $as_dummy
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
-+if test -n "$SNMP_CONFIG"; then
-+  { echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5
-+echo "${ECHO_T}$SNMP_CONFIG" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  else
-+    SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
-+  fi
-+
-+  if test -x "$SNMP_CONFIG"; then
-+    { echo "$as_me:$LINENO: checking NET SNMP libraries" >&5
-+echo $ECHO_N "checking NET SNMP libraries... $ECHO_C" >&6; }
-+
-+    SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
-+    SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-+
-+    if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
-+      CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
-+      LIB_UCDSNMP=$SNMP_LIBS
-+      
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_NETSNMP 1
-+_ACEOF
-+
-+      
-+      { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+    else
-+      { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+      { echo "$as_me:$LINENO: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
-+echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
-+    fi
-+  else
-+                if test "$with_snmp" != no; then
-+      if test -d "$with_snmp"; then
-+        CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
-+        LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
-+      fi
-+      cmu_save_LIBS="$LIBS"
-+      { echo "$as_me:$LINENO: checking for sprint_objid in -lsnmp" >&5
-+echo $ECHO_N "checking for sprint_objid in -lsnmp... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsnmp ${LIB_SOCKET} $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 sprint_objid ();
-+int
-+main ()
-+{
-+return sprint_objid ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_snmp_sprint_objid=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_snmp_sprint_objid=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_snmp_sprint_objid" >&5
-+echo "${ECHO_T}$ac_cv_lib_snmp_sprint_objid" >&6; }
-+if test $ac_cv_lib_snmp_sprint_objid = yes; then
-+  
-+  		 if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
-+echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking ucd-snmp/version.h usability" >&5
-+echo $ECHO_N "checking ucd-snmp/version.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <ucd-snmp/version.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 ucd-snmp/version.h presence" >&5
-+echo $ECHO_N "checking ucd-snmp/version.h 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 <ucd-snmp/version.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
-+echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_ucd_snmp_version_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_ucd_snmp_version_h = yes; then
-+  :
-+else
-+  with_snmp=no
-+fi
-+
-+
-+else
-+  with_snmp=no
-+fi
-+
-+      LIBS="$cmu_save_LIBS"
-+    fi
-+    { echo "$as_me:$LINENO: checking UCD SNMP libraries" >&5
-+echo $ECHO_N "checking UCD SNMP libraries... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: result: $with_snmp" >&5
-+echo "${ECHO_T}$with_snmp" >&6; }
-+    LIB_UCDSNMP=""
-+    if test "$with_snmp" != no; then
-+      
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_UCDSNMP 1
-+_ACEOF
-+
-+      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+      { echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
-+echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrpm -lpopt $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 rpmdbOpen ();
-+int
-+main ()
-+{
-+return rpmdbOpen ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_rpm_rpmdbOpen=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_rpm_rpmdbOpen=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_rpm_rpmdbOpen" >&5
-+echo "${ECHO_T}$ac_cv_lib_rpm_rpmdbOpen" >&6; }
-+if test $ac_cv_lib_rpm_rpmdbOpen = yes; then
-+  LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
-+fi
-+
-+    fi
-+    
-+  fi
-+fi
-+
-+
-+
-+# Figure out what directories we're linking against.
-+# Lots of fun for the whole family.
-+# This probably chokes on anything with spaces in it.
-+# All we want is the list of -L directories, and -L may or may not be
-+# followed by a space.
-+isdir=no
-+libpath=""
-+#echo "debug ldflags: << ${ldflags} >>"
-+#echo "debug default_ldflags: << ${default_ldflags} >>"
-+for flag in ${ldflags} ${default_ldflags}; do
-+  case $flag in
-+    -L)
-+      # it's a split -L option, we'll mark the next option as a dir.
-+      isdir=yes
-+      ;;
-+
-+    -L*) 
-+      # attached -L option: split off the directory
-+      larg=`echo $flag | sed -e 's:-L\(..*\):\1:'`
-+      libpath="${libpath} ${larg}"
-+      ;;
-+
-+    *)
-+      if test $isdir = yes ; then
-+	libpath="${libpath} ${flag}"
-+	isdir=no
-+      fi
-+  esac
-+done
-+
-+IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
-+IMAP_LIBS="${LIB_SASL} ${LIBS}"
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
-+
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes (double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
-+fi
-+rm -f confcache
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIB@&t at OBJS; 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"`
-+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-+  #    will be set to the directory where LIBOBJS objects are built.
-+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+done
-+LIB@&t at OBJS=$ac_libobjs
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+
-+: ${CONFIG_STATUS=./config.status}
-+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
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
-+
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+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
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_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'`
-+
-+# 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
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+  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'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
-+else
-+  as_executable_p=:
-+fi
-+rm -f conf$$.file
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+exec 6>&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.60a.  Invocation command line was
-+
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
-+
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
-+
-+Usage: $0 [OPTIONS] [FILE]...
-+
-+  -h, --help       print this help, then exit
-+  -V, --version    print version number and configuration settings, then exit
-+  -q, --quiet      do not print progress messages
-+  -d, --debug      don't remove temporary files
-+      --recheck    update $as_me by reconfiguring in the same conditions
-+  --file=FILE[:TEMPLATE]
-+		   instantiate the configuration file FILE
-+  --header=FILE[:TEMPLATE]
-+		   instantiate the configuration header FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration headers:
-+$config_headers
-+
-+Report bugs to <bug-autoconf at gnu.org>."
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ac_cs_version="\\
-+config.status
-+configured by $0, generated by GNU Autoconf 2.60a,
-+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright (C) 2006 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+_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.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+    ac_shift=:
-+    ;;
-+  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  esac
-+
-+  case $ac_option in
-+  # Handling of the options.
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    echo "$ac_cs_version"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-+    debug=: ;;
-+  --file | --fil | --fi | --f )
-+    $ac_shift
-+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+    ac_need_defaults=false;;
-+  --header | --heade | --head | --hea )
-+    $ac_shift
-+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+    ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; };;
-+  --help | --hel | -h )
-+    echo "$ac_cs_usage"; exit ;;
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
-+
-+  # This is an error.
-+  -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; } ;;
-+
-+  *) ac_config_targets="$ac_config_targets $1"
-+     ac_need_defaults=false ;;
-+
-+  esac
-+  shift
-+done
-+
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+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
-+  export CONFIG_SHELL
-+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
-+@%:@@%:@ Running $as_me. @%:@@%:@
-+_ASBOX
-+  echo "$ac_log"
-+} >&5
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
-+  case $ac_config_target in
-+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-+    "master/Makefile") CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
-+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-+    "imap/Makefile") CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
-+    "imtest/Makefile") CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
-+    "netnews/Makefile") CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
-+    "perl/Makefile") CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
-+    "$EXTRA_OUTPUT") CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+
-+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+   { (exit 1); exit 1; }; };;
-+  esac
-+done
-+
-+
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used.  Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+fi
-+
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason against having it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
-+$debug ||
-+{
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-+  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+# Create a (secure) tmp directory for tmp files.
-+
-+{
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  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.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+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
-+WARNERROR!$WARNERROR$ac_delim
-+MAKEDEPEND!$MAKEDEPEND$ac_delim
-+cyrus_prefix!$cyrus_prefix$ac_delim
-+service_path!$service_path$ac_delim
-+cyrus_user!$cyrus_user$ac_delim
-+cyrus_group!$cyrus_group$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
-+RANLIB!$RANLIB$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
-+CPP!$CPP$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+AWK!$AWK$ac_delim
-+LIB@&t at OBJS!$LIB@&t at OBJS$ac_delim
-+LIB_SOCKET!$LIB_SOCKET$ac_delim
-+IPV6_OBJS!$IPV6_OBJS$ac_delim
-+PRE_SUBDIRS!$PRE_SUBDIRS$ac_delim
-+EXTRA_SUBDIRS!$EXTRA_SUBDIRS$ac_delim
-+DEPLIBS!$DEPLIBS$ac_delim
-+LOCALDEFS!$LOCALDEFS$ac_delim
-+BDB_INC!$BDB_INC$ac_delim
-+BDB_LIB!$BDB_LIB$ac_delim
-+CYRUSDB_OBJS!$CYRUSDB_OBJS$ac_delim
-+SIEVE_OBJS!$SIEVE_OBJS$ac_delim
-+SIEVE_LIBS!$SIEVE_LIBS$ac_delim
-+SIEVE_CPPFLAGS!$SIEVE_CPPFLAGS$ac_delim
-+YACC!$YACC$ac_delim
-+YFLAGS!$YFLAGS$ac_delim
-+LEX!$LEX$ac_delim
-+LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
-+LEXLIB!$LEXLIB$ac_delim
-+SIEVE_SUBDIRS!$SIEVE_SUBDIRS$ac_delim
-+WITH_NONBLOCK!$WITH_NONBLOCK$ac_delim
-+WITH_GMTOFF!$WITH_GMTOFF$ac_delim
-+WITH_MAP!$WITH_MAP$ac_delim
-+WITH_LOCK!$WITH_LOCK$ac_delim
-+cyrus_sigveclib!$cyrus_sigveclib$ac_delim
-+AFS_LIBS!$AFS_LIBS$ac_delim
-+AFS_LDFLAGS!$AFS_LDFLAGS$ac_delim
-+LDAP_CPPFLAGS!$LDAP_CPPFLAGS$ac_delim
-+LDAP_LDFLAGS!$LDAP_LDFLAGS$ac_delim
-+LDAP_LIBS!$LDAP_LIBS$ac_delim
-+SERVER_SUBDIRS!$SERVER_SUBDIRS$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+OPENSSL_INC!$OPENSSL_INC$ac_delim
-+OPENSSL_LIB!$OPENSSL_LIB$ac_delim
-+ZEPHYR_LIBS!$ZEPHYR_LIBS$ac_delim
-+ZEPHYR_CPPFLAGS!$ZEPHYR_CPPFLAGS$ac_delim
-+WITH_IDLE!$WITH_IDLE$ac_delim
-+IMAP_PROGS!$IMAP_PROGS$ac_delim
-+COMPILE_ET!$COMPILE_ET$ac_delim
-+COM_ERR_LIBS!$COM_ERR_LIBS$ac_delim
-+COM_ERR_LDFLAGS!$COM_ERR_LDFLAGS$ac_delim
-+COM_ERR_CPPFLAGS!$COM_ERR_CPPFLAGS$ac_delim
-+LIB_CRYPT!$LIB_CRYPT$ac_delim
-+GSSAPI_LIBS!$GSSAPI_LIBS$ac_delim
-+GSSAPIBASE_LIBS!$GSSAPIBASE_LIBS$ac_delim
-+LIB_DYN_SASL!$LIB_DYN_SASL$ac_delim
-+DYNSASLFLAGS!$DYNSASLFLAGS$ac_delim
-+LIB_SASL!$LIB_SASL$ac_delim
-+SASLFLAGS!$SASLFLAGS$ac_delim
-+PERL!$PERL$ac_delim
-+PERL_CCCDLFLAGS!$PERL_CCCDLFLAGS$ac_delim
-+MD5OBJ!$MD5OBJ$ac_delim
-+SNMP_SUBDIRS!$SNMP_SUBDIRS$ac_delim
-+CMU_LIB_SUBDIR!$CMU_LIB_SUBDIR$ac_delim
-+LIB_WRAP!$LIB_WRAP$ac_delim
-+SNMP_CONFIG!$SNMP_CONFIG$ac_delim
-+LIB_UCDSNMP!$LIB_UCDSNMP$ac_delim
-+LIB_RT!$LIB_RT$ac_delim
-+IMAP_COM_ERR_LIBS!$IMAP_COM_ERR_LIBS$ac_delim
-+IMAP_LIBS!$IMAP_LIBS$ac_delim
-+PERL_SUBDIRS!$PERL_SUBDIRS$ac_delim
-+PERL_DEPSUBDIRS!$PERL_DEPSUBDIRS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+   { (exit 1); exit 1; }; };;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+   { (exit 1); exit 1; }; };;
-+      esac
-+      ac_file_inputs="$ac_file_inputs $ac_f"
-+    done
-+
-+    # Let's still pretend it is `configure' which instantiates (i.e., don't
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input="Generated from "`IFS=:
-+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
-+      { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    fi
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin";;
-+    esac
-+    ;;
-+  esac
-+
-+  ac_dir=`$as_dirname -- "$ac_file" ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+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" |
-+    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" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+  ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+  esac
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+
-+case `sed -n '/datarootdir/ {
-+  p
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+    s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  sed "$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+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
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
-+
-+  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
-+ ;;
-+  :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;}
-+    else
-+      rm -f $ac_file
-+      mv "$tmp/config.h" $ac_file
-+    fi
-+  else
-+    echo "/* $configure_input  */"
-+    cat "$ac_result"
-+  fi
-+  rm -f "$tmp/out12"
-+ ;;
-+  
-+  
-+  esac
-+
-+done # for ac_tag
-+
-+
-+{ (exit 0); exit 0; }
-+_ACEOF
-+chmod +x $CONFIG_STATUS
-+ac_clean_files=$ac_clean_files_save
-+
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded.  So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status.  When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+  ac_cs_success=:
-+  ac_config_status_args=
-+  test "$silent" = yes &&
-+    ac_config_status_args="$ac_config_status_args --quiet"
-+  exec 5>/dev/null
-+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+  exec 5>>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; }
-+fi
-+
-diff -urNad cyrus-imapd-2.2.13~/autom4te.cache/output.1 cyrus-imapd-2.2.13/autom4te.cache/output.1
---- cyrus-imapd-2.2.13~/autom4te.cache/output.1	1970-01-01 00:00:00.000000000 +0000
-+++ cyrus-imapd-2.2.13/autom4te.cache/output.1	2006-10-10 13:08:25.000000000 +0000
-@@ -0,0 +1,20030 @@
-+@%:@! /bin/sh
-+@%:@ Guess values for system-dependent variables and create Makefiles.
-+@%:@ Generated by GNU Autoconf 2.60a.
-+@%:@ 
-+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+@%:@ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+@%:@ This configure script is free software; the Free Software Foundation
-+@%:@ gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+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
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_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'`
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+if test "x$CONFIG_SHELL" = x; then
-+  if (eval ":") 2>/dev/null; then
-+  as_have_required=yes
-+else
-+  as_have_required=no
-+fi
-+
-+  if test $as_have_required = yes && 	 (eval ":
-+(as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+  as_lineno_1=\$LINENO
-+  as_lineno_2=\$LINENO
-+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+  :
-+else
-+  as_candidate_shells=
-+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  case $as_dir in
-+	 /*)
-+	   for as_base in sh bash ksh sh5; do
-+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+	   done;;
-+       esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+      for as_shell in $as_candidate_shells $SHELL; do
-+	 # Try only shells that exist, to save several forks.
-+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+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
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+:
-+_ASEOF
-+}; then
-+  CONFIG_SHELL=$as_shell
-+	       as_have_required=yes
-+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+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
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+:
-+(as_func_return () {
-+  (exit $1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  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
-+
-+
-+
-+(eval "as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+  echo No shell found that supports shell functions.
-+  echo Please tell autoconf at gnu.org about your system,
-+  echo including any error possibly output before this
-+  echo message
-+}
-+
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-+
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
-+  # line-number line 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
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+  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'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
-+else
-+  as_executable_p=:
-+fi
-+rm -f conf$$.file
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+
-+exec 7<&0 </dev/null 6>&1
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+#
-+# Initializations.
-+#
-+ac_default_prefix=/usr/local
-+ac_clean_files=
-+ac_config_libobj_dir=.
-+LIB@&t at OBJS=
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+
-+ac_unique_file="imap/imapd.c"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# ifdef HAVE_STDLIB_H
-+#  include <stdlib.h>
-+# endif
-+#endif
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-+#  include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#ifdef HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+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
-+WARNERROR
-+MAKEDEPEND
-+cyrus_prefix
-+service_path
-+cyrus_user
-+cyrus_group
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+RANLIB
-+SET_MAKE
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+CPP
-+GREP
-+EGREP
-+AWK
-+LIB@&t at OBJS
-+LIB_SOCKET
-+IPV6_OBJS
-+PRE_SUBDIRS
-+EXTRA_SUBDIRS
-+DEPLIBS
-+LOCALDEFS
-+BDB_INC
-+BDB_LIB
-+CYRUSDB_OBJS
-+SIEVE_OBJS
-+SIEVE_LIBS
-+SIEVE_CPPFLAGS
-+YACC
-+YFLAGS
-+LEX
-+LEX_OUTPUT_ROOT
-+LEXLIB
-+SIEVE_SUBDIRS
-+WITH_NONBLOCK
-+WITH_GMTOFF
-+WITH_MAP
-+WITH_LOCK
-+cyrus_sigveclib
-+AFS_LIBS
-+AFS_LDFLAGS
-+LDAP_CPPFLAGS
-+LDAP_LDFLAGS
-+LDAP_LIBS
-+SERVER_SUBDIRS
-+OPENSSL_INC
-+OPENSSL_LIB
-+ZEPHYR_LIBS
-+ZEPHYR_CPPFLAGS
-+WITH_IDLE
-+IMAP_PROGS
-+COMPILE_ET
-+COM_ERR_LIBS
-+COM_ERR_LDFLAGS
-+COM_ERR_CPPFLAGS
-+LIB_CRYPT
-+GSSAPI_LIBS
-+GSSAPIBASE_LIBS
-+LIB_DYN_SASL
-+DYNSASLFLAGS
-+LIB_SASL
-+SASLFLAGS
-+PERL
-+PERL_CCCDLFLAGS
-+MD5OBJ
-+SNMP_SUBDIRS
-+CMU_LIB_SUBDIR
-+LIB_WRAP
-+SNMP_CONFIG
-+LIB_UCDSNMP
-+LIB_RT
-+IMAP_COM_ERR_LIBS
-+IMAP_LIBS
-+PERL_SUBDIRS
-+PERL_DEPSUBDIRS
-+LTLIBOBJS'
-+ac_subst_files=''
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+CPP
-+YACC
-+YFLAGS'
-+
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+cache_file=/dev/null
-+exec_prefix=NONE
-+no_create=
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# and all the variables that are supposed to be based on exec_prefix
-+# by default will actually change.
-+# Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-+
-+ac_prev=
-+ac_dashdash=
-+for ac_option
-+do
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$ac_prev"; then
-+    eval $ac_prev=\$ac_option
-+    ac_prev=
-+    continue
-+  fi
-+
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
-+
-+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+    ac_prev=bindir ;;
-+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+    bindir=$ac_optarg ;;
-+
-+  -build | --build | --buil | --bui | --bu)
-+    ac_prev=build_alias ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build_alias=$ac_optarg ;;
-+
-+  -cache-file | --cache-file | --cache-fil | --cache-fi \
-+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+    ac_prev=cache_file ;;
-+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+    cache_file=$ac_optarg ;;
-+
-+  --config-cache | -C)
-+    cache_file=config.cache ;;
-+
-+  -datadir | --datadir | --datadi | --datad)
-+    ac_prev=datadir ;;
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-+    datadir=$ac_optarg ;;
-+
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-+  -disable-* | --disable-*)
-+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { 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 ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
-+
-+  -enable-* | --enable-*)
-+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { 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 ;;
-+
-+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-+  | --exec | --exe | --ex)
-+    ac_prev=exec_prefix ;;
-+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+  | --exec=* | --exe=* | --ex=*)
-+    exec_prefix=$ac_optarg ;;
-+
-+  -gas | --gas | --ga | --g)
-+    # Obsolete; use --with-gas.
-+    with_gas=yes ;;
-+
-+  -help | --help | --hel | --he | -h)
-+    ac_init_help=long ;;
-+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+    ac_init_help=recursive ;;
-+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+    ac_init_help=short ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host_alias ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host_alias=$ac_optarg ;;
-+
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-+  -includedir | --includedir | --includedi | --included | --include \
-+  | --includ | --inclu | --incl | --inc)
-+    ac_prev=includedir ;;
-+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+  | --includ=* | --inclu=* | --incl=* | --inc=*)
-+    includedir=$ac_optarg ;;
-+
-+  -infodir | --infodir | --infodi | --infod | --info | --inf)
-+    ac_prev=infodir ;;
-+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+    infodir=$ac_optarg ;;
-+
-+  -libdir | --libdir | --libdi | --libd)
-+    ac_prev=libdir ;;
-+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+    libdir=$ac_optarg ;;
-+
-+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+  | --libexe | --libex | --libe)
-+    ac_prev=libexecdir ;;
-+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+  | --libexe=* | --libex=* | --libe=*)
-+    libexecdir=$ac_optarg ;;
-+
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-+    localstatedir=$ac_optarg ;;
-+
-+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+    ac_prev=mandir ;;
-+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+    mandir=$ac_optarg ;;
-+
-+  -nfp | --nfp | --nf)
-+    # Obsolete; use --without-fp.
-+    with_fp=no ;;
-+
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c | -n)
-+    no_create=yes ;;
-+
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    no_recursion=yes ;;
-+
-+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+  | --oldin | --oldi | --old | --ol | --o)
-+    ac_prev=oldincludedir ;;
-+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+    oldincludedir=$ac_optarg ;;
-+
-+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+    ac_prev=prefix ;;
-+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+    prefix=$ac_optarg ;;
-+
-+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+  | --program-pre | --program-pr | --program-p)
-+    ac_prev=program_prefix ;;
-+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+    program_prefix=$ac_optarg ;;
-+
-+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+  | --program-suf | --program-su | --program-s)
-+    ac_prev=program_suffix ;;
-+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+    program_suffix=$ac_optarg ;;
-+
-+  -program-transform-name | --program-transform-name \
-+  | --program-transform-nam | --program-transform-na \
-+  | --program-transform-n | --program-transform- \
-+  | --program-transform | --program-transfor \
-+  | --program-transfo | --program-transf \
-+  | --program-trans | --program-tran \
-+  | --progr-tra | --program-tr | --program-t)
-+    ac_prev=program_transform_name ;;
-+  -program-transform-name=* | --program-transform-name=* \
-+  | --program-transform-nam=* | --program-transform-na=* \
-+  | --program-transform-n=* | --program-transform-=* \
-+  | --program-transform=* | --program-transfor=* \
-+  | --program-transfo=* | --program-transf=* \
-+  | --program-trans=* | --program-tran=* \
-+  | --progr-tra=* | --program-tr=* | --program-t=*)
-+    program_transform_name=$ac_optarg ;;
-+
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil)
-+    silent=yes ;;
-+
-+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+    ac_prev=sbindir ;;
-+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+  | --sbi=* | --sb=*)
-+    sbindir=$ac_optarg ;;
-+
-+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+  | --sharedst | --shareds | --shared | --share | --shar \
-+  | --sha | --sh)
-+    ac_prev=sharedstatedir ;;
-+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+  | --sha=* | --sh=*)
-+    sharedstatedir=$ac_optarg ;;
-+
-+  -site | --site | --sit)
-+    ac_prev=site ;;
-+  -site=* | --site=* | --sit=*)
-+    site=$ac_optarg ;;
-+
-+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+    ac_prev=srcdir ;;
-+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+    srcdir=$ac_optarg ;;
-+
-+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+  | --syscon | --sysco | --sysc | --sys | --sy)
-+    ac_prev=sysconfdir ;;
-+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+    sysconfdir=$ac_optarg ;;
-+
-+  -target | --target | --targe | --targ | --tar | --ta | --t)
-+    ac_prev=target_alias ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target_alias=$ac_optarg ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers | -V)
-+    ac_init_version=: ;;
-+
-+  -with-* | --with-*)
-+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { 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 ;;
-+
-+  -without-* | --without-*)
-+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    # Reject names that are not valid shell variable names.
-+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { 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 ;;
-+
-+  --x)
-+    # Obsolete; use --with-x.
-+    with_x=yes ;;
-+
-+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+  | --x-incl | --x-inc | --x-in | --x-i)
-+    ac_prev=x_includes ;;
-+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+    x_includes=$ac_optarg ;;
-+
-+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+    ac_prev=x_libraries ;;
-+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+  | --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; }; }
-+    ;;
-+
-+  *=*)
-+    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; }; }
-+    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
-+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+    ;;
-+
-+  esac
-+done
-+
-+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; }; }
-+fi
-+
-+# Be sure to have absolute directory names.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
-+do
-+  eval ac_val=\$$ac_var
-+  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; }; }
-+done
-+
-+# There might be people who depend on the old broken behavior: `$host'
-+# used to hold the argument of --host etc.
-+# FIXME: To remove some day.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: To remove some day.
-+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.
-+    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
-+  fi
-+fi
-+
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
-+
-+
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  { echo "$as_me: error: Working directory cannot be determined" >&2
-+   { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+   { (exit 1); exit 1; }; }
-+
-+
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+  ac_srcdir_defaulted=yes
-+  # Try the directory containing this script, then 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" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  srcdir=$ac_confdir
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-+    srcdir=..
-+  fi
-+else
-+  ac_srcdir_defaulted=no
-+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; }; }
-+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; }; }
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+  # Omit some internal or obsolete options to make the list less imposing.
-+  # This message is too long to be a string in the A/UX 3.1 sh.
-+  cat <<_ACEOF
-+\`configure' configures this package to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE.  See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+  -h, --help              display this help and exit
-+      --help=short        display options specific to this package
-+      --help=recursive    display the short help of all the included packages
-+  -V, --version           display version information and exit
-+  -q, --quiet, --silent   do not print \`checking...' messages
-+      --cache-file=FILE   cache test results in FILE [disabled]
-+  -C, --config-cache      alias for \`--cache-file=config.cache'
-+  -n, --no-create         do not create output files
-+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-+
-+Installation directories:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+			  [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+			  [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+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]
-+_ACEOF
-+
-+  cat <<\_ACEOF
-+
-+System types:
-+  --build=BUILD     configure for building on BUILD [guessed]
-+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+
-+  cat <<\_ACEOF
-+
-+Optional Features:
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+  --enable-warnings-are-errors   add -Werror to most gcc calls
-+  --disable-sieve         disable Sieve support
-+  --enable-krb5afspts     compile afskrb PTS module with krb5 support
-+  --disable-server        disable compiling servers
-+  --enable-statickrb      link Kerberos statically
-+  --enable-nntp           enable NNTP support (experimental)
-+  --enable-murder         enable IMAP Murder support
-+  --enable-cmulocal       enable CMU-specific local support
-+  --enable-oldsievename   enable the use of 'imap' as the sieve service name
-+  --enable-listext        enable IMAP List extensions
-+  --enable-netscapehack   enable Netscape hack for the menu option
-+                          in Communicator to Administrate Mail
-+  --enable-gssapi=<DIR>   enable GSSAPI authentication [yes]
-+
-+Optional Packages:
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --with-extraident=STRING   use STRING as extra version information
-+
-+  --with-cyrus-prefix=DIR    use DIR as cyrus server install directory
-+  --with-service-path=DIR    use DIR as service install directory
-+  --with-cyrus-user=USERID   use USERID cyrus userid
-+  --with-cyrus-group=GROUPID use GROUPID cyrus group
-+  --with-bdb=DIR          use Berkeley DB (in DIR) [yes] 
-+  --with-bdb-libdir=DIR   Berkeley DB lib files are in DIR
-+  --with-bdb-incdir=DIR   Berkeley DB include files are in DIR
-+  --with-lock=METHOD      force use of METHOD for locking (flock or fcntl)
-+  --with-afs=PATH         use AFS libraries from PATH
-+  --with-ldap=DIR         use LDAP (in DIR) (experimental) /usr/local 
-+  --with-krb=PATH         use Kerberos from PATH
-+  --with-krbimpl=\kth|mit\         assume Kerberos 4 from KTH or MIT
-+  --with-krbdes           use Kerberos DES implementation [yes]
-+  --with-openssl=PATH     use OpenSSL from PATH
-+  --with-egd-socket=FILE  Entropy Gathering Daemon socket pathname
-+                          for systems without /dev/urandom
-+  --with-zephyr=PATH    enable Zephyr notification (installed on PATH)
-+  --with-pidfile=PATH   pidfile in PATH (/var/run/cyrus-master.pid)
-+  --with-idle=METHOD      use METHOD for IMAP IDLE
-+                          METHOD is poll, idled or no
-+  --with-com_err=PATH     use com_err from path -- includes in PATH/include,
-+                          libs in PATH/lib, and compile_et in PATH/bin
-+  --with-syslogfacility=FACILITY set the syslog facility to use (default LOCAL6)
-+  --with-gss_impl={heimdal|mit|cybersafe|seam|auto} 
-+                          choose specific GSSAPI implementation [[auto]]
-+  --with-sasl=DIR         Compile with libsasl2 in <DIR>
-+  --with-staticsasl=DIR   Compile with staticly linked libsasl2 in <DIR>
-+  --with-perl=PERL        use PERL for perl
-+  --with-lib-subdir=DIR   Find libraries in DIR instead of lib
-+  --with-libwrap=DIR      use libwrap (rooted in DIR) yes 
-+  --with-snmp=DIR         use ucd|net snmp (rooted in DIR) yes 
-+
-+Some influential environment variables:
-+  CC          C compiler command
-+  CFLAGS      C compiler flags
-+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-+              nonstandard directory <lib dir>
-+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
-+  CPP         C preprocessor
-+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-+              the first program found out of: `bison -y', `byacc', `yacc'.
-+  YFLAGS      The list of arguments that will be passed by default to $YACC.
-+              This script will default YFLAGS to the empty string to avoid a
-+              default value of `-d' given by some make applications.
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+_ACEOF
-+ac_status=$?
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+  # If there are subdirs, report their specific --help.
-+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+    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,^\.[\\/],,'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-+    else
-+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-+  done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+  cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.60a
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+  exit
-+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.60a.  Invocation command line was
-+
-+  $ $0 $@
-+
-+_ACEOF
-+exec 5>>config.log
-+{
-+cat <<_ASUNAME
-+@%:@@%:@ --------- @%:@@%:@
-+@%:@@%:@ Platform. @%:@@%:@
-+@%:@@%:@ --------- @%:@@%:@
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-+
-+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-+
-+_ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  echo "PATH: $as_dir"
-+done
-+IFS=$as_save_IFS
-+
-+} >&5
-+
-+cat >&5 <<_ACEOF
-+
-+
-+@%:@@%:@ ----------- @%:@@%:@
-+@%:@@%:@ Core tests. @%:@@%:@
-+@%:@@%:@ ----------- @%:@@%:@
-+
-+_ACEOF
-+
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+  for ac_arg
-+  do
-+    case $ac_arg in
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-+      continue ;;
-+    *\'*)
-+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    case $ac_pass in
-+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+    2)
-+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+      if test $ac_must_keep_next = true; then
-+	ac_must_keep_next=false # Got value, back to normal.
-+      else
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-+      fi
-+      ac_configure_args="$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; }
-+
-+# When interrupted or exit'd, cleanup temporary files, and complete
-+# config.log.  We remove comments because anyway the quotes in there
-+# would cause problems or look ugly.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-+trap 'exit_status=$?
-+  # Save into config.log some information that might help in debugging.
-+  {
-+    echo
-+
-+    cat <<\_ASBOX
-+@%:@@%:@ ---------------- @%:@@%:@
-+@%:@@%:@ Cache variables. @%:@@%:@
-+@%:@@%:@ ---------------- @%:@@%:@
-+_ASBOX
-+    echo
-+    # The following way of writing the cache mishandles newlines in values,
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      sed -n \
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-+    *)
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+)
-+    echo
-+
-+    cat <<\_ASBOX
-+@%:@@%:@ ----------------- @%:@@%:@
-+@%:@@%:@ Output variables. @%:@@%:@
-+@%:@@%:@ ----------------- @%:@@%:@
-+_ASBOX
-+    echo
-+    for ac_var in $ac_subst_vars
-+    do
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      echo "$ac_var='\''$ac_val'\''"
-+    done | sort
-+    echo
-+
-+    if test -n "$ac_subst_files"; then
-+      cat <<\_ASBOX
-+@%:@@%:@ ------------------- @%:@@%:@
-+@%:@@%:@ File substitutions. @%:@@%:@
-+@%:@@%:@ ------------------- @%:@@%:@
-+_ASBOX
-+      echo
-+      for ac_var in $ac_subst_files
-+      do
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	echo "$ac_var='\''$ac_val'\''"
-+      done | sort
-+      echo
-+    fi
-+
-+    if test -s confdefs.h; then
-+      cat <<\_ASBOX
-+@%:@@%:@ ----------- @%:@@%:@
-+@%:@@%:@ confdefs.h. @%:@@%:@
-+@%:@@%:@ ----------- @%:@@%:@
-+_ASBOX
-+      echo
-+      cat confdefs.h
-+      echo
-+    fi
-+    test "$ac_signal" != 0 &&
-+      echo "$as_me: caught signal $ac_signal"
-+    echo "$as_me: exit $exit_status"
-+  } >&5
-+  rm -f core *.core 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
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -f -r conftest* 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
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
-+# Prefer explicitly selected file to automatically selected ones.
-+if test -n "$CONFIG_SITE"; then
-+  set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+  set x "$ac_default_prefix/share/config.site" \
-+	"$ac_default_prefix/etc/config.site"
-+fi
-+shift
-+for ac_site_file
-+do
-+  if test -r "$ac_site_file"; then
-+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
-+    sed 's/^/| /' "$ac_site_file" >&5
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
-+  # 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;}
-+    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;}
-+  >$cache_file
-+fi
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in $ac_precious_vars; do
-+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+  eval ac_new_set=\$ac_env_${ac_var}_set
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-+  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;}
-+      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;}
-+      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=:
-+      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=$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'" ;;
-+    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
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+ac_config_headers="$ac_config_headers config.h"
-+
-+ac_aux_dir=
-+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-+  if test -f "$ac_dir/install-sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install-sh -c"
-+    break
-+  elif test -f "$ac_dir/install.sh"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/install.sh -c"
-+    break
-+  elif test -f "$ac_dir/shtool"; then
-+    ac_aux_dir=$ac_dir
-+    ac_install_sh="$ac_aux_dir/shtool install -c"
-+    break
-+  fi
-+done
-+if test -z "$ac_aux_dir"; then
-+  { { 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; }; }
-+fi
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
-+
-+# Make sure we can run config.sub.
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  { { 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
-+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; }; }
-+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; }; }
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$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; }; };;
-+esac
-+build=$ac_cv_build
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+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
-+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; }; }
-+fi
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$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; }; };;
-+esac
-+host=$ac_cv_host
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
-+
-+WARNERROR=-W
-+# Check whether --enable-warnings-are-errors was given.
-+if test "${enable_warnings_are_errors+set}" = set; then
-+  enableval=$enable_warnings_are_errors;  if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi 
-+fi
-+
-+
-+
-+
-+# Check whether --with-extraident was given.
-+if test "${with_extraident+set}" = set; then
-+  withval=$with_extraident; 
-+cat >>confdefs.h <<_ACEOF
-+@%:@define EXTRA_IDENT "$withval"
-+_ACEOF
-+
-+fi
-+
-+
-+# Extract the first word of "makedepend", so it can be a program name with args.
-+set dummy makedepend; 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_MAKEDEPEND+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$MAKEDEPEND"; then
-+  ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_MAKEDEPEND="makedepend"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep"
-+fi
-+fi
-+MAKEDEPEND=$ac_cv_prog_MAKEDEPEND
-+if test -n "$MAKEDEPEND"; then
-+  { echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
-+echo "${ECHO_T}$MAKEDEPEND" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+if test "$MAKEDEPEND" != "makedepend"; then
-+        { echo "$as_me:$LINENO: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&5
-+echo "$as_me: WARNING: Makedepend is not installed on this system.  You should compile and install the version from the makedepend subdirectory." >&2;}
-+fi
-+
-+
-+# Check whether --with-login was given.
-+if test "${with_login+set}" = set; then
-+  withval=$with_login; { { echo "$as_me:$LINENO: error: --with-login is no longer supported.
-+Configure SASL appropriately instead." >&5
-+echo "$as_me: error: --with-login is no longer supported.
-+Configure SASL appropriately instead." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+
-+# Check whether --with-cyrus-prefix was given.
-+if test "${with_cyrus_prefix+set}" = set; then
-+  withval=$with_cyrus_prefix; cyrus_prefix="$withval"
-+else
-+  cyrus_prefix="/usr/cyrus"
-+fi
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define CYRUS_PATH "$cyrus_prefix"
-+_ACEOF
-+
-+
-+# Check whether --with-service-path was given.
-+if test "${with_service_path+set}" = set; then
-+  withval=$with_service_path; service_path="$withval"
-+else
-+  service_path="$cyrus_prefix/bin"
-+fi
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SERVICE_PATH "$service_path"
-+_ACEOF
-+
-+
-+# Check whether --with-cyrus-user was given.
-+if test "${with_cyrus_user+set}" = set; then
-+  withval=$with_cyrus_user; cyrus_user="$withval"
-+else
-+  cyrus_user="cyrus"
-+fi
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define CYRUS_USER "$cyrus_user"
-+_ACEOF
-+
-+
-+# Check whether --with-cyrus-group was given.
-+if test "${with_cyrus_group+set}" = set; then
-+  withval=$with_cyrus_group; cyrus_group="$withval"
-+else
-+  cyrus_group="mail"
-+fi
-+
-+
-+
-+if test $sysconfdir = '${prefix}/etc'; then
-+  sysconfdir="/etc"
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SYSCONFDIR "$sysconfdir"
-+_ACEOF
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+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
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+  ac_ct_CC=$CC
-+  # Extract the first word of "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
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="gcc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+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
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="${ac_tool_prefix}cc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  fi
-+fi
-+if test -z "$CC"; then
-+  # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+       ac_prog_rejected=yes
-+       continue
-+     fi
-+    ac_cv_prog_CC="cc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $@%:@ != 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+  fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in cl.exe
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+    test -n "$CC" && break
-+  done
-+fi
-+if test -z "$CC"; then
-+  ac_ct_CC=$CC
-+  for ac_prog in cl.exe
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_CC"; then
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_CC="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$ac_ct_CC" && break
-+done
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
-+fi
-+
-+fi
-+
-+
-+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; }; }
-+
-+# 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"
-+case "(($ac_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); }
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+# Try to create an executable without -o first, disregard a.out.
-+# It will help us diagnose broken compilers, and finding out an intuition
-+# of exeext.
-+{ 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.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+  esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link_default") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
-+do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.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;
-+	then :; else
-+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	fi
-+	# We set ac_cv_exeext here because the later test for it is not
-+	# safe: cross compilers may not add the suffix if given an `-o'
-+	# argument, so we may need to know it at that point already.
-+	# Even if this section looks crufty: it has the advantage of
-+	# actually working.
-+	break;;
-+    * )
-+	break;;
-+  esac
-+done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
-+else
-+  ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { 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; }; }
-+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
-+# 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
-+  *\"* | *\`* | *\\*) 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
-+    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.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+    fi
-+  fi
-+fi
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+ac_clean_files=$ac_clean_files_save
-+# Check 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"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  # 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
-+# `rm'.
-+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_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; }; }
-+fi
-+
-+rm -f conftest$ac_cv_exeext
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-+if test "${ac_cv_objext+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 ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  for ac_file in 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_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+       break;;
-+  esac
-+done
-+else
-+  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; }; }
-+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; }
-+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
-+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 ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_compiler_gnu=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	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`
-+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
-+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
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_prog_cc_g=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	CFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    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
-+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
-+/* end confdefs.h.  */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+  xno)
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  ac_ct_RANLIB=$RANLIB
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+{ 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_RANLIB+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    RANLIB=$ac_ct_RANLIB
-+  fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
-+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
-+else
-+  cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
-+all:
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
-+_ACEOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
-+rm -f conftest.make
-+fi
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+  SET_MAKE=
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+# Find a good install program.  We prefer a C program (faster),
-+# so one script is as good as another.  But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# 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; }
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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/* | \
-+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+  /usr/ucb/* ) ;;
-+  *)
-+    # OSF1 and SCO ODT 3.0 have their own names for install.
-+    # Don't use installbsd from OSF since it installs stuff as root
-+    # by default.
-+    for ac_prog in ginstall scoinst install; do
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+	  if test $ac_prog = install &&
-+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  elif test $ac_prog = install &&
-+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # 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
-+	  fi
-+	fi
-+      done
-+    done
-+    ;;
-+esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+  if test "${ac_cv_path_install+set}" = set; then
-+    INSTALL=$ac_cv_path_install
-+  else
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for INSTALL within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    INSTALL=$ac_install_sh
-+  fi
-+fi
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+  if test "${ac_cv_prog_CPP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+      # Double quotes because CPP needs to be expanded
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+@%:@ifdef __STDC__
-+@%:@ include <limits.h>
-+@%:@else
-+@%:@ include <assert.h>
-+@%:@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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  # 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
-+/* 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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  # 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
-+  break
-+fi
-+
-+    done
-+    ac_cv_prog_CPP=$CPP
-+  
-+fi
-+  CPP=$ac_cv_prog_CPP
-+else
-+  ac_cv_prog_CPP=$CPP
-+fi
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+@%:@ifdef __STDC__
-+@%:@ include <limits.h>
-+@%:@else
-+@%:@ include <assert.h>
-+@%:@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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  # 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
-+/* 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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  # 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
-+  :
-+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; }; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in grep ggrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-+    # Check for GNU ac_path_GREP and select it if it is found.
-+  # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    echo 'GREP' >> "conftest.nl"
-+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    ac_count=`expr $ac_count + 1`
-+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_GREP="$ac_path_GREP"
-+      ac_path_GREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+    $ac_path_GREP_found && break 3
-+  done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_GREP=$GREP
-+fi
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+ 
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+   then ac_cv_path_EGREP="$GREP -E"
-+   else
-+     # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_path_EGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in egrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-+    # Check for GNU ac_path_EGREP and select it if it is found.
-+  # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    echo 'EGREP' >> "conftest.nl"
-+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    ac_count=`expr $ac_count + 1`
-+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_EGREP="$ac_path_EGREP"
-+      ac_path_EGREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+    $ac_path_EGREP_found && break 3
-+  done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+  ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+   fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+ 
-+
-+
-+{ echo "$as_me:$LINENO: checking for AIX" >&5
-+echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef _AIX
-+  yes
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "yes" >/dev/null 2>&1; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define _ALL_SOURCE 1
-+_ACEOF
-+
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+rm -f conftest*
-+
-+
-+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
-+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
-+if test "${ac_cv_search_strerror+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any 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 strerror ();
-+int
-+main ()
-+{
-+return strerror ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' cposix; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_search_strerror=$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_strerror+set}" = set; then
-+  break
-+fi
-+done
-+if test "${ac_cv_search_strerror+set}" = set; then
-+  :
-+else
-+  ac_cv_search_strerror=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
-+ac_res=$ac_cv_search_strerror
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+fi
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$AWK" && break
-+done
-+
-+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-+if test "${ac_cv_c_const+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+  /* Ultrix mips cc rejects this.  */
-+  typedef int charset[2];
-+  const charset cs;
-+  /* SunOS 4.1.1 cc rejects this.  */
-+  char const *const *pcpcc;
-+  char **ppc;
-+  /* NEC SVR4.0.2 mips cc rejects this.  */
-+  struct point {int x, y;};
-+  static struct point const zero = {0,0};
-+  /* AIX XL C 1.02.0.0 rejects this.
-+     It does not let you subtract one const X* pointer from another in
-+     an arm of an if-expression whose if-part is not a constant
-+     expression */
-+  const char *g = "string";
-+  pcpcc = &g + (g ? g-g : 0);
-+  /* HPUX 7.0 cc rejects these. */
-+  ++pcpcc;
-+  ppc = (char**) pcpcc;
-+  pcpcc = (char const *const *) ppc;
-+  { /* SCO 3.2v4 cc rejects this.  */
-+    char *t;
-+    char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+    *t++ = 0;
-+    if (s) return 0;
-+  }
-+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-+    int x[] = {25, 17};
-+    const int *foo = &x[0];
-+    ++foo;
-+  }
-+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+    typedef const int *iptr;
-+    iptr p = 0;
-+    ++p;
-+  }
-+  { /* AIX XL C 1.02.0.0 rejects this saying
-+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+    struct s { int j; const int *ap[3]; };
-+    struct s *b; b->j = 5;
-+  }
-+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+    const int foo = 10;
-+    if (!foo) return 0;
-+  }
-+  return !cs[0] && !zero.x;
-+#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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_c_const=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	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; }
-+if test $ac_cv_c_const = no; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define const 
-+_ACEOF
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for inline" >&5
-+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-+if test "${ac_cv_c_inline+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_c_inline=$ac_kw
-+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
-+  test "$ac_cv_c_inline" != no && break
-+done
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-+
-+
-+case $ac_cv_c_inline in
-+  inline | yes) ;;
-+  *)
-+    case $ac_cv_c_inline in
-+      no) ac_val=;;
-+      *) ac_val=$ac_cv_c_inline;;
-+    esac
-+    cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
-+#endif
-+_ACEOF
-+    ;;
-+esac
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for __attribute__" >&5
-+echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6; }
-+if test "${ac_cv___attribute__+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdlib.h>
-+
-+int
-+main ()
-+{
-+
-+static void foo(void) __attribute__ ((noreturn));
-+
-+static void
-+foo(void)
-+{
-+  exit(1);
-+}
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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___attribute__=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv___attribute__=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+if test "$ac_cv___attribute__" = "yes"; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE___ATTRIBUTE__ 1
-+_ACEOF
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
-+echo "${ECHO_T}$ac_cv___attribute__" >&6; }
-+
-+
-+{ echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
-+echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6; }
-+if test "${ac_cv_fpic+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+save_CFLAGS=$CFLAGS
-+CFLAGS="${CFLAGS} -fPIC"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <stdlib.h>
-+
-+int
-+main ()
-+{
-+
-+static void
-+foo(void)
-+{
-+  exit(1);
-+}
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_fpic=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_fpic=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS=$save_CFLAGS
-+
-+fi
-+
-+if test "$ac_cv_fpic" = "yes"; then
-+    FPIC_CFLAGS="-fPIC"
-+else
-+    FPIC_CFLAGS=""
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
-+echo "${ECHO_T}$ac_cv_fpic" >&6; }
-+
-+
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_header_stdc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	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
-+/* end confdefs.h.  */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "memchr" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "free" >/dev/null 2>&1; then
-+  :
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then
-+  :
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+	|| toupper (i) != TOUPPER (i))
-+      return 2;
-+  return 0;
-+}
-+_ACEOF
-+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
-+
-+( exit $ac_status )
-+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
-+fi
-+
-+
-+fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define STDC_HEADERS 1
-+_ACEOF
-+
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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
-+  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
-+ 
-+fi
-+
-+done
-+
-+
-+{ echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-+if test "${ac_cv_type_long+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 long 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_type_long=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_type_long=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_lo=0 ac_mid=0
-+  while :; do
-+    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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+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
-+	        typedef long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=-1 ac_mid=-1
-+  while :; do
-+    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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo= ac_hi=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long=$ac_lo;;
-+'') if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi ;;
-+esac
-+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 long ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+@%:@include <stdio.h>
-+@%:@include <stdlib.h>
-+int
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
-+  return ferror (f) || fclose (f) != 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_sizeof_long=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.val
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
-+
-+
-+
-+
-+   # CMU GUESS RUNPATH SWITCH
-+    andrew_runpath_switch="none"
-+
-+
-+
-+
-+
-+
-+for ac_header in unistd.h sys/select.h sys/param.h stdarg.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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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 memmove strcasecmp ftruncate strerror
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+ 
-+else
-+  case " $LIB@&t at OBJS " in
-+  *" $ac_func.$ac_objext "* ) ;;
-+  *) LIB@&t at OBJS="$LIB@&t at OBJS $ac_func.$ac_objext"
-+ ;;
-+esac
-+
-+fi
-+done
-+
-+
-+
-+
-+for ac_func in strlcat strlcpy
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+
-+
-+
-+
-+
-+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
-+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 <$ac_hdr>
-+
-+int
-+main ()
-+{
-+if ((DIR *) 0)
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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
-+  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_hdr" | $as_tr_cpp` 1
-+_ACEOF
-+
-+ac_header_dirent=$ac_hdr; break
-+fi
-+
-+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
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char opendir ();
-+int
-+main ()
-+{
-+return opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' dir; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_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
-+  break
-+fi
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  :
-+else
-+  ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+fi
-+
-+else
-+  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char opendir ();
-+int
-+main ()
-+{
-+return opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' x; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_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
-+  break
-+fi
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+  :
-+else
-+  ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+fi
-+
-+fi
-+
-+
-+
-+	save_LIBS="$LIBS"
-+	LIB_SOCKET=""
-+	{ echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
-+if test "${ac_cv_func_connect+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define connect innocuous_connect
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char connect (); 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 connect
-+
-+/* 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 connect ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_connect || defined __stub___connect
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return connect ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_connect=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_connect=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_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
-+if test $ac_cv_func_connect = yes; then
-+  :
-+else
-+  { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $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 gethostbyname ();
-+int
-+main ()
-+{
-+return gethostbyname ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_nsl_gethostbyname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_nsl_gethostbyname=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_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
-+if test $ac_cv_lib_nsl_gethostbyname = yes; then
-+  LIB_SOCKET="-lnsl $LIB_SOCKET"
-+fi
-+
-+		{ echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_connect+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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
-+/* 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 connect ();
-+int
-+main ()
-+{
-+return connect ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_socket_connect=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_socket_connect=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_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
-+if test $ac_cv_lib_socket_connect = yes; then
-+  LIB_SOCKET="-lsocket $LIB_SOCKET"
-+fi
-+
-+	
-+fi
-+
-+	LIBS="$LIB_SOCKET $save_LIBS"
-+	{ echo "$as_me:$LINENO: checking for res_search" >&5
-+echo $ECHO_N "checking for res_search... $ECHO_C" >&6; }
-+if test "${ac_cv_func_res_search+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 res_search to an innocuous variant, in case <limits.h> declares res_search.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define res_search innocuous_res_search
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char res_search (); 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 res_search
-+
-+/* 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 res_search ();
-+/* 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_res_search || defined __stub___res_search
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return res_search ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_res_search=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_res_search=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_res_search" >&5
-+echo "${ECHO_T}$ac_cv_func_res_search" >&6; }
-+if test $ac_cv_func_res_search = yes; then
-+  :
-+else
-+  LIBS="-lresolv $LIB_SOCKET $save_LIBS"
-+		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 <netinet/in.h>
-+#include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-+#include <arpa/nameser_compat.h>
-+#endif
-+#include <resolv.h>
-+int
-+main ()
-+{
-+
-+const char host[12]="openafs.org";
-+u_char ans[1024];
-+res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
-+return 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  LIB_SOCKET="-lresolv $LIB_SOCKET"
-+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 conftest.$ac_ext
-+        
-+fi
-+
-+	LIBS="$LIB_SOCKET $save_LIBS"
-+	
-+
-+for ac_func in dn_expand dns_lookup
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+	LIBS="$save_LIBS"
-+	
-+	
-+LIBS="$LIBS ${LIB_SOCKET}"
-+
-+cyrus_cv_getaddrinfo=yes
-+
-+{ echo "$as_me:$LINENO: checking for getaddrinfo" >&5
-+echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; }
-+if test "${ac_cv_func_getaddrinfo+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 getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define getaddrinfo innocuous_getaddrinfo
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char getaddrinfo (); 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 getaddrinfo
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char getaddrinfo ();
-+/* 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_getaddrinfo || defined __stub___getaddrinfo
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return getaddrinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_getaddrinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_getaddrinfo=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_getaddrinfo" >&5
-+echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6; }
-+if test $ac_cv_func_getaddrinfo = yes; then
-+    ac_cv_lib_socket_getaddrinfo=no
-+  ac_cv_lib_inet6_getaddrinfo=no
-+
-+else
-+    { echo "$as_me:$LINENO: checking for getaddrinfo in -lsocket" >&5
-+echo $ECHO_N "checking for getaddrinfo in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-+/* 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 getaddrinfo ();
-+int
-+main ()
-+{
-+return getaddrinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_socket_getaddrinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_socket_getaddrinfo=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_socket_getaddrinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_getaddrinfo" >&6; }
-+if test $ac_cv_lib_socket_getaddrinfo = yes; then
-+      LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_getaddrinfo=no
-+  
-+else
-+      { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
-+echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; }
-+    if test "${ipv6_cv_dir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done
-+fi
-+    { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
-+echo "${ECHO_T}$ipv6_cv_dir" >&6; }
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_getaddrinfo=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      { echo "$as_me:$LINENO: checking for getaddrinfo in -linet6" >&5
-+echo $ECHO_N "checking for getaddrinfo in -linet6... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-linet6  $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 getaddrinfo ();
-+int
-+main ()
-+{
-+return getaddrinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_inet6_getaddrinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_inet6_getaddrinfo=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_inet6_getaddrinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6; }
-+if test $ac_cv_lib_inet6_getaddrinfo = yes; then
-+  	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi
-+fi
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi
-+fi
-+
-+fi
-+ipv6_cv_getaddrinfo=no
-+if test $ac_cv_func_getaddrinfo = yes -o $ac_cv_lib_socket_getaddrinfo = yes \
-+     -o $ac_cv_lib_inet6_getaddrinfo = yes
-+then
-+  ipv6_cv_getaddrinfo=yes
-+fi
-+if test $ipv6_cv_getaddrinfo = no; then
-+  if test getaddrinfo = getaddrinfo; then
-+    for ipv6_cv_pfx in o n; do
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <netdb.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then
-+  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getaddrinfo" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}getaddrinfo... $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 ${ipv6_cv_pfx}getaddrinfo to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}getaddrinfo.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define ${ipv6_cv_pfx}getaddrinfo innocuous_${ipv6_cv_pfx}getaddrinfo
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char ${ipv6_cv_pfx}getaddrinfo (); 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 ${ipv6_cv_pfx}getaddrinfo
-+
-+/* 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 ${ipv6_cv_pfx}getaddrinfo ();
-+/* 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_${ipv6_cv_pfx}getaddrinfo || defined __stub___${ipv6_cv_pfx}getaddrinfo
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return ${ipv6_cv_pfx}getaddrinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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; }
-+
-+fi
-+rm -f conftest*
-+
-+      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getaddrinfo = Xyes; then
-+        
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETADDRINFO 
-+_ACEOF
-+
-+        ipv6_cv_getaddrinfo=yes
-+        break
-+      fi
-+    done
-+  fi
-+fi
-+if test $ipv6_cv_getaddrinfo = yes; then
-+  
-+{ echo "$as_me:$LINENO: checking for gai_strerror" >&5
-+echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6; }
-+if test "${ac_cv_func_gai_strerror+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 gai_strerror to an innocuous variant, in case <limits.h> declares gai_strerror.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define gai_strerror innocuous_gai_strerror
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char gai_strerror (); 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 gai_strerror
-+
-+/* 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 gai_strerror ();
-+/* 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_gai_strerror || defined __stub___gai_strerror
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return gai_strerror ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_gai_strerror=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_gai_strerror=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_gai_strerror" >&5
-+echo "${ECHO_T}$ac_cv_func_gai_strerror" >&6; }
-+if test $ac_cv_func_gai_strerror = yes; then
-+    ac_cv_lib_socket_gai_strerror=no
-+  ac_cv_lib_inet6_gai_strerror=no
-+
-+else
-+    { echo "$as_me:$LINENO: checking for gai_strerror in -lsocket" >&5
-+echo $ECHO_N "checking for gai_strerror in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-+/* 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 gai_strerror ();
-+int
-+main ()
-+{
-+return gai_strerror ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_socket_gai_strerror=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_socket_gai_strerror=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_socket_gai_strerror" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_gai_strerror" >&6; }
-+if test $ac_cv_lib_socket_gai_strerror = yes; then
-+      LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_gai_strerror=no
-+  
-+else
-+      { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
-+echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; }
-+    if test "${ipv6_cv_dir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done
-+fi
-+    { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
-+echo "${ECHO_T}$ipv6_cv_dir" >&6; }
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_gai_strerror=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      { echo "$as_me:$LINENO: checking for gai_strerror in -linet6" >&5
-+echo $ECHO_N "checking for gai_strerror in -linet6... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-linet6  $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 gai_strerror ();
-+int
-+main ()
-+{
-+return gai_strerror ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_inet6_gai_strerror=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_inet6_gai_strerror=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_inet6_gai_strerror" >&5
-+echo "${ECHO_T}$ac_cv_lib_inet6_gai_strerror" >&6; }
-+if test $ac_cv_lib_inet6_gai_strerror = yes; then
-+  	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi
-+fi
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi
-+fi
-+
-+fi
-+ipv6_cv_gai_strerror=no
-+if test $ac_cv_func_gai_strerror = yes -o $ac_cv_lib_socket_gai_strerror = yes \
-+     -o $ac_cv_lib_inet6_gai_strerror = yes
-+then
-+  ipv6_cv_gai_strerror=yes
-+fi
-+if test $ipv6_cv_gai_strerror = no; then
-+  if test gai_strerror = getaddrinfo; then
-+    for ipv6_cv_pfx in o n; do
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <netdb.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then
-+  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}gai_strerror" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}gai_strerror... $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 ${ipv6_cv_pfx}gai_strerror to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}gai_strerror.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define ${ipv6_cv_pfx}gai_strerror innocuous_${ipv6_cv_pfx}gai_strerror
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char ${ipv6_cv_pfx}gai_strerror (); 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 ${ipv6_cv_pfx}gai_strerror
-+
-+/* 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 ${ipv6_cv_pfx}gai_strerror ();
-+/* 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_${ipv6_cv_pfx}gai_strerror || defined __stub___${ipv6_cv_pfx}gai_strerror
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return ${ipv6_cv_pfx}gai_strerror ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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; }
-+
-+fi
-+rm -f conftest*
-+
-+      if eval test X\$ac_cv_func_${ipv6_cv_pfx}gai_strerror = Xyes; then
-+        
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETADDRINFO 
-+_ACEOF
-+
-+        ipv6_cv_gai_strerror=yes
-+        break
-+      fi
-+    done
-+  fi
-+fi
-+if test $ipv6_cv_gai_strerror = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETADDRINFO 
-+_ACEOF
-+
-+else
-+  cyrus_cv_getaddrinfo=no
-+fi
-+else
-+  cyrus_cv_getaddrinfo=no
-+fi
-+
-+if test $cyrus_cv_getaddrinfo = no; then
-+	IPV6_OBJS="getaddrinfo.o"
-+fi
-+
-+cyrus_cv_getnameinfo=yes
-+
-+{ echo "$as_me:$LINENO: checking for getnameinfo" >&5
-+echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6; }
-+if test "${ac_cv_func_getnameinfo+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 getnameinfo to an innocuous variant, in case <limits.h> declares getnameinfo.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define getnameinfo innocuous_getnameinfo
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char getnameinfo (); 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 getnameinfo
-+
-+/* 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 getnameinfo ();
-+/* 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_getnameinfo || defined __stub___getnameinfo
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return getnameinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_getnameinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_getnameinfo=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_getnameinfo" >&5
-+echo "${ECHO_T}$ac_cv_func_getnameinfo" >&6; }
-+if test $ac_cv_func_getnameinfo = yes; then
-+    ac_cv_lib_socket_getnameinfo=no
-+  ac_cv_lib_inet6_getnameinfo=no
-+
-+else
-+    { echo "$as_me:$LINENO: checking for getnameinfo in -lsocket" >&5
-+echo $ECHO_N "checking for getnameinfo in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-+/* 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 getnameinfo ();
-+int
-+main ()
-+{
-+return getnameinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_socket_getnameinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_socket_getnameinfo=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_socket_getnameinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_getnameinfo" >&6; }
-+if test $ac_cv_lib_socket_getnameinfo = yes; then
-+      LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_getnameinfo=no
-+  
-+else
-+      { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
-+echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; }
-+    if test "${ipv6_cv_dir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done
-+fi
-+    { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
-+echo "${ECHO_T}$ipv6_cv_dir" >&6; }
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_getnameinfo=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      { echo "$as_me:$LINENO: checking for getnameinfo in -linet6" >&5
-+echo $ECHO_N "checking for getnameinfo in -linet6... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-linet6  $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 getnameinfo ();
-+int
-+main ()
-+{
-+return getnameinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_inet6_getnameinfo=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_inet6_getnameinfo=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_inet6_getnameinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_inet6_getnameinfo" >&6; }
-+if test $ac_cv_lib_inet6_getnameinfo = yes; then
-+  	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi
-+fi
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi
-+fi
-+
-+fi
-+ipv6_cv_getnameinfo=no
-+if test $ac_cv_func_getnameinfo = yes -o $ac_cv_lib_socket_getnameinfo = yes \
-+     -o $ac_cv_lib_inet6_getnameinfo = yes
-+then
-+  ipv6_cv_getnameinfo=yes
-+fi
-+if test $ipv6_cv_getnameinfo = no; then
-+  if test getnameinfo = getaddrinfo; then
-+    for ipv6_cv_pfx in o n; do
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <netdb.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then
-+  as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getnameinfo" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}getnameinfo... $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 ${ipv6_cv_pfx}getnameinfo to an innocuous variant, in case <limits.h> declares ${ipv6_cv_pfx}getnameinfo.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define ${ipv6_cv_pfx}getnameinfo innocuous_${ipv6_cv_pfx}getnameinfo
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char ${ipv6_cv_pfx}getnameinfo (); 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 ${ipv6_cv_pfx}getnameinfo
-+
-+/* 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 ${ipv6_cv_pfx}getnameinfo ();
-+/* 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_${ipv6_cv_pfx}getnameinfo || defined __stub___${ipv6_cv_pfx}getnameinfo
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return ${ipv6_cv_pfx}getnameinfo ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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; }
-+
-+fi
-+rm -f conftest*
-+
-+      if eval test X\$ac_cv_func_${ipv6_cv_pfx}getnameinfo = Xyes; then
-+        
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETADDRINFO 
-+_ACEOF
-+
-+        ipv6_cv_getnameinfo=yes
-+        break
-+      fi
-+    done
-+  fi
-+fi
-+if test $ipv6_cv_getnameinfo = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETNAMEINFO 
-+_ACEOF
-+
-+else
-+  cyrus_cv_getnameinfo=no
-+fi
-+
-+if test $cyrus_cv_getnameinfo = no; then
-+	IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5
-+echo $ECHO_N "checking whether you have ss_family in struct sockaddr_storage... $ECHO_C" >&6; }
-+if test "${ipv6_cv_ss_family+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/socket.h>
-+int
-+main ()
-+{
-+struct sockaddr_storage ss; int i = ss.ss_family;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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
-+  ipv6_cv_ss_family=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ipv6_cv_ss_family=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+if test $ipv6_cv_ss_family = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_SS_FAMILY 
-+_ACEOF
-+
-+else
-+  :
-+fi
-+{ echo "$as_me:$LINENO: result: $ipv6_cv_ss_family" >&5
-+echo "${ECHO_T}$ipv6_cv_ss_family" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking whether you have sa_len in struct sockaddr" >&5
-+echo $ECHO_N "checking whether you have sa_len in struct sockaddr... $ECHO_C" >&6; }
-+if test "${ipv6_cv_sa_len+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/socket.h>
-+int
-+main ()
-+{
-+struct sockaddr sa; int i = sa.sa_len;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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
-+  ipv6_cv_sa_len=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ipv6_cv_sa_len=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+if test $ipv6_cv_sa_len = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_SOCKADDR_SA_LEN 
-+_ACEOF
-+
-+else
-+  :
-+fi
-+{ echo "$as_me:$LINENO: result: $ipv6_cv_sa_len" >&5
-+echo "${ECHO_T}$ipv6_cv_sa_len" >&6; }
-+
-+
-+
-+
-+for ac_header in sys/time.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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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
-+
-+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-+if test "${ac_cv_header_time+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  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/time.h>
-+#include <time.h>
-+
-+int
-+main ()
-+{
-+if ((struct tm *) 0)
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_header_time=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	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; }
-+if test $ac_cv_header_time = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define TIME_WITH_SYS_TIME 1
-+_ACEOF
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
-+if test "${ac_cv_struct_tm+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 <time.h>
-+
-+int
-+main ()
-+{
-+struct tm *tp; tp->tm_sec;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_struct_tm=time.h
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_struct_tm=sys/time.h
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-+echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
-+if test $ac_cv_struct_tm = sys/time.h; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define TM_IN_SYS_TIME 1
-+_ACEOF
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-+echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
-+if test "${ac_cv_member_struct_tm_tm_zone+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 <$ac_cv_struct_tm>
-+
-+
-+int
-+main ()
-+{
-+static struct tm ac_aggr;
-+if (ac_aggr.tm_zone)
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_member_struct_tm_tm_zone=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>
-+#include <$ac_cv_struct_tm>
-+
-+
-+int
-+main ()
-+{
-+static struct tm ac_aggr;
-+if (sizeof ac_aggr.tm_zone)
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_member_struct_tm_tm_zone=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_member_struct_tm_tm_zone=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_tm_tm_zone" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
-+if test $ac_cv_member_struct_tm_tm_zone = yes; then
-+  
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_STRUCT_TM_TM_ZONE 1
-+_ACEOF
-+
-+
-+fi
-+
-+if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_TM_ZONE 1
-+_ACEOF
-+
-+else
-+  { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
-+echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
-+if test "${ac_cv_have_decl_tzname+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 <time.h>
-+
-+int
-+main ()
-+{
-+#ifndef tzname
-+  char *p = (char *) tzname;
-+  return !p;
-+#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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_have_decl_tzname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_have_decl_tzname=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
-+if test $ac_cv_have_decl_tzname = yes; then
-+  
-+cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_TZNAME 1
-+_ACEOF
-+
-+
-+else
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_DECL_TZNAME 0
-+_ACEOF
-+
-+
-+fi
-+
-+
-+  { echo "$as_me:$LINENO: checking for tzname" >&5
-+echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
-+if test "${ac_cv_var_tzname+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 <time.h>
-+#if !HAVE_DECL_TZNAME
-+extern char *tzname[];
-+#endif
-+
-+int
-+main ()
-+{
-+return tzname[0][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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_var_tzname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_var_tzname=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_var_tzname" >&5
-+echo "${ECHO_T}$ac_cv_var_tzname" >&6; }
-+  if test $ac_cv_var_tzname = yes; then
-+    
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_TZNAME 1
-+_ACEOF
-+
-+  fi
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_func in vprintf
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+ 
-+{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-+echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
-+if test "${ac_cv_func__doprnt+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 _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define _doprnt innocuous__doprnt
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char _doprnt (); 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 _doprnt
-+
-+/* 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 _doprnt ();
-+/* 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__doprnt || defined __stub____doprnt
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return _doprnt ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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__doprnt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func__doprnt=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__doprnt" >&5
-+echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
-+if test $ac_cv_func__doprnt = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_DOPRNT 1
-+_ACEOF
-+
-+fi
-+
-+fi
-+done
-+
-+
-+
-+
-+CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
-+
-+
-+
-+# Check whether --with-bdb was given.
-+if test "${with_bdb+set}" = set; then
-+  withval=$with_bdb; with_bdb=$withval
-+else
-+  with_bdb="yes"
-+fi
-+
-+
-+
-+# Check whether --with-dbdir was given.
-+if test "${with_dbdir+set}" = set; then
-+  withval=$with_dbdir; with_bdb=$withval
-+fi
-+
-+
-+case "$with_bdb" in
-+  no)
-+	use_berkeley="no"
-+	;;
-+  yes)
-+	use_berkeley="yes"
-+	with_bdb_lib=none
-+	with_bdb_inc=none
-+	;;
-+  
-+  *)
-+	use_berkeley="yes"
-+	with_bdb_lib="$with_bdb/lib"
-+	with_bdb_inc="$with_bdb/include"
-+	;;
-+esac
-+
-+if test "$use_berkeley" != "no"; then
-+  
-+
-+# Check whether --with-bdb-libdir was given.
-+if test "${with_bdb_libdir+set}" = set; then
-+  withval=$with_bdb_libdir; with_bdb_lib=$withval
-+else
-+   test "${with_bdb_lib+set}" = set || with_bdb_lib=none
-+fi
-+
-+
-+# Check whether --with-bdb-incdir was given.
-+if test "${with_bdb_incdir+set}" = set; then
-+  withval=$with_bdb_incdir; with_bdb_inc=$withval
-+else
-+   test "${with_bdb_inc+set}" = set || with_bdb_inc=none 
-+fi
-+
-+
-+
-+	
-+
-+	cmu_save_CPPFLAGS=$CPPFLAGS
-+
-+	if test -d $with_bdb_inc; then
-+	    CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
-+	    BDB_INCADD="-I$with_bdb_inc"
-+	else
-+	    BDB_INCADD=""
-+	fi
-+
-+	                if test "${ac_cv_header_db_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for db.h" >&5
-+echo $ECHO_N "checking for db.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_db_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
-+echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking db.h usability" >&5
-+echo $ECHO_N "checking db.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <db.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 db.h presence" >&5
-+echo $ECHO_N "checking db.h 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 <db.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: db.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: db.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: db.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: db.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: db.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: db.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: db.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: db.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: db.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: db.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: db.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for db.h" >&5
-+echo $ECHO_N "checking for db.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_db_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_db_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
-+echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_db_h = yes; then
-+  
-+	BDB_SAVE_LDFLAGS=$LDFLAGS
-+
-+	if test -d $with_bdb_lib; then
-+	    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
-+  else
-+	LDFLAGS="-L$with_bdb_lib ${LDFLAGS} $andrew_runpath_switch$with_bdb_lib"
-+  fi
-+
-+	    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD}"
-+  else
-+	BDB_LIBADD="-L$with_bdb_lib ${BDB_LIBADD} $andrew_runpath_switch$with_bdb_lib"
-+  fi
-+
-+	else
-+	    BDB_LIBADD=""
-+	fi
-+
-+	saved_LIBS=$LIBS
-+        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+          do
-+	    LIBS="$saved_LIBS -l$dbname"
-+	    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <db.h>
-+int
-+main ()
-+{
-+db_create(NULL, NULL, 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	dblib="no"
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+	    if test "$dblib" = "berkeley"; then break; fi
-+          done
-+        if test "$dblib" = "no"; then
-+	    LIBS="$saved_LIBS -ldb"
-+	    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <db.h>
-+int
-+main ()
-+{
-+db_open(NULL, 0, 0, 0, NULL, NULL, NULL);
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	dblib="no"
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+        fi
-+	LIBS=$saved_LIBS
-+
-+	LDFLAGS=$BDB_SAVE_LDFLAGS
-+
-+else
-+  dblib="no"
-+fi
-+
-+
-+
-+	CPPFLAGS=$cmu_save_CPPFLAGS
-+
-+
-+  if test "$dblib" = "no"; then
-+    { { echo "$as_me:$LINENO: error: Berkeley DB 3.x or later was not found.  You may need to 
-+    supply the --with-bdb-libdir or --with-bdb-incdir configure options." >&5
-+echo "$as_me: error: Berkeley DB 3.x or later was not found.  You may need to 
-+    supply the --with-bdb-libdir or --with-bdb-incdir configure options." >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+
-+  if test "$with_bdb_lib" != "none"; then
-+    
-+  # this is CMU ADD LIBPATH
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LDFLAGS="-L$with_bdb_lib ${LDFLAGS}"
-+  else
-+	LDFLAGS="-L$with_bdb_lib $andrew_runpath_switch$with_bdb_lib ${LDFLAGS}"
-+  fi
-+
-+  fi
-+
-+  BDB_INC=${BDB_INCADD}
-+  BDB_LIB=${BDB_LIBADD}
-+  
-+  
-+
-+  LIBS="${LIBS} ${BDB_LIBADD}"
-+  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
-+
-+  CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_BDB 
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+SIEVE_SUBDIRS=""
-+sievedir="sieve"
-+# Check whether --enable-sieve was given.
-+if test "${enable_sieve+set}" = set; then
-+  enableval=$enable_sieve; if test "$enableval" = no; then
-+ 		sievedir="no"
-+	fi
-+fi
-+
-+
-+if test "$sievedir" != "no"; then
-+	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-+	
-+	SIEVE_LIBS="../${sievedir}/libsieve.a"
-+	
-+	SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
-+	
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define USE_SIEVE 
-+_ACEOF
-+
-+
-+		for ac_prog in 'bison -y' byacc
-+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_YACC+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$YACC"; then
-+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_YACC="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+YACC=$ac_cv_prog_YACC
-+if test -n "$YACC"; then
-+  { echo "$as_me:$LINENO: result: $YACC" >&5
-+echo "${ECHO_T}$YACC" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$YACC" && break
-+done
-+test -n "$YACC" || YACC="yacc"
-+
-+	for ac_prog in flex lex
-+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_LEX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$LEX"; then
-+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_LEX="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+LEX=$ac_cv_prog_LEX
-+if test -n "$LEX"; then
-+  { echo "$as_me:$LINENO: result: $LEX" >&5
-+echo "${ECHO_T}$LEX" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$LEX" && break
-+done
-+test -n "$LEX" || LEX=":"
-+
-+if test "x$LEX" != "x:"; then
-+  cat >conftest.l <<_ACEOF
-+%%
-+a { ECHO; }
-+b { REJECT; }
-+c { yymore (); }
-+d { yyless (1); }
-+e { yyless (input () != 0); }
-+f { unput (yytext[0]); }
-+. { BEGIN INITIAL; }
-+%%
-+#ifdef YYTEXT_POINTER
-+extern char *yytext;
-+#endif
-+int
-+main (void)
-+{
-+  return ! yylex () + ! yywrap ();
-+}
-+_ACEOF
-+{ (ac_try="$LEX conftest.l"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$LEX conftest.l") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+{ echo "$as_me:$LINENO: checking lex output file root" >&5
-+echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_lex_root+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+if test -f lex.yy.c; then
-+  ac_cv_prog_lex_root=lex.yy
-+elif test -f lexyy.c; then
-+  ac_cv_prog_lex_root=lexyy
-+else
-+  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-+echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
-+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-+
-+if test -z "${LEXLIB+set}"; then
-+  { echo "$as_me:$LINENO: checking lex library" >&5
-+echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_lex+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+    ac_save_LIBS=$LIBS
-+    ac_cv_lib_lex='none needed'
-+    for ac_lib in '' -lfl -ll; do
-+      LIBS="$ac_lib $ac_save_LIBS"
-+      cat >conftest.$ac_ext <<_ACEOF
-+`cat $LEX_OUTPUT_ROOT.c`
-+_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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_lex=$ac_lib
-+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 conftest.$ac_ext
-+      test "$ac_cv_lib_lex" != 'none needed' && break
-+    done
-+    LIBS=$ac_save_LIBS
-+  
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
-+echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
-+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-+echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # POSIX says lex can declare yytext either as a pointer or an array; the
-+# default is implementation-dependent.  Figure out which it is, since
-+# not all implementations provide the %pointer and %array declarations.
-+ac_cv_prog_lex_yytext_pointer=no
-+ac_save_LIBS=$LIBS
-+LIBS="$LEXLIB $ac_save_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#define YYTEXT_POINTER 1
-+`cat $LEX_OUTPUT_ROOT.c`
-+_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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_prog_lex_yytext_pointer=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_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_save_LIBS
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-+echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
-+if test $ac_cv_prog_lex_yytext_pointer = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define YYTEXT_POINTER 1
-+_ACEOF
-+
-+fi
-+rm -f conftest.l $LEX_OUTPUT_ROOT.c
-+
-+fi
-+	
-+{ echo "$as_me:$LINENO: checking for main in -lfl" >&5
-+echo $ECHO_N "checking for main in -lfl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_fl_main+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lfl  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_fl_main=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_fl_main=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_fl_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_fl_main" >&6; }
-+if test $ac_cv_lib_fl_main = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_LIBFL 1
-+_ACEOF
-+
-+  LIBS="-lfl $LIBS"
-+
-+fi
-+
-+
-+ 	{ echo "$as_me:$LINENO: checking for library containing regcomp" >&5
-+echo $ECHO_N "checking for library containing regcomp... $ECHO_C" >&6; }
-+if test "${ac_cv_search_regcomp+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any 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 regcomp ();
-+int
-+main ()
-+{
-+return regcomp ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' rx regex; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_search_regcomp=$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_regcomp+set}" = set; then
-+  break
-+fi
-+done
-+if test "${ac_cv_search_regcomp+set}" = set; then
-+  :
-+else
-+  ac_cv_search_regcomp=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5
-+echo "${ECHO_T}$ac_cv_search_regcomp" >&6; }
-+ac_res=$ac_cv_search_regcomp
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+  
-+ 			
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define ENABLE_REGEX 
-+_ACEOF
-+
-+		 	if test "${ac_cv_header_rxposix_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for rxposix.h" >&5
-+echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_rxposix_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
-+echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking rxposix.h usability" >&5
-+echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <rxposix.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 rxposix.h presence" >&5
-+echo $ECHO_N "checking rxposix.h 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 <rxposix.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: rxposix.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: rxposix.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: rxposix.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: rxposix.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: rxposix.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: rxposix.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: rxposix.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: rxposix.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: rxposix.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for rxposix.h" >&5
-+echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_rxposix_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_rxposix_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
-+echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_rxposix_h = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_RX 
-+_ACEOF
-+
-+fi
-+
-+
-+fi
-+
-+  		
-+
-+	SIEVE_SUBDIRS="${SIEVE_SUBDIRS} $sievedir"
-+	EXTRA_OUTPUT="${EXTRA_OUTPUT} $sievedir/Makefile"
-+fi
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for strerror" >&5
-+echo $ECHO_N "checking for strerror... $ECHO_C" >&6; }
-+if test "${ac_cv_func_strerror+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 strerror to an innocuous variant, in case <limits.h> declares strerror.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define strerror innocuous_strerror
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char strerror (); 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 strerror
-+
-+/* 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 strerror ();
-+/* 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_strerror || defined __stub___strerror
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return strerror ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_strerror=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_strerror=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_strerror" >&5
-+echo "${ECHO_T}$ac_cv_func_strerror" >&6; }
-+if test $ac_cv_func_strerror = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAS_STRERROR 
-+_ACEOF
-+
-+else
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define NEED_SYS_ERRLIST 
-+_ACEOF
-+
-+fi
-+
-+
-+
-+for ac_header in sys/resource.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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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 setrlimit
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+
-+for ac_func in getrlimit
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+
-+
-+
-+for ac_func in daemon setsid
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+
-+
-+for ac_func in shutdown
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/socket.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "socklen_t" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_SOCKLEN_T 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/socket.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "sockaddr_storage" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_STRUCT_SOCKADDR_STORAGE 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/resource.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "rlim_t" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_RLIM_T 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+
-+spt_type=""
-+{ 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_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
-+  spt_type=SPT_BUILTIN
-+fi
-+
-+if test "$spt_type" = ""; then
-+		{ echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5
-+echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_util_setproctitle+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil  $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 setproctitle ();
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_util_setproctitle=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_util_setproctitle=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_util_setproctitle" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6; }
-+if test $ac_cv_lib_util_setproctitle = yes; then
-+  spt_type=SPT_BUILTIN
-+			LIBS="${LIBS} -lutil"
-+fi
-+
-+fi
-+if test "$spt_type" = ""; then
-+	if test "${ac_cv_header_sys_pstat_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
-+echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sys_pstat_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sys/pstat.h usability" >&5
-+echo $ECHO_N "checking sys/pstat.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sys/pstat.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sys/pstat.h presence" >&5
-+echo $ECHO_N "checking sys/pstat.h 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 <sys/pstat.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sys/pstat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sys/pstat.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sys/pstat.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sys/pstat.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sys/pstat.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sys/pstat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
-+echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sys_pstat_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sys_pstat_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sys_pstat_h = yes; then
-+  spt_type=SPT_PSTAT
-+fi
-+
-+
-+fi
-+if test "$spt_type" = ""; then
-+	if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
-+echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sys/sysnews.h usability" >&5
-+echo $ECHO_N "checking sys/sysnews.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sys/sysnews.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sys/sysnews.h presence" >&5
-+echo $ECHO_N "checking sys/sysnews.h 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 <sys/sysnews.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sys/sysnews.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sys/sysnews.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
-+echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sys_sysnews_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sys_sysnews_h = yes; then
-+  spt_type=SPT_SYSMIPS
-+fi
-+
-+
-+fi
-+if test "$spt_type" = ""; then
-+	{ echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
-+echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6; }
-+	if test "${cyrus_cv_sys_psstrings+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 <machine/vmparam.h>
-+#include <sys/exec.h>
-+#ifndef PS_STRINGS
-+#include </nonexistent>
-+#endif
-+_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  cyrus_cv_sys_psstrings=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  cyrus_cv_sys_psstrings=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+
-+	if test $cyrus_cv_sys_psstrings = yes; then
-+		spt_type=SPT_PSSTRINGS
-+	fi
-+	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6; }
-+fi
-+if test "$spt_type" = ""; then
-+	{ echo "$as_me:$LINENO: checking for SCO" >&5
-+echo $ECHO_N "checking for SCO... $ECHO_C" >&6; }
-+	if test "${cyrus_cv_sys_sco+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.  */
-+
-+#ifndef _SCO_unix_
-+#include </nonexistent>
-+#endif
-+_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  cyrus_cv_sys_sco=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  cyrus_cv_sys_sco=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+
-+	if test $cyrus_cv_sys_sco = yes; then
-+		spt_type=SPT_SCO
-+	fi
-+	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_sco" >&6; }
-+fi
-+if test "$spt_type" = ""; then
-+	{ echo "$as_me:$LINENO: checking for setproctitle usability" >&5
-+echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6; }
-+	if test "${cyrus_cv_sys_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.  */
-+
-+#if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
-+#include </nonexistent>
-+#endif
-+_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  cyrus_cv_sys_setproctitle=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  cyrus_cv_sys_setproctitle=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+
-+	if test $cyrus_cv_sys_setproctitle = no; then
-+		spt_type=SPT_NONE
-+	fi
-+	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_setproctitle" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_setproctitle" >&6; }
-+fi
-+if test "$spt_type" != ""; then
-+	
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SPT_TYPE $spt_type
-+_ACEOF
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking nonblocking method" >&5
-+echo $ECHO_N "checking nonblocking method... $ECHO_C" >&6; }
-+if test "${cyrus_cv_sys_nonblock+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/file.h>
-+#include <fcntl.h>
-+#ifndef	FNDELAY
-+#define FNDELAY		O_NDELAY
-+#endif
-+int
-+main ()
-+{
-+fcntl(0, F_GETFL, 0)&FNDELAY
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  cyrus_cv_sys_nonblock=fcntl
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	cyrus_cv_sys_nonblock=ioctl
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+
-+WITH_NONBLOCK=$cyrus_cv_sys_nonblock
-+
-+{ echo "$as_me:$LINENO: result: $WITH_NONBLOCK" >&5
-+echo "${ECHO_T}$WITH_NONBLOCK" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking timezone GMT offset method" >&5
-+echo $ECHO_N "checking timezone GMT offset method... $ECHO_C" >&6; }
-+if test "${cyrus_cv_struct_sys_gmtoff+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 <time.h>
-+int
-+main ()
-+{
-+struct tm tm;
-+tm.tm_gmtoff = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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
-+  cyrus_cv_struct_sys_gmtoff=tm
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	cyrus_cv_struct_sys_gmtoff=gmtime
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
-+
-+{ echo "$as_me:$LINENO: result: $WITH_GMTOFF" >&5
-+echo "${ECHO_T}$WITH_GMTOFF" >&6; }
-+{ echo "$as_me:$LINENO: checking for shared mmap" >&5
-+echo $ECHO_N "checking for shared mmap... $ECHO_C" >&6; }
-+if test "${cyrus_cv_func_mmap_shared+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  cyrus_cv_func_mmap_shared=no
-+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/mman.h>
-+#include <fcntl.h>
-+main() {
-+char *base;
-+int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-+if (fd == -1) exit(1);
-+if (write(fd, "test", 4) != 4) exit(1);
-+fsync(fd);
-+base = mmap((caddr_t)0, 100, PROT_READ, MAP_SHARED
-+#ifdef MAP_FILE
-+| MAP_FILE
-+#endif
-+#ifdef MAP_VARIABLE
-+| MAP_VARIABLE
-+#endif
-+, fd, 0L);
-+if (base == (caddr_t)-1) exit(1);
-+if (strncmp(base, "test", 4) != 0) exit(1);
-+if (write(fd, "test", 4) != 4) exit(1);
-+fsync(fd);
-+if (strncmp(base+4, "test", 4) != 0) exit(1);
-+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
-+  cyrus_cv_func_mmap_shared=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 )
-+cyrus_cv_func_mmap_shared=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: $cyrus_cv_func_mmap_shared" >&5
-+echo "${ECHO_T}$cyrus_cv_func_mmap_shared" >&6; }
-+if test $cyrus_cv_func_mmap_shared = yes; then
-+	WITH_MAP="shared"
-+else
-+{ echo "$as_me:$LINENO: checking for stupid shared mmap" >&5
-+echo $ECHO_N "checking for stupid shared mmap... $ECHO_C" >&6; }
-+if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  cyrus_cv_func_mmap_stupidshared=no
-+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/mman.h>
-+#include <fcntl.h>
-+main() {
-+char *base;
-+int fd = open("conftestmmap", O_RDWR|O_CREAT|O_TRUNC, 0666);
-+if (fd == -1) exit(1);
-+if (write(fd, "test", 4) != 4) exit(1);
-+fsync(fd);
-+base = mmap((caddr_t)0, 4, PROT_READ, MAP_SHARED
-+#ifdef MAP_FILE
-+| MAP_FILE
-+#endif
-+#ifdef MAP_VARIABLE
-+| MAP_VARIABLE
-+#endif
-+, fd, 0L);
-+if (base == (caddr_t)-1) exit(1);
-+if (strncmp(base, "test", 4) != 0) exit(1);
-+lseek(fd, 0L, 0);	
-+if (write(fd, "xyzz", 4) != 4) exit(1);
-+fsync(fd);
-+if (strncmp(base, "xyzz", 4) != 0) exit(1);
-+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
-+  cyrus_cv_func_mmap_stupidshared=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 )
-+cyrus_cv_func_mmap_stupidshared=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: $cyrus_cv_func_mmap_stupidshared" >&5
-+echo "${ECHO_T}$cyrus_cv_func_mmap_stupidshared" >&6; }
-+if test $cyrus_cv_func_mmap_stupidshared = yes; then
-+	WITH_MAP="stupidshared"
-+else
-+	{ echo "$as_me:$LINENO: WARNING: *** This system does not have a working mmap()" >&5
-+echo "$as_me: WARNING: *** This system does not have a working mmap()" >&2;}
-+	{ echo "$as_me:$LINENO: WARNING: *** Expect a considerable performance penalty" >&5
-+echo "$as_me: WARNING: *** Expect a considerable performance penalty" >&2;}
-+	WITH_MAP=nommap
-+fi
-+fi
-+
-+
-+
-+# Check whether --with-lock was given.
-+if test "${with_lock+set}" = set; then
-+  withval=$with_lock; WITH_LOCK="$withval"
-+else
-+  
-+  { echo "$as_me:$LINENO: checking for fcntl" >&5
-+echo $ECHO_N "checking for fcntl... $ECHO_C" >&6; }
-+if test "${ac_cv_func_fcntl+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 fcntl to an innocuous variant, in case <limits.h> declares fcntl.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define fcntl innocuous_fcntl
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char fcntl (); 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 fcntl
-+
-+/* 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 fcntl ();
-+/* 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_fcntl || defined __stub___fcntl
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return fcntl ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_fcntl=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_fcntl=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_fcntl" >&5
-+echo "${ECHO_T}$ac_cv_func_fcntl" >&6; }
-+if test $ac_cv_func_fcntl = yes; then
-+  WITH_LOCK="fcntl"
-+else
-+  
-+		{ echo "$as_me:$LINENO: checking for flock" >&5
-+echo $ECHO_N "checking for flock... $ECHO_C" >&6; }
-+if test "${ac_cv_func_flock+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 flock to an innocuous variant, in case <limits.h> declares flock.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define flock innocuous_flock
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char flock (); 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 flock
-+
-+/* 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 flock ();
-+/* 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_flock || defined __stub___flock
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return flock ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_flock=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_flock=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_flock" >&5
-+echo "${ECHO_T}$ac_cv_func_flock" >&6; }
-+if test $ac_cv_func_flock = yes; then
-+  WITH_LOCK="flock"
-+else
-+  
-+				{ { echo "$as_me:$LINENO: error: unable to detect locking method" >&5
-+echo "$as_me: error: unable to detect locking method" >&2;}
-+   { (exit 1); exit 1; }; }
-+			      
-+fi
-+
-+		
-+fi
-+
-+  
-+fi
-+
-+
-+
-+
-+LIB_RT=""
-+{ echo "$as_me:$LINENO: checking for fdatasync" >&5
-+echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6; }
-+if test "${ac_cv_func_fdatasync+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 fdatasync to an innocuous variant, in case <limits.h> declares fdatasync.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define fdatasync innocuous_fdatasync
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char fdatasync (); 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 fdatasync
-+
-+/* 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 fdatasync ();
-+/* 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_fdatasync || defined __stub___fdatasync
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return fdatasync ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_fdatasync=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_fdatasync=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_fdatasync" >&5
-+echo "${ECHO_T}$ac_cv_func_fdatasync" >&6; }
-+if test $ac_cv_func_fdatasync = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_FDATASYNC 
-+_ACEOF
-+
-+else
-+  
-+  { echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
-+echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrt  $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 fdatasync ();
-+int
-+main ()
-+{
-+return fdatasync ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_rt_fdatasync=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_rt_fdatasync=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_rt_fdatasync" >&5
-+echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6; }
-+if test $ac_cv_lib_rt_fdatasync = yes; then
-+  
-+	LIB_RT="-lrt"
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_FDATASYNC 
-+_ACEOF
-+
-+  
-+fi
-+
-+
-+fi
-+
-+
-+cant_find_sigvec=no
-+if test "${cyrus_sigveclib+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+  { echo "$as_me:$LINENO: checking for sigvec" >&5
-+echo $ECHO_N "checking for sigvec... $ECHO_C" >&6; }
-+if test "${ac_cv_func_sigvec+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 sigvec to an innocuous variant, in case <limits.h> declares sigvec.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define sigvec innocuous_sigvec
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char sigvec (); 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 sigvec
-+
-+/* 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 sigvec ();
-+/* 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_sigvec || defined __stub___sigvec
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return sigvec ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_sigvec=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_sigvec=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_sigvec" >&5
-+echo "${ECHO_T}$ac_cv_func_sigvec" >&6; }
-+if test $ac_cv_func_sigvec = yes; then
-+  
-+	cyrus_sigveclib=""
-+  
-+else
-+  
-+    { echo "$as_me:$LINENO: checking for sigvec in -lBSD" >&5
-+echo $ECHO_N "checking for sigvec in -lBSD... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_BSD_sigvec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lBSD  $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 sigvec ();
-+int
-+main ()
-+{
-+return sigvec ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_BSD_sigvec=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_BSD_sigvec=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_BSD_sigvec" >&5
-+echo "${ECHO_T}$ac_cv_lib_BSD_sigvec" >&6; }
-+if test $ac_cv_lib_BSD_sigvec = yes; then
-+  cyrus_sigveclib="-lBSD"
-+else
-+  
-+        SAVE_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
-+    { echo "$as_me:$LINENO: checking for sigvec in -lucb" >&5
-+echo $ECHO_N "checking for sigvec in -lucb... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ucb_sigvec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lucb  $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 sigvec ();
-+int
-+main ()
-+{
-+return sigvec ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_ucb_sigvec=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_ucb_sigvec=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_ucb_sigvec" >&5
-+echo "${ECHO_T}$ac_cv_lib_ucb_sigvec" >&6; }
-+if test $ac_cv_lib_ucb_sigvec = yes; then
-+  
-+            cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
-+else
-+   cant_find_sigvec=yes 
-+fi
-+
-+    LDFLAGS="$SAVE_LDFLAGS"
-+fi
-+
-+  
-+fi
-+
-+
-+fi
-+
-+
-+
-+# ok, we still look for this stuff because of checking groups, but
-+# all authentication goes through SASL
-+
-+
-+# Check whether --with-afs was given.
-+if test "${with_afs+set}" = set; then
-+  withval=$with_afs; with_afs="${withval}"
-+else
-+  with_afs="no"
-+fi
-+
-+
-+
-+# Check whether --with-ldap was given.
-+if test "${with_ldap+set}" = set; then
-+  withval=$with_ldap; with_ldap="${withval}"
-+else
-+  with_ldap="no"
-+fi
-+
-+
-+# Check whether --enable-krb5afspts was given.
-+if test "${enable_krb5afspts+set}" = set; then
-+  enableval=$enable_krb5afspts; SASL_GSSAPI_LIBS_SET="yes"
-+
-+         
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define AFSPTS_USE_KRB5 
-+_ACEOF
-+
-+fi
-+
-+
-+if test "x$with_afs" != "xno"; then
-+    if test ! -d $with_afs; then
-+        $with_afs=/usr/local
-+    fi
-+    CFLAGS="${CFLAGS} -I${with_afs}/include"
-+    AFS_LIBS="${with_afs}/lib/afs/libkauth.a ${with_afs}/lib/afs/libprot.a  ${with_afs}/lib/afs/libauth.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/librxkad.a ${with_afs}/lib/librx.a ${with_afs}/lib/afs/libsys.a ${with_afs}/lib/libubik.a  ${with_afs}/lib/liblwp.a ${with_afs}/lib/afs/util.a"
-+    if test -f ${with_afs}/lib/afs/libaudit.a; then
-+    AFS_LIBS="$AFS_LIBS ${with_afs}/lib/afs/libaudit.a"
-+    fi
-+    if test -f /usr/ucblib/libucb.a; then
-+    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS}"
-+  else
-+	AFS_LDFLAGS="-L/usr/ucblib ${AFS_LDFLAGS} $andrew_runpath_switch/usr/ucblib"
-+  fi
-+
-+    AFS_LIBS="$AFS_LIBS -lc -lucb"
-+    fi
-+
-+    if test "${cyrus_afs_sigvec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+        SAVE_LIBS="$LIBS"
-+        LIBS="${with_afs}/lib/liblwp.a"
-+        { echo "$as_me:$LINENO: checking if AFS libraries need sigvec" >&5
-+echo $ECHO_N "checking if AFS libraries need sigvec... $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.  */
-+IOMGR_Initialize();
-+int
-+main ()
-+{
-+IOMGR_Initialize()
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  
-+                                                { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+                        cyrus_afs_sigvec="no"
-+                
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	
-+                                                { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+                        cyrus_afs_sigvec="yes"
-+                
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+        
-+fi
-+
-+    if test "$cyrus_afs_sigvec" = yes; then
-+      if test "$cant_find_sigvec" = yes; then
-+        { echo "$as_me:$LINENO: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&5
-+echo "$as_me: WARNING: Can't find a sigvec for AFS libraries which seem to need one." >&2;}
-+      else
-+        AFS_LIBS="${AFS_LIBS} $cyrus_sigveclib"
-+        
-+        
-+        
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_AFSKRB 
-+_ACEOF
-+
-+      fi
-+    else
-+      AFS_LIBS="${AFS_LIBS}"
-+      
-+      
-+      
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_AFSKRB 
-+_ACEOF
-+
-+    fi
-+    LIBS="$SAVE_LIBS"
-+fi
-+
-+LDAP_CPPFLAGS=""
-+LDAP_LDFLAGS=""
-+LDAP_LIBS=""
-+
-+if test "x$with_ldap" != "xno"; then
-+    if test ! -d $with_ldap; then
-+        $with_ldap=/usr/local
-+    fi
-+
-+    LDAP_CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
-+    LDAP_LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
-+    LDAP_LIBS=""
-+
-+    save_CPPFLAGS=$CPPFLAGS
-+    save_LDFLAGS=$LDFLAGS
-+    CPPFLAGS=$LDAP_CPPFLAGS
-+    LDFLAGS=$LDAP_LDFLAGS
-+
-+    { echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
-+echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lldap -llber $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 ldap_initialize ();
-+int
-+main ()
-+{
-+return ldap_initialize ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_ldap_ldap_initialize=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_ldap_ldap_initialize=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_ldap_ldap_initialize" >&5
-+echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6; }
-+if test $ac_cv_lib_ldap_ldap_initialize = yes; then
-+   
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_LDAP 
-+_ACEOF
-+
-+          
-+          
-+          	
-+          LDAP_LIBS="-lldap -llber" 
-+fi
-+
-+
-+    CPPFLAGS=$save_CPPFLAGS
-+    LDFLAGS=$save_LDFLAGS
-+fi
-+
-+if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
-+	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
-+	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define WITH_PTS 
-+_ACEOF
-+
-+fi
-+
-+SERVER_SUBDIRS="master imap"
-+# Check whether --enable-server was given.
-+if test "${enable_server+set}" = set; then
-+  enableval=$enable_server; if test "$enableval" = no; then
-+        	SERVER_SUBDIRS=""
-+	fi
-+fi
-+
-+
-+# We always output a server makefile (just because we can)
-+
-+
-+# Check whether --with-krb was given.
-+if test "${with_krb+set}" = set; then
-+  withval=$with_krb; with_krb="$withval"
-+else
-+  with_krb="no"
-+fi
-+
-+
-+
-+# Check whether --with-krbimpl was given.
-+if test "${with_krbimpl+set}" = set; then
-+  withval=$with_krbimpl; with_krbimpl="$withval"
-+else
-+  with_krbimpl="kth"
-+fi
-+
-+
-+# Check whether --enable-statickrb was given.
-+if test "${enable_statickrb+set}" = set; then
-+  enableval=$enable_statickrb; with_statickrb="yes"
-+else
-+  with_statickrb="no"
-+fi
-+
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-+echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_resolv_res_search+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv  $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 res_search ();
-+int
-+main ()
-+{
-+return res_search ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_resolv_res_search=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_resolv_res_search=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_resolv_res_search" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; }
-+if test $ac_cv_lib_resolv_res_search = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_LIBRESOLV 1
-+_ACEOF
-+
-+  LIBS="-lresolv $LIBS"
-+
-+fi
-+
-+
-+if test "$with_statickrb" = "yes" -a ! -d "$with_krb"; then
-+      { { echo "$as_me:$LINENO: error: --enable-statickrb specified but --with-krb did not specify a valid directory" >&5
-+echo "$as_me: error: --enable-statickrb specified but --with-krb did not specify a valid directory" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi 
-+
-+if test "$with_krb" != "no"; then
-+
-+# Check whether --with-krbdes was given.
-+if test "${with_krbdes+set}" = set; then
-+  withval=$with_krbdes; with_krbdes="$withval"
-+else
-+  with_krbdes="yes"
-+fi
-+
-+if test "$with_krbdes" = "yes"; then
-+  { echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5
-+echo $ECHO_N "checking for des_ecb_encrypt in -ldes... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldes  $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 des_ecb_encrypt ();
-+int
-+main ()
-+{
-+return des_ecb_encrypt ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_des_des_ecb_encrypt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_des_des_ecb_encrypt=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_des_des_ecb_encrypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_des_des_ecb_encrypt" >&6; }
-+if test $ac_cv_lib_des_des_ecb_encrypt = yes; then
-+  if test "$with_statickrb" = "yes"; then
-+          KRB_LIBS="$with_krb/lib/libdes.a"
-+      else
-+          KRB_LIBS="-ldes"
-+      fi
-+else
-+  { { echo "$as_me:$LINENO: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&5
-+echo "$as_me: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+fi
-+fi
-+
-+if test -d ${with_krb}; then
-+   { echo "$as_me:$LINENO: checking for Kerberos includes" >&5
-+echo $ECHO_N "checking for Kerberos includes... $ECHO_C" >&6; }
-+if test "${cyrus_krbinclude+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  
-+     for krbhloc in include/kerberosIV include
-+     do
-+       if test -f ${with_krb}/${krbhloc}/krb.h ; then
-+         cyrus_krbinclude=${with_krb}/${krbhloc}
-+         break
-+       fi
-+     done
-+     
-+fi
-+{ echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5
-+echo "${ECHO_T}$cyrus_krbinclude" >&6; }
-+
-+   if test -n "${cyrus_krbinclude}"; then
-+     CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-+   fi
-+   
-+  # this is CMU ADD LIBPATH
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LDFLAGS="-L${with_krb}/lib ${LDFLAGS}"
-+  else
-+	LDFLAGS="-L${with_krb}/lib $andrew_runpath_switch${with_krb}/lib ${LDFLAGS}"
-+  fi
-+
-+fi
-+
-+if test "$with_krbimpl" != "kth"; then
-+  KRBLIB="krb4"
-+else
-+  KRBLIB="krb"
-+fi
-+
-+if test "$with_des" != no; then
-+  if test "${ac_cv_header_krb_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for krb.h" >&5
-+echo $ECHO_N "checking for krb.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_krb_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_krb_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking krb.h usability" >&5
-+echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <krb.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 krb.h presence" >&5
-+echo $ECHO_N "checking krb.h 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 <krb.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: krb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: krb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: krb.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: krb.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: krb.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: krb.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: krb.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: krb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: krb.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: krb.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for krb.h" >&5
-+echo $ECHO_N "checking for krb.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_krb_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_krb_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_krb_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_krb_h = yes; then
-+  as_ac_Lib=`echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for krb_mk_priv in -l${KRBLIB}" >&5
-+echo $ECHO_N "checking for krb_mk_priv in -l${KRBLIB}... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l${KRBLIB} $KRB_LIBS $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any 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 krb_mk_priv ();
-+int
-+main ()
-+{
-+return krb_mk_priv ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  eval "$as_ac_Lib=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	eval "$as_ac_Lib=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
-+ac_res=`eval echo '${'$as_ac_Lib'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-+  if test "$with_statickrb" = "yes"; then
-+          KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
-+      else
-+          KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
-+      fi
-+else
-+  { echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
-+echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
-+fi
-+
-+else
-+  { echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
-+echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no
-+fi
-+
-+
-+else
-+  { echo "$as_me:$LINENO: WARNING: No DES library found for Kerberos V4 support" >&5
-+echo "$as_me: WARNING: No DES library found for Kerberos V4 support" >&2;}
-+  krb4=no
-+fi
-+
-+if test "${krb4}" != no; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_KRB 
-+_ACEOF
-+
-+fi
-+
-+LIBS="$KRB_LIBS $LIBS"
-+
-+SASL_GSSAPI_LIBS_SET="yes"
-+
-+
-+IMAP_PROGS=""
-+
-+# Check whether --with-openssl was given.
-+if test "${with_openssl+set}" = set; then
-+  withval=$with_openssl; with_openssl="${withval}"
-+fi
-+
-+
-+OPENSSL_INC=
-+OPENSSL_LIB=
-+case "$with_openssl" in
-+	no) with_openssl="no";;
-+	""|yes) 
-+	  	                  LIB_RSAREF=""
-+	        { echo "$as_me:$LINENO: checking for RSAPublicEncrypt in -lrsaref" >&5
-+echo $ECHO_N "checking for RSAPublicEncrypt in -lrsaref... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrsaref  $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 RSAPublicEncrypt ();
-+int
-+main ()
-+{
-+return RSAPublicEncrypt ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_rsaref_RSAPublicEncrypt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_rsaref_RSAPublicEncrypt=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_rsaref_RSAPublicEncrypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6; }
-+if test $ac_cv_lib_rsaref_RSAPublicEncrypt = yes; then
-+  LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
-+else
-+  cmu_have_rsaref=no
-+fi
-+
-+
-+		with_openssl="yes"
-+		{ echo "$as_me:$LINENO: checking for BIO_accept in -lcrypto" >&5
-+echo $ECHO_N "checking for BIO_accept in -lcrypto... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypto $LIB_RSAREF $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 BIO_accept ();
-+int
-+main ()
-+{
-+return BIO_accept ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_crypto_BIO_accept=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_crypto_BIO_accept=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_crypto_BIO_accept" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypto_BIO_accept" >&6; }
-+if test $ac_cv_lib_crypto_BIO_accept = yes; then
-+  LIBS="-lcrypto $LIB_RSAREF ${LIBS}"
-+else
-+  with_openssl="no"
-+fi
-+
-+		{ echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
-+echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lssl -lcrypto $LIB_RSAREF $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 SSL_CTX_new ();
-+int
-+main ()
-+{
-+return SSL_CTX_new ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_ssl_SSL_CTX_new=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_ssl_SSL_CTX_new=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_ssl_SSL_CTX_new" >&5
-+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
-+if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
-+  LIBS="-lssl ${LIBS}"
-+else
-+  with_openssl="no"
-+fi
-+
-+		
-+		;;
-+	*)  OPENSSL_INC="-I${with_openssl}/include"
-+	    OPENSSL_LIBPATH="${with_openssl}/lib"
-+	    OPENSSL_LIB="-L${OPENSSL_LIBPATH}"
-+	    CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
-+	    
-+  # this is CMU ADD LIBPATH
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LDFLAGS="-L${OPENSSL_LIBPATH} ${LDFLAGS}"
-+  else
-+	LDFLAGS="-L${OPENSSL_LIBPATH} $andrew_runpath_switch${OPENSSL_LIBPATH} ${LDFLAGS}"
-+  fi
-+
-+	    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB}"
-+  else
-+	OPENSSL_LIB="-L${OPENSSL_LIBPATH} ${OPENSSL_LIB} $andrew_runpath_switch${OPENSSL_LIBPATH}"
-+  fi
-+
-+	    LIBS="${LIBS} -lssl -lcrypto";;
-+esac
-+
-+{ echo "$as_me:$LINENO: checking for openssl" >&5
-+echo $ECHO_N "checking for openssl... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $with_openssl" >&5
-+echo "${ECHO_T}$with_openssl" >&6; }
-+
-+if test "$with_openssl" != "no"; then
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_SSL 
-+_ACEOF
-+
-+	IMAP_PROGS="$IMAP_PROGS tls_prune"
-+        if test "${krb4}" != no; then
-+           
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define OPENSSL_ENABLE_OLD_DES_SUPPORT 
-+_ACEOF
-+
-+           
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define OPENSSL_DES_LIBDES_COMPATIBILITY 
-+_ACEOF
-+
-+        fi
-+fi
-+
-+
-+
-+
-+# Check whether --with-egd-socket was given.
-+if test "${with_egd_socket+set}" = set; then
-+  withval=$with_egd_socket;  EGD_SOCKET="$withval" 
-+      
-+fi
-+
-+if test -n "$EGD_SOCKET" ; then
-+      
-+cat >>confdefs.h <<_ACEOF
-+@%:@define EGD_SOCKET "$EGD_SOCKET"
-+_ACEOF
-+
-+fi
-+
-+
-+# Check whether --with-zephyr was given.
-+if test "${with_zephyr+set}" = set; then
-+  withval=$with_zephyr; with_zephyr="${withval}"
-+fi
-+
-+if test -z "$with_zephyr"; then
-+     if test -f /usr/local/lib/libzephyr.a; then
-+	with_zephyr="/usr/local"
-+     elif test -f /usr/lib/libzephyr.a; then
-+        with_zephyr="/usr"
-+     fi
-+fi
-+ZEPHYR_LIBS=""
-+ZEPHYR_CPPFLAGS=""
-+case "$with_zephyr" in
-+	no) true;;
-+	""|yes) { echo "$as_me:$LINENO: checking for ZInitialize in -lzephyr" >&5
-+echo $ECHO_N "checking for ZInitialize in -lzephyr... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lzephyr  $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 ZInitialize ();
-+int
-+main ()
-+{
-+return ZInitialize ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_zephyr_ZInitialize=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_zephyr_ZInitialize=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_zephyr_ZInitialize" >&5
-+echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitialize" >&6; }
-+if test $ac_cv_lib_zephyr_ZInitialize = yes; then
-+  ZEPHYR_LIBS="-lzephyr"
-+else
-+  with_zephyr="no"
-+fi
-+;;
-+       *)  if test -d ${with_zephyr}/include/zephyr; then
-+               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include/zephyr"
-+           else
-+               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include"
-+           fi
-+           ZEPHYR_LIBS="-lzephyr";;
-+esac
-+
-+
-+if test "$with_zephyr" != "no"; then
-+	
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_ZEPHYR 
-+_ACEOF
-+
-+fi
-+
-+
-+# Check whether --with-pidfile was given.
-+if test "${with_pidfile+set}" = set; then
-+  withval=$with_pidfile; MASTERPIDFILE="$withval"
-+else
-+  MASTERPIDFILE="/var/run/cyrus-master.pid"
-+fi
-+
-+MASTERPIDFILE="\"$MASTERPIDFILE\""
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define MASTER_PIDFILE $MASTERPIDFILE
-+_ACEOF
-+
-+
-+
-+# Check whether --with-idle was given.
-+if test "${with_idle+set}" = set; then
-+  withval=$with_idle; WITH_IDLE="${withval}"
-+else
-+  WITH_IDLE="poll"
-+fi
-+
-+
-+
-+ENABLE_NNTP=no
-+# Check whether --enable-nntp was given.
-+if test "${enable_nntp+set}" = set; then
-+  enableval=$enable_nntp; ENABLE_NNTP=$enableval
-+        if test "$ENABLE_NNTP" != no; then
-+	  IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
-+        fi
-+fi
-+ 
-+
-+# Check whether --enable-murder was given.
-+if test "${enable_murder+set}" = set; then
-+  enableval=$enable_murder; if test "$enableval" != no; then
-+	  IMAP_PROGS="$IMAP_PROGS proxyd lmtpproxyd mupdate"
-+        fi
-+fi
-+ 
-+
-+
-+
-+
-+# Check whether --with-com_err was given.
-+if test "${with_com_err+set}" = set; then
-+  withval=$with_com_err; 
-+fi
-+
-+if test -z "$with_com_err"; then
-+	# no value supplied
-+	{ echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5
-+echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_com_err_com_err+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcom_err  $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 com_err ();
-+int
-+main ()
-+{
-+return com_err ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_com_err_com_err=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_com_err_com_err=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_com_err_com_err" >&5
-+echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6; }
-+if test $ac_cv_lib_com_err_com_err = yes; then
-+  
-+		# com_err is already in library path
-+		# guess we're okay
-+		# can use system com_err
-+		with_com_err=""
-+		if test "${ac_cv_header_et_com_err_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for et/com_err.h" >&5
-+echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_et_com_err_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking et/com_err.h usability" >&5
-+echo $ECHO_N "checking et/com_err.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <et/com_err.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 et/com_err.h presence" >&5
-+echo $ECHO_N "checking et/com_err.h 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 <et/com_err.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: et/com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: et/com_err.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: et/com_err.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: et/com_err.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: et/com_err.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: et/com_err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for et/com_err.h" >&5
-+echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_et_com_err_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_et_com_err_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_et_com_err_h = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_ET_COM_ERR_H 
-+_ACEOF
-+
-+else
-+  if test "${ac_cv_header_com_err_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for com_err.h" >&5
-+echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_com_err_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_com_err_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking com_err.h usability" >&5
-+echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <com_err.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 com_err.h presence" >&5
-+echo $ECHO_N "checking com_err.h 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 <com_err.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: com_err.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: com_err.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: com_err.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: com_err.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: com_err.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: com_err.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: com_err.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: com_err.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: com_err.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for com_err.h" >&5
-+echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_com_err_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_com_err_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_com_err_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_com_err_h = yes; then
-+  :
-+else
-+  { { echo "$as_me:$LINENO: error: cannot locate com_err.h" >&5
-+echo "$as_me: error: cannot locate com_err.h" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+fi
-+
-+
-+		# Extract the first word of "compile_et", so it can be a program name with args.
-+set dummy compile_et; 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_path_COMPILE_ET+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $COMPILE_ET in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
-+  ;;
-+esac
-+fi
-+COMPILE_ET=$ac_cv_path_COMPILE_ET
-+if test -n "$COMPILE_ET"; then
-+  { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
-+echo "${ECHO_T}$COMPILE_ET" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+	
-+else
-+  
-+	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
-+		with_com_err="/usr/local"
-+		# Extract the first word of "/usr/local/bin/compile_et", so it can be a program name with args.
-+set dummy /usr/local/bin/compile_et; 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_path_COMPILE_ET+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $COMPILE_ET in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
-+  ;;
-+esac
-+fi
-+COMPILE_ET=$ac_cv_path_COMPILE_ET
-+if test -n "$COMPILE_ET"; then
-+  { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
-+echo "${ECHO_T}$COMPILE_ET" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
-+		with_com_err="/usr"
-+		# Extract the first word of "/usr/bin/compile_et", so it can be a program name with args.
-+set dummy /usr/bin/compile_et; 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_path_COMPILE_ET+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $COMPILE_ET in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
-+  ;;
-+esac
-+fi
-+COMPILE_ET=$ac_cv_path_COMPILE_ET
-+if test -n "$COMPILE_ET"; then
-+  { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
-+echo "${ECHO_T}$COMPILE_ET" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+	else
-+		# use ours
-+		with_com_err=yes
-+	fi
-+	
-+fi
-+
-+
-+	if test "${with_com_err}" = "no"; then
-+	  { echo "$as_me:$LINENO: WARNING: com_err is required; included version will be used." >&5
-+echo "$as_me: WARNING: com_err is required; included version will be used." >&2;}
-+	  with_com_err="yes"
-+	fi
-+	if test "${COMPILE_ET}" = "no compile et" -o "${COMPILE_ET}" = ""; then
-+	  { echo "$as_me:$LINENO: WARNING: Parts of com_err distribuion were found, but not compile_et." >&5
-+echo "$as_me: WARNING: Parts of com_err distribuion were found, but not compile_et." >&2;}
-+	  { echo "$as_me:$LINENO: WARNING: Will build com_err from included sources." >&5
-+echo "$as_me: WARNING: Will build com_err from included sources." >&2;}
-+	  with_com_err="yes" # build it ourselves
-+	fi
-+fi
-+
-+case "$with_com_err" in
-+  # built-in et
-+  yes) # use the com_err we're gonna build
-+	  COM_ERR_LIBS="../et/libcom_err.a"
-+	  COMPILE_ET="../et/compile_et"
-+	  COM_ERR_LDFLAGS=""
-+	  COM_ERR_CPPFLAGS="-I\${top_srcdir}/et"
-+	  PRE_SUBDIRS="et ${PRE_SUBDIRS}"
-+	  EXTRA_OUTPUT="${EXTRA_OUTPUT} et/Makefile"
-+	  ;;
-+  "")   # no problem, we already have it in the paths
-+	# we do nothing to pick it up
-+	COM_ERR_LIBS="-lcom_err" # hope it's not shared
-+	# we already set COMPILE_ET, or we didn't get here
-+	COM_ERR_LDFLAGS=""
-+	COM_ERR_CPPFLAGS=""
-+      ;;
-+  *) # use whatever they told us, or whatever we found
-+     COMPILE_ET="${with_com_err}/bin/compile_et"
-+     COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
-+     COM_ERR_CPPFLAGS="-I${with_com_err}/include"
-+     # Ever get the feeling people hide this stuff on purpose?
-+     if test -d "${with_com_err}/include/et" ; then
-+       COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
-+     fi
-+     COMPILE_ET="${with_com_err}/bin/compile_et"
-+esac
-+
-+
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for modern syslog" >&5
-+echo $ECHO_N "checking for modern syslog... $ECHO_C" >&6; }
-+if test "${cyrus_cv_lib_syslog+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 <syslog.h>
-+#ifndef LOG_LOCAL6
-+#include </nonexistent>
-+#endif
-+_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  cyrus_cv_lib_syslog=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  cyrus_cv_lib_syslog=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+fi
-+
-+if test $cyrus_cv_lib_syslog = no; then
-+	PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
-+	EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
-+	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
-+	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
-+fi
-+{ echo "$as_me:$LINENO: result: $cyrus_cv_lib_syslog" >&5
-+echo "${ECHO_T}$cyrus_cv_lib_syslog" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking which syslog facility to use" >&5
-+echo $ECHO_N "checking which syslog facility to use... $ECHO_C" >&6; }
-+SYSLOG_FACILITY=LOG_LOCAL6
-+
-+# Check whether --with-syslogfacility was given.
-+if test "${with_syslogfacility+set}" = set; then
-+  withval=$with_syslogfacility;  if test "$withval" != "yes" -a "$withval" != "no" ; then
-+                       SYSLOG_FACILITY=LOG_$withval
-+               fi; 
-+fi
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SYSLOG_FACILITY $SYSLOG_FACILITY
-+_ACEOF
-+
-+{ echo "$as_me:$LINENO: result: $SYSLOG_FACILITY" >&5
-+echo "${ECHO_T}$SYSLOG_FACILITY" >&6; }
-+
-+
-+for ac_func in getdtablesize
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+ 
-+else
-+  case " $LIB@&t at OBJS " in
-+  *" $ac_func.$ac_objext "* ) ;;
-+  *) LIB@&t at OBJS="$LIB@&t at OBJS $ac_func.$ac_objext"
-+ ;;
-+esac
-+
-+fi
-+done
-+
-+
-+# Check whether --enable-cmulocal was given.
-+if test "${enable_cmulocal+set}" = set; then
-+  enableval=$enable_cmulocal; if test "$enableval" = yes; then
-+		EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
-+		EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
-+	fi
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking to use old sieve service name" >&5
-+echo $ECHO_N "checking to use old sieve service name... $ECHO_C" >&6; }
-+# Check whether --enable-oldsievename was given.
-+if test "${enable_oldsievename+set}" = set; then
-+  enableval=$enable_oldsievename; if test "$enableval" = yes; then
-+		{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+		
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define OLD_SIEVE_SERVICE_NAME 
-+_ACEOF
-+
-+	else
-+		{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+	fi
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+# Check whether --enable-listext was given.
-+if test "${enable_listext+set}" = set; then
-+  enableval=$enable_listext; if test "$enableval" = yes; then
-+		
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define ENABLE_LISTEXT 
-+_ACEOF
-+
-+	fi
-+fi
-+
-+
-+# Check whether --enable-netscapehack was given.
-+if test "${enable_netscapehack+set}" = set; then
-+  enableval=$enable_netscapehack; if test "$enableval" = yes; then
-+		
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define ENABLE_X_NETSCAPE_HACK 
-+_ACEOF
-+
-+	fi
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-+if test "${ac_cv_func_dlopen+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 dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define dlopen innocuous_dlopen
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char dlopen (); 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 dlopen
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+/* 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_dlopen || defined __stub___dlopen
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_dlopen=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_dlopen=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_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-+if test $ac_cv_func_dlopen = yes; then
-+  :
-+else
-+  
-+{ 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
-+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
-+/* 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 dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_dl_dlopen=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	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
-+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
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_LIBDL 1
-+_ACEOF
-+
-+  LIBS="-ldl $LIBS"
-+
-+fi
-+
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for crypt" >&5
-+echo $ECHO_N "checking for crypt... $ECHO_C" >&6; }
-+if test "${ac_cv_func_crypt+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 crypt to an innocuous variant, in case <limits.h> declares crypt.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define crypt innocuous_crypt
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char crypt (); 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 crypt
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char crypt ();
-+/* 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_crypt || defined __stub___crypt
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return crypt ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_crypt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_crypt=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_crypt" >&5
-+echo "${ECHO_T}$ac_cv_func_crypt" >&6; }
-+if test $ac_cv_func_crypt = yes; then
-+  cmu_have_crypt=yes
-+else
-+  { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcrypt  $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 crypt ();
-+int
-+main ()
-+{
-+return crypt ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_crypt_crypt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_crypt_crypt=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_crypt_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
-+if test $ac_cv_lib_crypt_crypt = yes; then
-+  LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
-+else
-+  cmu_have_crypt=no
-+fi
-+
-+fi
-+
-+
-+
-+
-+
-+# Check whether --enable-gssapi was given.
-+if test "${enable_gssapi+set}" = set; then
-+  enableval=$enable_gssapi; gssapi=$enableval
-+else
-+  gssapi=yes
-+fi
-+
-+
-+# Check whether --with-gss_impl was given.
-+if test "${with_gss_impl+set}" = set; then
-+  withval=$with_gss_impl; gss_impl=$withval
-+else
-+  gss_impl=auto
-+fi
-+
-+
-+if test "$gssapi" != no; then
-+  platform=
-+  case "${host}" in
-+    *-*-linux*)
-+      platform=__linux
-+      ;;
-+    *-*-hpux*)
-+      platform=__hpux
-+      ;;
-+    *-*-irix*)
-+      platform=__irix
-+      ;;
-+    *-*-solaris2*)
-+# When should we use __sunos?
-+      platform=__solaris
-+      ;;
-+    *-*-aix*)
-+###_AIX
-+      platform=__aix
-+      ;;
-+    *)
-+      { echo "$as_me:$LINENO: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&5
-+echo "$as_me: WARNING: The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script" >&2;}
-+      if test "$gss_impl" = "cybersafe"; then
-+        { { echo "$as_me:$LINENO: error: CyberSafe was forced, cannot continue as platform is not supported" >&5
-+echo "$as_me: error: CyberSafe was forced, cannot continue as platform is not supported" >&2;}
-+   { (exit 1); exit 1; }; }
-+      fi
-+      ;;
-+  esac
-+
-+  cmu_saved_CPPFLAGS=$CPPFLAGS
-+
-+  if test -d ${gssapi}; then
-+    CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-+# We want to keep -I in our CPPFLAGS, but only if we succeed
-+    cmu_saved_CPPFLAGS=$CPPFLAGS
-+### I am not sure how useful is this (and whether this is required at all
-+### especially when we have to provide two -L flags for new CyberSafe
-+    LDFLAGS="$LDFLAGS -L$gssapi/lib"
-+
-+    if test -n "$platform"; then
-+      if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
-+        CPPFLAGS="$CPPFLAGS -D$platform"
-+        if test -d "${gssapi}/appsec-sdk/include"; then
-+          CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
-+        fi
-+      fi
-+    fi
-+  fi
-+  if test "${ac_cv_header_gssapi_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_gssapi_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking gssapi.h usability" >&5
-+echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <gssapi.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 gssapi.h presence" >&5
-+echo $ECHO_N "checking gssapi.h 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 <gssapi.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: gssapi.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: gssapi.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: gssapi.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: gssapi.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: gssapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_gssapi_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_gssapi_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_gssapi_h = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSSAPI_H 
-+_ACEOF
-+
-+else
-+  if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5
-+echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <gssapi/gssapi.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 gssapi/gssapi.h presence" >&5
-+echo $ECHO_N "checking gssapi/gssapi.h 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 <gssapi/gssapi.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_gssapi_gssapi_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_gssapi_gssapi_h = yes; then
-+  :
-+else
-+  { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no include files found" >&5
-+echo "$as_me: WARNING: Disabling GSSAPI - no include files found" >&2;}; gssapi=no
-+fi
-+
-+
-+fi
-+
-+
-+
-+  CPPFLAGS=$cmu_saved_CPPFLAGS
-+
-+fi
-+
-+if test "$gssapi" != no; then
-+  # We need to find out which gssapi implementation we are
-+  # using. Supported alternatives are: MIT Kerberos 5,
-+  # Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
-+  # CyberSafe Kerberos 5 (http://www.cybersafe.com/)
-+  # and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
-+  #
-+  # The choice is reflected in GSSAPIBASE_LIBS
-+
-+  
-+{ echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-+echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_resolv_res_search+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv  $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 res_search ();
-+int
-+main ()
-+{
-+return res_search ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_resolv_res_search=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_resolv_res_search=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_resolv_res_search" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; }
-+if test $ac_cv_lib_resolv_res_search = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+@%:@define HAVE_LIBRESOLV 1
-+_ACEOF
-+
-+  LIBS="-lresolv $LIBS"
-+
-+fi
-+
-+  if test -d ${gssapi}; then
-+     gssapi_dir="${gssapi}/lib"
-+     GSSAPIBASE_LIBS="-L$gssapi_dir"
-+     GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
-+  else
-+     # FIXME: This is only used for building cyrus, and then only as
-+     # a real hack.  it needs to be fixed.
-+     gssapi_dir="/usr/local/lib"
-+  fi
-+
-+  # Check a full link against the Heimdal libraries.
-+  # If this fails, check a full link against the MIT libraries.
-+  # If this fails, check a full link against the CyberSafe libraries.
-+  # If this fails, check a full link against the Solaris 8 and up libgss.
-+
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
-+    gss_failed=0
-+    { echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi" >&5
-+echo $ECHO_N "checking for gss_unwrap in -lgssapi... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $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 gss_unwrap ();
-+int
-+main ()
-+{
-+return gss_unwrap ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_gssapi_gss_unwrap=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_gssapi_gss_unwrap=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_gssapi_gss_unwrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_gssapi_gss_unwrap" >&6; }
-+if test $ac_cv_lib_gssapi_gss_unwrap = yes; then
-+  gss_impl="heimdal"
-+else
-+  gss_failed=1
-+fi
-+
-+    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
-+      gss_impl="failed"
-+    fi
-+  fi
-+
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
-+    # check for libkrb5support first
-+    { echo "$as_me:$LINENO: checking for krb5int_getspecific in -lkrb5support" >&5
-+echo $ECHO_N "checking for krb5int_getspecific in -lkrb5support... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_krb5support_krb5int_getspecific+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lkrb5support ${LIB_SOCKET} $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 krb5int_getspecific ();
-+int
-+main ()
-+{
-+return krb5int_getspecific ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_krb5support_krb5int_getspecific=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_krb5support_krb5int_getspecific=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_krb5support_krb5int_getspecific" >&5
-+echo "${ECHO_T}$ac_cv_lib_krb5support_krb5int_getspecific" >&6; }
-+if test $ac_cv_lib_krb5support_krb5int_getspecific = yes; then
-+  K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a
-+fi
-+
-+
-+    gss_failed=0
-+    { echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi_krb5" >&5
-+echo $ECHO_N "checking for gss_unwrap in -lgssapi_krb5... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gssapi_krb5_gss_unwrap+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET} $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 gss_unwrap ();
-+int
-+main ()
-+{
-+return gss_unwrap ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_gssapi_krb5_gss_unwrap=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_gssapi_krb5_gss_unwrap=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_gssapi_krb5_gss_unwrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6; }
-+if test $ac_cv_lib_gssapi_krb5_gss_unwrap = yes; then
-+  gss_impl="mit"
-+else
-+  gss_failed=1
-+fi
-+
-+    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
-+      gss_impl="failed"
-+    fi
-+  fi
-+
-+  # For Cybersafe one has to set a platform define in order to make compilation work
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
-+
-+    cmu_saved_CPPFLAGS=$CPPFLAGS
-+    cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
-+# FIXME - Note that the libraries are in .../lib64 for 64bit kernels
-+    if test -d "${gssapi}/appsec-rt/lib"; then
-+      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
-+    fi
-+    CPPFLAGS="$CPPFLAGS -D$platform"
-+    if test -d "${gssapi}/appsec-sdk/include"; then
-+      CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
-+    fi
-+
-+    gss_failed=0
-+
-+# Check for CyberSafe with two libraries first, than fall back to a single 
-+# library (older CyberSafe)
-+
-+    unset ac_cv_lib_gss_csf_gss_acq_user
-+    { echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
-+echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgss ${GSSAPIBASE_LIBS} -lgss -lcstbk5 $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 csf_gss_acq_user ();
-+int
-+main ()
-+{
-+return csf_gss_acq_user ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_gss_csf_gss_acq_user=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_gss_csf_gss_acq_user=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_gss_csf_gss_acq_user" >&5
-+echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
-+if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
-+  gss_impl="cybersafe03"
-+else
-+  unset ac_cv_lib_gss_csf_gss_acq_user;
-+                  { echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
-+echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgss $GSSAPIBASE_LIBS -lgss $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 csf_gss_acq_user ();
-+int
-+main ()
-+{
-+return csf_gss_acq_user ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_gss_csf_gss_acq_user=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_gss_csf_gss_acq_user=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_gss_csf_gss_acq_user" >&5
-+echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
-+if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
-+  gss_impl="cybersafe"
-+else
-+  gss_failed=1
-+fi
-+
-+fi
-+
-+
-+    if test "$gss_failed" = "1"; then
-+# Restore variables
-+      GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
-+      CPPFLAGS=$cmu_saved_CPPFLAGS
-+
-+      if test "$gss_impl" != "auto"; then
-+        gss_impl="failed"
-+      fi
-+    fi
-+  fi
-+
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
-+    gss_failed=0
-+    { echo "$as_me:$LINENO: checking for gss_unwrap in -lgss" >&5
-+echo $ECHO_N "checking for gss_unwrap in -lgss... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lgss -lgss $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 gss_unwrap ();
-+int
-+main ()
-+{
-+return gss_unwrap ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_gss_gss_unwrap=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_gss_gss_unwrap=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_gss_gss_unwrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_gss_gss_unwrap" >&6; }
-+if test $ac_cv_lib_gss_gss_unwrap = yes; then
-+  gss_impl="seam"
-+else
-+  gss_failed=1
-+fi
-+
-+    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
-+      gss_impl="failed"
-+    fi
-+  fi
-+
-+  if test "$gss_impl" = "mit"; then
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
-+    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
-+  elif test "$gss_impl" = "heimdal"; then
-+    CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-+    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-+  elif test "$gss_impl" = "cybersafe03"; then
-+# Version of CyberSafe with two libraries
-+    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
-+    # there is no static libgss for CyberSafe
-+    GSSAPIBASE_STATIC_LIBS=none
-+  elif test "$gss_impl" = "cybersafe"; then
-+    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
-+    # there is no static libgss for CyberSafe
-+    GSSAPIBASE_STATIC_LIBS=none
-+  elif test "$gss_impl" = "seam"; then
-+    GSSAPIBASE_LIBS=-lgss
-+    # there is no static libgss on Solaris 8 and up
-+    GSSAPIBASE_STATIC_LIBS=none
-+  elif test "$gss_impl" = "failed"; then
-+    gssapi="no"
-+    GSSAPIBASE_LIBS=
-+    GSSAPIBASE_STATIC_LIBS=
-+    { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - specified library not found" >&5
-+echo "$as_me: WARNING: Disabling GSSAPI - specified library not found" >&2;}
-+  else
-+    gssapi="no"
-+    GSSAPIBASE_LIBS=
-+    GSSAPIBASE_STATIC_LIBS=
-+    { echo "$as_me:$LINENO: WARNING: Disabling GSSAPI - no library" >&5
-+echo "$as_me: WARNING: Disabling GSSAPI - no library" >&2;}
-+  fi
-+fi
-+
-+#
-+# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME
-+# in gssapi\rfckrb5.h
-+#
-+if test "$gssapi" != "no"; then
-+  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi/gssapi.h>
-+                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
-+                    hostbased_service_gss_nt_yes
-+                  #endif
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "hostbased_service_gss_nt_yes" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
-+_ACEOF
-+
-+else
-+  { echo "$as_me:$LINENO: WARNING: Cybersafe define not found" >&5
-+echo "$as_me: WARNING: Cybersafe define not found" >&2;}
-+fi
-+rm -f conftest*
-+
-+
-+  elif test "$ac_cv_header_gssapi_h" = "yes"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+  elif test "$ac_cv_header_gssapi_gssapi_h"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi/gssapi.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GSS_C_NT_HOSTBASED_SERVICE" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_HOSTBASED_SERVICE 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+  fi
-+
-+  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi/gssapi.h>
-+                  #ifdef GSS_C_NT_USER_NAME
-+                   user_name_yes_gss_nt
-+                  #endif
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "user_name_yes_gss_nt" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_USER_NAME 
-+_ACEOF
-+
-+else
-+  { echo "$as_me:$LINENO: WARNING: Cybersafe define not found" >&5
-+echo "$as_me: WARNING: Cybersafe define not found" >&2;}
-+fi
-+rm -f conftest*
-+
-+  elif test "$ac_cv_header_gssapi_h" = "yes"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_USER_NAME 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+  elif test "$ac_cv_header_gssapi_gssapi_h"; then
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <gssapi/gssapi.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GSS_C_NT_USER_NAME" >/dev/null 2>&1; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GSS_C_NT_USER_NAME 
-+_ACEOF
-+
-+fi
-+rm -f conftest*
-+
-+  fi
-+fi
-+
-+GSSAPI_LIBS=""
-+{ echo "$as_me:$LINENO: checking GSSAPI" >&5
-+echo $ECHO_N "checking GSSAPI... $ECHO_C" >&6; }
-+if test "$gssapi" != no; then
-+  { echo "$as_me:$LINENO: result: with implementation ${gss_impl}" >&5
-+echo "${ECHO_T}with implementation ${gss_impl}" >&6; }
-+  { echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-+echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_resolv_res_search+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv  $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 res_search ();
-+int
-+main ()
-+{
-+return res_search ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_resolv_res_search=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_resolv_res_search=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_resolv_res_search" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; }
-+if test $ac_cv_lib_resolv_res_search = yes; then
-+  GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
-+fi
-+
-+  SASL_MECHS="$SASL_MECHS libgssapiv2.la"
-+  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
-+  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
-+
-+  cmu_save_LIBS="$LIBS"
-+  LIBS="$LIBS $GSSAPIBASE_LIBS"
-+  
-+for ac_func in gsskrb5_register_acceptor_identity
-+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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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
-+  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
-+
-+  LIBS="$cmu_save_LIBS"
-+else
-+  { echo "$as_me:$LINENO: result: disabled" >&5
-+echo "${ECHO_T}disabled" >&6; }
-+fi
-+
-+
-+
-+
-+
-+
-+# Check whether --with-sasl was given.
-+if test "${with_sasl+set}" = set; then
-+  withval=$with_sasl; with_sasl="$withval"
-+else
-+  with_sasl="yes"
-+fi
-+
-+
-+
-+# Check whether --with-staticsasl was given.
-+if test "${with_staticsasl+set}" = set; then
-+  withval=$with_staticsasl; with_staticsasl="$withval";
-+             if test $with_staticsasl != "no"; then
-+               using_static_sasl="static"
-+             fi
-+else
-+  with_staticsasl="no"; using_static_sasl="no"
-+fi
-+
-+
-+SASLFLAGS=""
-+LIB_SASL=""
-+
-+cmu_saved_CPPFLAGS=$CPPFLAGS
-+cmu_saved_LDFLAGS=$LDFLAGS
-+cmu_saved_LIBS=$LIBS
-+
-+if test ${with_staticsasl} != "no"; then
-+  if test -d ${with_staticsasl}; then
-+    if test -d ${with_staticsasl}/lib64 ; then
-+      ac_cv_sasl_where_lib=${with_staticsasl}/lib64
-+    else
-+      ac_cv_sasl_where_lib=${with_staticsasl}/lib
-+    fi
-+    ac_cv_sasl_where_lib=${with_staticsasl}/lib
-+    ac_cv_sasl_where_inc=${with_staticsasl}/include
-+
-+    SASLFLAGS="-I$ac_cv_sasl_where_inc"
-+    LIB_SASL="-L$ac_cv_sasl_where_lib"
-+    CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
-+    LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
-+  else
-+    with_staticsasl="/usr"
-+  fi
-+
-+  if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
-+echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sasl/sasl.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sasl/sasl.h presence" >&5
-+echo $ECHO_N "checking sasl/sasl.h 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 <sasl/sasl.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sasl_sasl_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sasl_sasl_h = yes; then
-+  if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
-+echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sasl/saslutil.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sasl/saslutil.h presence" >&5
-+echo $ECHO_N "checking sasl/saslutil.h 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 <sasl/saslutil.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sasl_saslutil_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sasl_saslutil_h = yes; then
-+  for i42 in lib64 lib; do
-+                                      if test -r ${with_staticsasl}/$i42/libsasl2.a; then
-+                                        ac_cv_found_sasl=yes
-+                                        { echo "$as_me:$LINENO: checking for static libsasl" >&5
-+echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6; }
-+                                        LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
-+                                      fi
-+                                    done
-+                                    if test ! "$ac_cv_found_sasl" = "yes"; then
-+                                      { echo "$as_me:$LINENO: checking for static libsasl" >&5
-+echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6; }
-+                                      { { echo "$as_me:$LINENO: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&5
-+echo "$as_me: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&2;}
-+   { (exit 1); exit 1; }; }
-+                                    fi
-+fi
-+
-+
-+fi
-+
-+
-+
-+  { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-+
-+  if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
-+    LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
-+  else
-+    SASL_GSSAPI_LIBS_SET=""
-+    cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS" 
-+  fi
-+fi
-+
-+if test -d ${with_sasl}; then
-+  ac_cv_sasl_where_lib=${with_sasl}/lib
-+  ac_cv_sasl_where_inc=${with_sasl}/include
-+
-+  DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
-+  if test "$ac_cv_sasl_where_lib" != ""; then
-+    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL}"
-+  else
-+	LIB_DYN_SASL="-L$ac_cv_sasl_where_lib ${LIB_DYN_SASL} $andrew_runpath_switch$ac_cv_sasl_where_lib"
-+  fi
-+
-+  fi
-+  LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
-+  CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
-+  LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
-+fi
-+
-+# be sure to check for a SASLv2 specific function
-+if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
-+echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sasl/sasl.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sasl/sasl.h presence" >&5
-+echo $ECHO_N "checking sasl/sasl.h 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 <sasl/sasl.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sasl/sasl.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sasl/sasl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sasl_sasl_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sasl_sasl_h = yes; then
-+  if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
-+echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <sasl/saslutil.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 sasl/saslutil.h presence" >&5
-+echo $ECHO_N "checking sasl/saslutil.h 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 <sasl/saslutil.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sasl_saslutil_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sasl_saslutil_h = yes; then
-+  { echo "$as_me:$LINENO: checking for prop_get in -lsasl2" >&5
-+echo $ECHO_N "checking for prop_get in -lsasl2... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsasl2  $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 prop_get ();
-+int
-+main ()
-+{
-+return prop_get ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_sasl2_prop_get=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_sasl2_prop_get=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_sasl2_prop_get" >&5
-+echo "${ECHO_T}$ac_cv_lib_sasl2_prop_get" >&6; }
-+if test $ac_cv_lib_sasl2_prop_get = yes; then
-+  ac_cv_found_sasl=yes
-+else
-+  ac_cv_found_sasl=no
-+fi
-+
-+else
-+  ac_cv_found_sasl=no
-+fi
-+
-+
-+else
-+  ac_cv_found_sasl=no
-+fi
-+
-+
-+
-+if test "$ac_cv_found_sasl" = "yes"; then
-+  if test "$ac_cv_sasl_where_lib" != ""; then
-+    
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL}"
-+  else
-+	DYNLIB_SASL="-L$ac_cv_sasl_where_lib ${DYNLIB_SASL} $andrew_runpath_switch$ac_cv_sasl_where_lib"
-+  fi
-+
-+  fi
-+  DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
-+  if test "$using_static_sasl" != "static"; then
-+    LIB_SASL=$DYNLIB_SASL
-+    SASLFLAGS=$DYNSASLFLAGS
-+  fi
-+else
-+  DYNLIB_SASL=""
-+  DYNSASLFLAGS=""
-+  using_static_sasl="staticonly"
-+fi
-+
-+if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
-+  SASL_GSSAPI_LIBS_SET=""
-+  cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS" 
-+fi
-+
-+LIBS="$cmu_saved_LIBS"
-+LDFLAGS="$cmu_saved_LDFLAGS"
-+CPPFLAGS="$cmu_saved_CPPFLAGS"
-+
-+
-+
-+
-+
-+
-+
-+if test "$ac_cv_found_sasl" != "yes"; then
-+  { { echo "$as_me:$LINENO: error: Cannot continue without libsasl2.
-+Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." >&5
-+echo "$as_me: error: Cannot continue without libsasl2.
-+Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+cmu_saved_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$CPPFLAGS $SASLFLAGS"
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <sasl/sasl.h>
-+
-+#ifndef SASL_VERSION_MAJOR
-+#error SASL_VERSION_MAJOR not defined
-+#endif
-+#ifndef SASL_VERSION_MINOR
-+#error SASL_VERSION_MINOR not defined
-+#endif
-+#ifndef SASL_VERSION_STEP
-+#error SASL_VERSION_STEP not defined
-+#endif
-+
-+#if SASL_VERSION_MAJOR < 2 || SASL_VERSION_MINOR < 1 || SASL_VERSION_STEP < 7
-+#error SASL version is less than 2.1.7
-+#endif
-+
-+_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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  { { echo "$as_me:$LINENO: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&5
-+echo "$as_me: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+
-+CPPFLAGS=$cmu_saved_CPPFLAGS
-+
-+
-+
-+cmu_saved_LDFLAGS=$LDFLAGS
-+
-+LDFLAGS="$LDFLAGS $LIB_SASL"
-+
-+{ echo "$as_me:$LINENO: checking for sasl_checkapop in -lsasl2" >&5
-+echo $ECHO_N "checking for sasl_checkapop in -lsasl2... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsasl2  $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 sasl_checkapop ();
-+int
-+main ()
-+{
-+return sasl_checkapop ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_sasl2_sasl_checkapop=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_sasl2_sasl_checkapop=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_sasl2_sasl_checkapop" >&5
-+echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_checkapop" >&6; }
-+if test $ac_cv_lib_sasl2_sasl_checkapop = yes; then
-+  
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_APOP 
-+_ACEOF
-+
-+else
-+  { { echo "$as_me:$LINENO: error: libsasl2 without working sasl_checkapop.  Cannot continue." >&5
-+echo "$as_me: error: libsasl2 without working sasl_checkapop.  Cannot continue." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+
-+LDFLAGS=$cmu_saved_LDFLAGS
-+
-+
-+
-+# Check whether --with-perl was given.
-+if test "${with_perl+set}" = set; then
-+  withval=$with_perl; with_perl="$withval"
-+else
-+  with_perl="perl"
-+fi
-+
-+
-+if test "${with_perl}" = yes; then
-+    with_perl="perl"
-+fi
-+if test "${with_perl}" != no; then
-+    if test ${using_static_sasl} = "staticonly"; then
-+	{ echo "$as_me:$LINENO: WARNING: Cannot compile perl utilities using static libsasl" >&5
-+echo "$as_me: WARNING: Cannot compile perl utilities using static libsasl" >&2;}
-+	with_perl="no"
-+    else 
-+	for ac_prog in ${with_perl} perl
-+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_PERL+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$PERL"; then
-+  ac_cv_prog_PERL="$PERL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_PERL="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+PERL=$ac_cv_prog_PERL
-+if test -n "$PERL"; then
-+  { echo "$as_me:$LINENO: result: $PERL" >&5
-+echo "${ECHO_T}$PERL" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  test -n "$PERL" && break
-+done
-+test -n "$PERL" || PERL="with_perl=notfound"
-+
-+    fi
-+fi
-+if test "$with_perl" = "notfound"; then
-+    { echo "$as_me:$LINENO: WARNING: Perl not found: Administrative tools won't be available" >&5
-+echo "$as_me: WARNING: Perl not found: Administrative tools won't be available" >&2;}
-+elif test "${with_perl}" != "no"; then
-+    EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
-+    PERL_SUBDIRS="imap"
-+    PERL="${with_perl}"
-+    PERL_CCCDLFLAGS="$cccdlflags"
-+    
-+fi
-+
-+if test "$sievedir" != "no"; then
-+	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} timsieved notifyd"
-+	EXTRA_OUTPUT="${EXTRA_OUTPUT} timsieved/Makefile notifyd/Makefile"
-+
-+	PERL_SUBDIRS="${PERL_SUBDIRS} sieve"
-+	PERL_DEPSUBDIRS="sieve"
-+	EXTRA_OUTPUT="${EXTRA_OUTPUT} perl/sieve/Makefile perl/sieve/lib/Makefile"
-+else
-+	PERL_DEPSUBDIRS="none"
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for MD5Init" >&5
-+echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6; }
-+if test "${ac_cv_func_MD5Init+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 MD5Init to an innocuous variant, in case <limits.h> declares MD5Init.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define MD5Init innocuous_MD5Init
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char MD5Init (); 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 MD5Init
-+
-+/* 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 MD5Init ();
-+/* 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_MD5Init || defined __stub___MD5Init
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return MD5Init ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_MD5Init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_MD5Init=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_MD5Init" >&5
-+echo "${ECHO_T}$ac_cv_func_MD5Init" >&6; }
-+if test $ac_cv_func_MD5Init = yes; then
-+  :
-+else
-+  { echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5
-+echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_md_MD5Init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmd  $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 MD5Init ();
-+int
-+main ()
-+{
-+return MD5Init ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_md_MD5Init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_md_MD5Init=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_md_MD5Init" >&5
-+echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6; }
-+if test $ac_cv_lib_md_MD5Init = yes; then
-+  LIBS="${LIBS} -lmd"
-+else
-+  MD5OBJ="md5.o"
-+fi
-+
-+fi
-+
-+
-+
-+SNMP_SUBDIRS=""
-+
-+
-+
-+# Check whether --with-lib-subdir was given.
-+if test "${with_lib_subdir+set}" = set; then
-+  withval=$with_lib_subdir; 
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-+if test "${ac_cv_type_long+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 long 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_type_long=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_type_long=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_lo=0 ac_mid=0
-+  while :; do
-+    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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+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
-+	        typedef long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=-1 ac_mid=-1
-+  while :; do
-+    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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo= ac_hi=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  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 long ac__type_sizeof_;
-+
-+int
-+main ()
-+{
-+static int test_array @<:@1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)@:>@;
-+test_array @<:@0@:>@ = 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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long=$ac_lo;;
-+'') if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi ;;
-+esac
-+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 long ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+@%:@include <stdio.h>
-+@%:@include <stdlib.h>
-+int
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
-+  return ferror (f) || fclose (f) != 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_sizeof_long=`cat conftest.val`
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.val
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+@%:@define SIZEOF_LONG $ac_cv_sizeof_long
-+_ACEOF
-+
-+
-+{ echo "$as_me:$LINENO: checking what directory libraries are found in" >&5
-+echo $ECHO_N "checking what directory libraries are found in... $ECHO_C" >&6; }
-+if test "${ac_cv_cmu_lib_subdir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
-+test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
-+if test "X$with_lib_subdir" = "X" ; then
-+  ac_cv_cmu_lib_subdir=lib
-+  if test $ac_cv_sizeof_long -eq 4 ; then
-+    test -d /usr/lib32 && ac_cv_cmu_lib_subdir=lib32
-+  fi
-+  if test $ac_cv_sizeof_long -eq 8 ; then
-+    test -d /usr/lib64 && ac_cv_cmu_lib_subdir=lib64
-+  fi
-+else
-+  ac_cv_cmu_lib_subdir=$with_lib_subdir
-+fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_cmu_lib_subdir" >&5
-+echo "${ECHO_T}$ac_cv_cmu_lib_subdir" >&6; }
-+CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
-+
-+
-+
-+
-+  
-+  
-+# Check whether --with-libwrap was given.
-+if test "${with_libwrap+set}" = set; then
-+  withval=$with_libwrap; with_libwrap=$withval
-+else
-+  with_libwrap=yes
-+fi
-+
-+  if test "$with_libwrap" != no; then
-+    if test -d "$with_libwrap"; then
-+      CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
-+      LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
-+    fi
-+    cmu_save_LIBS="$LIBS"
-+    { echo "$as_me:$LINENO: checking for request_init in -lwrap" >&5
-+echo $ECHO_N "checking for request_init in -lwrap... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_wrap_request_init+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lwrap ${LIB_SOCKET} $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 request_init ();
-+int
-+main ()
-+{
-+return request_init ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_wrap_request_init=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_wrap_request_init=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_wrap_request_init" >&5
-+echo "${ECHO_T}$ac_cv_lib_wrap_request_init" >&6; }
-+if test $ac_cv_lib_wrap_request_init = yes; then
-+  
-+		 if test "${ac_cv_header_tcpd_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for tcpd.h" >&5
-+echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_tcpd_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
-+echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking tcpd.h usability" >&5
-+echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <tcpd.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 tcpd.h presence" >&5
-+echo $ECHO_N "checking tcpd.h 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 <tcpd.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: tcpd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: tcpd.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: tcpd.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: tcpd.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: tcpd.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: tcpd.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tcpd.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: tcpd.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for tcpd.h" >&5
-+echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_tcpd_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_tcpd_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
-+echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_tcpd_h = yes; then
-+  :
-+else
-+  with_libwrap=no
-+fi
-+
-+
-+else
-+  with_libwrap=no
-+fi
-+
-+    LIBS="$cmu_save_LIBS"
-+  fi
-+  { echo "$as_me:$LINENO: checking libwrap support" >&5
-+echo $ECHO_N "checking libwrap support... $ECHO_C" >&6; }
-+  { echo "$as_me:$LINENO: result: $with_libwrap" >&5
-+echo "${ECHO_T}$with_libwrap" >&6; }
-+  LIB_WRAP=""
-+  if test "$with_libwrap" != no; then
-+    
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_LIBWRAP 
-+_ACEOF
-+
-+    LIB_WRAP="-lwrap"
-+    { echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
-+echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $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 yp_get_default_domain ();
-+int
-+main ()
-+{
-+return yp_get_default_domain ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_nsl_yp_get_default_domain=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_nsl_yp_get_default_domain=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_nsl_yp_get_default_domain" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
-+if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
-+  LIB_WRAP="${LIB_WRAP} -lnsl"
-+fi
-+
-+  fi
-+  
-+
-+
-+
-+  
-+  
-+# Check whether --with-snmp was given.
-+if test "${with_snmp+set}" = set; then
-+  withval=$with_snmp; with_snmp=$withval
-+else
-+  with_snmp=yes
-+fi
-+
-+
-+        
-+# Check whether --with-ucdsnmp was given.
-+if test "${with_ucdsnmp+set}" = set; then
-+  withval=$with_ucdsnmp; with_snmp=$withval
-+fi
-+
-+
-+if test "$with_snmp" != "no"; then
-+
-+        if test "$with_snmp" = "yes"; then
-+    # Extract the first word of "net-snmp-config", so it can be a program name with args.
-+set dummy net-snmp-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_path_SNMP_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $SNMP_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_dummy="/usr/local/bin:$PATH"
-+for as_dir in $as_dummy
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
-+if test -n "$SNMP_CONFIG"; then
-+  { echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5
-+echo "${ECHO_T}$SNMP_CONFIG" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+  else
-+    SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
-+  fi
-+
-+  if test -x "$SNMP_CONFIG"; then
-+    { echo "$as_me:$LINENO: checking NET SNMP libraries" >&5
-+echo $ECHO_N "checking NET SNMP libraries... $ECHO_C" >&6; }
-+
-+    SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
-+    SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-+
-+    if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
-+      CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
-+      LIB_UCDSNMP=$SNMP_LIBS
-+      
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_NETSNMP 1
-+_ACEOF
-+
-+      
-+      { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+    else
-+      { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+      { echo "$as_me:$LINENO: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
-+echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
-+    fi
-+  else
-+                if test "$with_snmp" != no; then
-+      if test -d "$with_snmp"; then
-+        CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
-+        LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
-+      fi
-+      cmu_save_LIBS="$LIBS"
-+      { echo "$as_me:$LINENO: checking for sprint_objid in -lsnmp" >&5
-+echo $ECHO_N "checking for sprint_objid in -lsnmp... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsnmp ${LIB_SOCKET} $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 sprint_objid ();
-+int
-+main ()
-+{
-+return sprint_objid ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_snmp_sprint_objid=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_snmp_sprint_objid=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_snmp_sprint_objid" >&5
-+echo "${ECHO_T}$ac_cv_lib_snmp_sprint_objid" >&6; }
-+if test $ac_cv_lib_snmp_sprint_objid = yes; then
-+  
-+  		 if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
-+echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking ucd-snmp/version.h usability" >&5
-+echo $ECHO_N "checking ucd-snmp/version.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+@%:@include <ucd-snmp/version.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_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_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 ucd-snmp/version.h presence" >&5
-+echo $ECHO_N "checking ucd-snmp/version.h 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 <ucd-snmp/version.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; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  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: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&2;}
-+    
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
-+echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_ucd_snmp_version_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_ucd_snmp_version_h = yes; then
-+  :
-+else
-+  with_snmp=no
-+fi
-+
-+
-+else
-+  with_snmp=no
-+fi
-+
-+      LIBS="$cmu_save_LIBS"
-+    fi
-+    { echo "$as_me:$LINENO: checking UCD SNMP libraries" >&5
-+echo $ECHO_N "checking UCD SNMP libraries... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: result: $with_snmp" >&5
-+echo "${ECHO_T}$with_snmp" >&6; }
-+    LIB_UCDSNMP=""
-+    if test "$with_snmp" != no; then
-+      
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_UCDSNMP 1
-+_ACEOF
-+
-+      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+      { echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
-+echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrpm -lpopt $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 rpmdbOpen ();
-+int
-+main ()
-+{
-+return rpmdbOpen ();
-+  ;
-+  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); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
-+	 { ac_try='test -s 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_lib_rpm_rpmdbOpen=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_rpm_rpmdbOpen=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_rpm_rpmdbOpen" >&5
-+echo "${ECHO_T}$ac_cv_lib_rpm_rpmdbOpen" >&6; }
-+if test $ac_cv_lib_rpm_rpmdbOpen = yes; then
-+  LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
-+fi
-+
-+    fi
-+    
-+  fi
-+fi
-+
-+
-+
-+# Figure out what directories we're linking against.
-+# Lots of fun for the whole family.
-+# This probably chokes on anything with spaces in it.
-+# All we want is the list of -L directories, and -L may or may not be
-+# followed by a space.
-+isdir=no
-+libpath=""
-+#echo "debug ldflags: << ${ldflags} >>"
-+#echo "debug default_ldflags: << ${default_ldflags} >>"
-+for flag in ${ldflags} ${default_ldflags}; do
-+  case $flag in
-+    -L)
-+      # it's a split -L option, we'll mark the next option as a dir.
-+      isdir=yes
-+      ;;
-+
-+    -L*) 
-+      # attached -L option: split off the directory
-+      larg=`echo $flag | sed -e 's:-L\(..*\):\1:'`
-+      libpath="${libpath} ${larg}"
-+      ;;
-+
-+    *)
-+      if test $isdir = yes ; then
-+	libpath="${libpath} ${flag}"
-+	isdir=no
-+      fi
-+  esac
-+done
-+
-+IMAP_COM_ERR_LIBS="${COM_ERR_LIBS}"
-+IMAP_LIBS="${LIB_SASL} ${LIBS}"
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
-+
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes (double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
-+fi
-+rm -f confcache
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIB@&t at OBJS; 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"`
-+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-+  #    will be set to the directory where LIBOBJS objects are built.
-+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+done
-+LIB@&t at OBJS=$ac_libobjs
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+
-+: ${CONFIG_STATUS=./config.status}
-+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
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
-+
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+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
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_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'`
-+
-+# 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
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+  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'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p=:
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
-+fi
-+
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
-+else
-+  as_executable_p=:
-+fi
-+rm -f conf$$.file
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+exec 6>&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.60a.  Invocation command line was
-+
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
-+
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
-+
-+Usage: $0 [OPTIONS] [FILE]...
-+
-+  -h, --help       print this help, then exit
-+  -V, --version    print version number and configuration settings, then exit
-+  -q, --quiet      do not print progress messages
-+  -d, --debug      don't remove temporary files
-+      --recheck    update $as_me by reconfiguring in the same conditions
-+  --file=FILE[:TEMPLATE]
-+		   instantiate the configuration file FILE
-+  --header=FILE[:TEMPLATE]
-+		   instantiate the configuration header FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration headers:
-+$config_headers
-+
-+Report bugs to <bug-autoconf at gnu.org>."
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ac_cs_version="\\
-+config.status
-+configured by $0, generated by GNU Autoconf 2.60a,
-+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright (C) 2006 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+_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.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+    ac_shift=:
-+    ;;
-+  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  esac
-+
-+  case $ac_option in
-+  # Handling of the options.
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    echo "$ac_cs_version"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-+    debug=: ;;
-+  --file | --fil | --fi | --f )
-+    $ac_shift
-+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+    ac_need_defaults=false;;
-+  --header | --heade | --head | --hea )
-+    $ac_shift
-+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+    ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; };;
-+  --help | --hel | -h )
-+    echo "$ac_cs_usage"; exit ;;
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
-+
-+  # This is an error.
-+  -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; } ;;
-+
-+  *) ac_config_targets="$ac_config_targets $1"
-+     ac_need_defaults=false ;;
-+
-+  esac
-+  shift
-+done
-+
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+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
-+  export CONFIG_SHELL
-+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
-+@%:@@%:@ Running $as_me. @%:@@%:@
-+_ASBOX
-+  echo "$ac_log"
-+} >&5
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
-+  case $ac_config_target in
-+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-+    "master/Makefile") CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
-+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-+    "imap/Makefile") CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
-+    "imtest/Makefile") CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
-+    "netnews/Makefile") CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
-+    "perl/Makefile") CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
-+    "$EXTRA_OUTPUT") CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+
-+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+   { (exit 1); exit 1; }; };;
-+  esac
-+done
-+
-+
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used.  Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+fi
-+
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason against having it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
-+$debug ||
-+{
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-+  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+# Create a (secure) tmp directory for tmp files.
-+
-+{
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  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.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+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
-+WARNERROR!$WARNERROR$ac_delim
-+MAKEDEPEND!$MAKEDEPEND$ac_delim
-+cyrus_prefix!$cyrus_prefix$ac_delim
-+service_path!$service_path$ac_delim
-+cyrus_user!$cyrus_user$ac_delim
-+cyrus_group!$cyrus_group$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
-+RANLIB!$RANLIB$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
-+CPP!$CPP$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+AWK!$AWK$ac_delim
-+LIB@&t at OBJS!$LIB@&t at OBJS$ac_delim
-+LIB_SOCKET!$LIB_SOCKET$ac_delim
-+IPV6_OBJS!$IPV6_OBJS$ac_delim
-+PRE_SUBDIRS!$PRE_SUBDIRS$ac_delim
-+EXTRA_SUBDIRS!$EXTRA_SUBDIRS$ac_delim
-+DEPLIBS!$DEPLIBS$ac_delim
-+LOCALDEFS!$LOCALDEFS$ac_delim
-+BDB_INC!$BDB_INC$ac_delim
-+BDB_LIB!$BDB_LIB$ac_delim
-+CYRUSDB_OBJS!$CYRUSDB_OBJS$ac_delim
-+SIEVE_OBJS!$SIEVE_OBJS$ac_delim
-+SIEVE_LIBS!$SIEVE_LIBS$ac_delim
-+SIEVE_CPPFLAGS!$SIEVE_CPPFLAGS$ac_delim
-+YACC!$YACC$ac_delim
-+YFLAGS!$YFLAGS$ac_delim
-+LEX!$LEX$ac_delim
-+LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
-+LEXLIB!$LEXLIB$ac_delim
-+SIEVE_SUBDIRS!$SIEVE_SUBDIRS$ac_delim
-+WITH_NONBLOCK!$WITH_NONBLOCK$ac_delim
-+WITH_GMTOFF!$WITH_GMTOFF$ac_delim
-+WITH_MAP!$WITH_MAP$ac_delim
-+WITH_LOCK!$WITH_LOCK$ac_delim
-+cyrus_sigveclib!$cyrus_sigveclib$ac_delim
-+AFS_LIBS!$AFS_LIBS$ac_delim
-+AFS_LDFLAGS!$AFS_LDFLAGS$ac_delim
-+LDAP_CPPFLAGS!$LDAP_CPPFLAGS$ac_delim
-+LDAP_LDFLAGS!$LDAP_LDFLAGS$ac_delim
-+LDAP_LIBS!$LDAP_LIBS$ac_delim
-+SERVER_SUBDIRS!$SERVER_SUBDIRS$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+OPENSSL_INC!$OPENSSL_INC$ac_delim
-+OPENSSL_LIB!$OPENSSL_LIB$ac_delim
-+ZEPHYR_LIBS!$ZEPHYR_LIBS$ac_delim
-+ZEPHYR_CPPFLAGS!$ZEPHYR_CPPFLAGS$ac_delim
-+WITH_IDLE!$WITH_IDLE$ac_delim
-+IMAP_PROGS!$IMAP_PROGS$ac_delim
-+COMPILE_ET!$COMPILE_ET$ac_delim
-+COM_ERR_LIBS!$COM_ERR_LIBS$ac_delim
-+COM_ERR_LDFLAGS!$COM_ERR_LDFLAGS$ac_delim
-+COM_ERR_CPPFLAGS!$COM_ERR_CPPFLAGS$ac_delim
-+LIB_CRYPT!$LIB_CRYPT$ac_delim
-+GSSAPI_LIBS!$GSSAPI_LIBS$ac_delim
-+GSSAPIBASE_LIBS!$GSSAPIBASE_LIBS$ac_delim
-+LIB_DYN_SASL!$LIB_DYN_SASL$ac_delim
-+DYNSASLFLAGS!$DYNSASLFLAGS$ac_delim
-+LIB_SASL!$LIB_SASL$ac_delim
-+SASLFLAGS!$SASLFLAGS$ac_delim
-+PERL!$PERL$ac_delim
-+PERL_CCCDLFLAGS!$PERL_CCCDLFLAGS$ac_delim
-+MD5OBJ!$MD5OBJ$ac_delim
-+SNMP_SUBDIRS!$SNMP_SUBDIRS$ac_delim
-+CMU_LIB_SUBDIR!$CMU_LIB_SUBDIR$ac_delim
-+LIB_WRAP!$LIB_WRAP$ac_delim
-+SNMP_CONFIG!$SNMP_CONFIG$ac_delim
-+LIB_UCDSNMP!$LIB_UCDSNMP$ac_delim
-+LIB_RT!$LIB_RT$ac_delim
-+IMAP_COM_ERR_LIBS!$IMAP_COM_ERR_LIBS$ac_delim
-+IMAP_LIBS!$IMAP_LIBS$ac_delim
-+PERL_SUBDIRS!$PERL_SUBDIRS$ac_delim
-+PERL_DEPSUBDIRS!$PERL_DEPSUBDIRS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+   { (exit 1); exit 1; }; };;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+   { (exit 1); exit 1; }; };;
-+      esac
-+      ac_file_inputs="$ac_file_inputs $ac_f"
-+    done
-+
-+    # Let's still pretend it is `configure' which instantiates (i.e., don't
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input="Generated from "`IFS=:
-+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
-+      { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    fi
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin";;
-+    esac
-+    ;;
-+  esac
-+
-+  ac_dir=`$as_dirname -- "$ac_file" ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+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" |
-+    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" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+   { (exit 1); exit 1; }; }; }
-+  ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+  esac
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+
-+case `sed -n '/datarootdir/ {
-+  p
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+    s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  sed "$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+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
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
-+
-+  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
-+ ;;
-+  :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;}
-+    else
-+      rm -f $ac_file
-+      mv "$tmp/config.h" $ac_file
-+    fi
-+  else
-+    echo "/* $configure_input  */"
-+    cat "$ac_result"
-+  fi
-+  rm -f "$tmp/out12"
-+ ;;
-+  
-+  
-+  esac
-+
-+done # for ac_tag
-+
-+
-+{ (exit 0); exit 0; }
-+_ACEOF
-+chmod +x $CONFIG_STATUS
-+ac_clean_files=$ac_clean_files_save
-+
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded.  So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status.  When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+  ac_cs_success=:
-+  ac_config_status_args=
-+  test "$silent" = yes &&
-+    ac_config_status_args="$ac_config_status_args --quiet"
-+  exec 5>/dev/null
-+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+  exec 5>>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; }
-+fi
-+
-diff -urNad cyrus-imapd-2.2.13~/autom4te.cache/requests cyrus-imapd-2.2.13/autom4te.cache/requests
---- cyrus-imapd-2.2.13~/autom4te.cache/requests	1970-01-01 00:00:00.000000000 +0000
-+++ cyrus-imapd-2.2.13/autom4te.cache/requests	2006-10-10 13:08:28.000000000 +0000
-@@ -0,0 +1,319 @@
-+# This file was generated by Autom4te Sun Sep  3 21:07:26 PDT 2006.
-+# It contains the lists of macros which have been traced.
-+# It can be safely removed.
-+
-+ at request = (
-+             bless( [
-+                      '0',
-+                      1,
-+                      [
-+                        '/usr/share/autoconf'
-+                      ],
-+                      [
-+                        '/usr/share/autoconf/autoconf/autoconf.m4f',
-+                        'cmulocal/afs.m4',
-+                        'cmulocal/berkdb.m4',
-+                        'cmulocal/bsd_sockets.m4',
-+                        'cmulocal/c-attribute.m4',
-+                        'cmulocal/c-fpic.m4',
-+                        'cmulocal/common.m4',
-+                        'cmulocal/cyrus.m4',
-+                        'cmulocal/ipv6.m4',
-+                        'cmulocal/kerberos_v4.m4',
-+                        'cmulocal/libssl.m4',
-+                        'cmulocal/libwrap.m4',
-+                        'cmulocal/sasl2.m4',
-+                        'cmulocal/ucdsnmp.m4',
-+                        'configure.in'
-+                      ],
-+                      {
-+                        'CMU_USE_DB' => 1,
-+                        'AC_TYPE_OFF_T' => 1,
-+                        'AC_C_VOLATILE' => 1,
-+                        'AC_FUNC_CLOSEDIR_VOID' => 1,
-+                        'CMU_DB_LIB_WHERE' => 1,
-+                        'AC_REPLACE_FNMATCH' => 1,
-+                        'AC_DEFUN' => 1,
-+                        'AC_PROG_LIBTOOL' => 1,
-+                        'AC_FUNC_STAT' => 1,
-+                        'AC_FUNC_WAIT3' => 1,
-+                        'AM_AUTOMAKE_VERSION' => 1,
-+                        'AC_STRUCT_TM' => 1,
-+                        'AC_FUNC_LSTAT' => 1,
-+                        'AC_FUNC_STRTOD' => 1,
-+                        'AC_CHECK_HEADERS' => 1,
-+                        'CMU_LIBSSL_LIB_WHERE1' => 1,
-+                        'AC_FUNC_STRNLEN' => 1,
-+                        'AC_PROG_CXX' => 1,
-+                        'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
-+                        'CMU_KRB4_32_DEFN' => 1,
-+                        'AC_PROG_AWK' => 1,
-+                        '_m4_warn' => 1,
-+                        'CMU_LIBSSL_LIB_WHERE' => 1,
-+                        'AC_HEADER_MAJOR' => 1,
-+                        'CYRUS_BERKELEY_DB_CHK_LIB' => 1,
-+                        'CMU_SASL2_REQUIRE_VER' => 1,
-+                        'CMU_KRB_INC_WHERE' => 1,
-+                        'AC_PROG_GCC_TRADITIONAL' => 1,
-+                        'IPv6_CHECK_FUNC' => 1,
-+                        'AC_LIBSOURCE' => 1,
-+                        'AC_STRUCT_ST_BLOCKS' => 1,
-+                        'AM_PROG_FC_C_O' => 1,
-+                        '_AM_SUBST_NOTMAKE' => 1,
-+                        'AC_CONFIG_AUX_DIR' => 1,
-+                        'AC_PROG_MAKE_SET' => 1,
-+                        'sinclude' => 1,
-+                        'AC_FUNC_STRERROR_R' => 1,
-+                        'CMU_GUESS_RUNPATH_SWITCH' => 1,
-+                        'AC_FUNC_FORK' => 1,
-+                        'AC_DECL_SYS_SIGLIST' => 1,
-+                        'CMU_KRB_INC_WHERE1' => 1,
-+                        'AC_FUNC_VPRINTF' => 1,
-+                        'AU_DEFUN' => 1,
-+                        'CYRUS_BERKELEY_DB_OPTS' => 1,
-+                        'IPv6_CHECK_SOCKLEN_T' => 1,
-+                        'AC_INIT' => 1,
-+                        'AC_STRUCT_TIMEZONE' => 1,
-+                        'CMU_AFS' => 1,
-+                        'AC_SUBST' => 1,
-+                        'AC_FUNC_ALLOCA' => 1,
-+                        'IPv6_CHECK_SA_LEN' => 1,
-+                        'CMU_LIBSSL' => 1,
-+                        'AC_CANONICAL_HOST' => 1,
-+                        'AC_PROG_RANLIB' => 1,
-+                        'CMU_UCDSNMP' => 1,
-+                        'AC_FUNC_SETPGRP' => 1,
-+                        'AC_CONFIG_SUBDIRS' => 1,
-+                        'AC_FUNC_MMAP' => 1,
-+                        'AC_TYPE_SIZE_T' => 1,
-+                        'IPv6_CHECK_SS_FAMILY' => 1,
-+                        'AC_CHECK_TYPES' => 1,
-+                        'LT_SUPPORTED_TAG' => 1,
-+                        'AC_CHECK_MEMBERS' => 1,
-+                        'AC_DEFUN_ONCE' => 1,
-+                        'AC_FUNC_UTIME_NULL' => 1,
-+                        'AC_FUNC_SELECT_ARGTYPES' => 1,
-+                        'CMU_AFS_WHERE' => 1,
-+                        'AC_HEADER_STAT' => 1,
-+                        'AC_FUNC_STRFTIME' => 1,
-+                        'CMU_LIBSSL_INC_WHERE1' => 1,
-+                        'AC_C_INLINE' => 1,
-+                        'CMU_C___ATTRIBUTE__' => 1,
-+                        'AC_CONFIG_FILES' => 1,
-+                        'include' => 1,
-+                        'AM_GNU_GETTEXT' => 1,
-+                        'AC_FUNC_OBSTACK' => 1,
-+                        'CMU_KRB_LIB_WHERE1' => 1,
-+                        'AC_CHECK_LIB' => 1,
-+                        'AC_FUNC_MALLOC' => 1,
-+                        'CMU_TEST_INCPATH' => 1,
-+                        'AC_FUNC_GETGROUPS' => 1,
-+                        'CMU_ADD_LIBPATH' => 1,
-+                        'AC_FC_FREEFORM' => 1,
-+                        'AC_FUNC_GETLOADAVG' => 1,
-+                        'AC_FUNC_FSEEKO' => 1,
-+                        'AM_PROG_CC_C_O' => 1,
-+                        'CMU_CHECK_HEADER_NOCACHE' => 1,
-+                        'SASL_GSSAPI_CHK' => 1,
-+                        'AM_CONDITIONAL' => 1,
-+                        'AC_FUNC_MKTIME' => 1,
-+                        'CYRUS_BERKELEY_DB_CHK' => 1,
-+                        'AC_HEADER_SYS_WAIT' => 1,
-+                        'AC_PROG_LN_S' => 1,
-+                        'AC_FUNC_MEMCMP' => 1,
-+                        'm4_include' => 1,
-+                        'AC_HEADER_DIRENT' => 1,
-+                        '_LT_AC_TAGCONFIG' => 1,
-+                        'AM_PROG_F77_C_O' => 1,
-+                        'CMU_KRB_RD_REQ_PROTO' => 1,
-+                        'm4_pattern_forbid' => 1,
-+                        'AC_CANONICAL_TARGET' => 1,
-+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-+                        'CMU_FIND_LIB_SUBDIR' => 1,
-+                        'AC_HEADER_TIME' => 1,
-+                        'CMU_SOCKETS' => 1,
-+                        'AC_FUNC_GETMNTENT' => 1,
-+                        'AC_TYPE_MODE_T' => 1,
-+                        'LT_CONFIG_LTDL_DIR' => 1,
-+                        'm4_sinclude' => 1,
-+                        'CMU_ADD_LIBPATH_TO' => 1,
-+                        'AC_PATH_X' => 1,
-+                        'CMU_DB3_LIB_WHERE1' => 1,
-+                        'CMU_AFS_LIB_WHERE1' => 1,
-+                        'CMU_SASL2_REQUIRED' => 1,
-+                        'AC_HEADER_STDC' => 1,
-+                        'AM_PROG_CXX_C_O' => 1,
-+                        'CMU_TEST_LIBPATH' => 1,
-+                        'LT_INIT' => 1,
-+                        'CMU_AFS_INC_WHERE1' => 1,
-+                        'AC_FUNC_ERROR_AT_LINE' => 1,
-+                        'CMU_LIBSSL_INC_WHERE' => 1,
-+                        'AC_FUNC_MBRTOWC' => 1,
-+                        'AC_CANONICAL_BUILD' => 1,
-+                        'AC_TYPE_SIGNAL' => 1,
-+                        'SASL2_CRYPT_CHK' => 1,
-+                        'AC_TYPE_UID_T' => 1,
-+                        'm4_pattern_allow' => 1,
-+                        'AC_DEFINE_TRACE_LITERAL' => 1,
-+                        'CMU_KRB_SET_KEY_PROTO' => 1,
-+                        'AC_PROG_CC' => 1,
-+                        'AC_FUNC_STRCOLL' => 1,
-+                        'AC_PROG_YACC' => 1,
-+                        'AC_SUBST_TRACE' => 1,
-+                        'AC_FUNC_CHOWN' => 1,
-+                        'AC_FC_SRCEXT' => 1,
-+                        'AC_FUNC_GETPGRP' => 1,
-+                        'CMU_DB_INC_WHERE' => 1,
-+                        'AM_INIT_AUTOMAKE' => 1,
-+                        'CMU_DB4_LIB_WHERE1' => 1,
-+                        'SASL_SET_GSSAPI_LIBS' => 1,
-+                        'AC_FUNC_REALLOC' => 1,
-+                        'AC_REQUIRE_AUX_FILE' => 1,
-+                        'AC_CONFIG_LINKS' => 1,
-+                        'CMU_KRB_LIB_WHERE' => 1,
-+                        'CMU_KRB_SENDAUTH_PROTO' => 1,
-+                        'AM_MAINTAINER_MODE' => 1,
-+                        'CMU_SASL2' => 1,
-+                        'CMU_DB_INC_WHERE1' => 1,
-+                        'AC_PROG_CPP' => 1,
-+                        'AC_C_CONST' => 1,
-+                        'AC_PROG_LEX' => 1,
-+                        'AC_TYPE_PID_T' => 1,
-+                        'CMU_LIBWRAP' => 1,
-+                        'AC_FUNC_SETVBUF_REVERSED' => 1,
-+                        'AC_PROG_INSTALL' => 1,
-+                        'CMU_SASL2_CHECKAPOP_REQUIRED' => 1,
-+                        'CMU_C_FPIC' => 1,
-+                        'AH_OUTPUT' => 1,
-+                        'CMU_KRB4' => 1,
-+                        'AC_CANONICAL_SYSTEM' => 1,
-+                        'AC_CONFIG_HEADERS' => 1,
-+                        'AC_CHECK_FUNCS' => 1,
-+                        'CMU_NEEDS_AFS' => 1
-+                      }
-+                    ], 'Autom4te::Request' ),
-+             bless( [
-+                      '1',
-+                      1,
-+                      [
-+                        '/usr/share/autoconf'
-+                      ],
-+                      [
-+                        '/usr/share/autoconf/autoconf/autoconf.m4f',
-+                        'aclocal.m4',
-+                        'configure.in'
-+                      ],
-+                      {
-+                        'AM_PROG_F77_C_O' => 1,
-+                        '_LT_AC_TAGCONFIG' => 1,
-+                        'm4_pattern_forbid' => 1,
-+                        'AC_CANONICAL_TARGET' => 1,
-+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-+                        'AC_C_VOLATILE' => 1,
-+                        'AC_TYPE_OFF_T' => 1,
-+                        'AC_FUNC_CLOSEDIR_VOID' => 1,
-+                        'AC_REPLACE_FNMATCH' => 1,
-+                        'AC_PROG_LIBTOOL' => 1,
-+                        'AC_FUNC_STAT' => 1,
-+                        'AC_FUNC_WAIT3' => 1,
-+                        'AC_HEADER_TIME' => 1,
-+                        'AC_FUNC_LSTAT' => 1,
-+                        'AC_STRUCT_TM' => 1,
-+                        'AM_AUTOMAKE_VERSION' => 1,
-+                        'AC_FUNC_GETMNTENT' => 1,
-+                        'AC_TYPE_MODE_T' => 1,
-+                        'AC_CHECK_HEADERS' => 1,
-+                        'AC_FUNC_STRTOD' => 1,
-+                        'LT_CONFIG_LTDL_DIR' => 1,
-+                        'AC_FUNC_STRNLEN' => 1,
-+                        'm4_sinclude' => 1,
-+                        'AC_PROG_CXX' => 1,
-+                        'AC_PATH_X' => 1,
-+                        'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
-+                        'AC_PROG_AWK' => 1,
-+                        '_m4_warn' => 1,
-+                        'AC_HEADER_STDC' => 1,
-+                        'AC_HEADER_MAJOR' => 1,
-+                        'AM_PROG_CXX_C_O' => 1,
-+                        'LT_INIT' => 1,
-+                        'AC_FUNC_ERROR_AT_LINE' => 1,
-+                        'AC_PROG_GCC_TRADITIONAL' => 1,
-+                        'AC_LIBSOURCE' => 1,
-+                        'AC_FUNC_MBRTOWC' => 1,
-+                        'AC_STRUCT_ST_BLOCKS' => 1,
-+                        'AC_TYPE_SIGNAL' => 1,
-+                        'AC_CANONICAL_BUILD' => 1,
-+                        'AM_PROG_FC_C_O' => 1,
-+                        'AC_TYPE_UID_T' => 1,
-+                        'AC_PROG_MAKE_SET' => 1,
-+                        'AC_CONFIG_AUX_DIR' => 1,
-+                        '_AM_SUBST_NOTMAKE' => 1,
-+                        'm4_pattern_allow' => 1,
-+                        'sinclude' => 1,
-+                        'AC_DEFINE_TRACE_LITERAL' => 1,
-+                        'AC_FUNC_STRERROR_R' => 1,
-+                        'AC_PROG_CC' => 1,
-+                        'AC_FUNC_FORK' => 1,
-+                        'AC_DECL_SYS_SIGLIST' => 1,
-+                        'AC_FUNC_STRCOLL' => 1,
-+                        'AC_FUNC_VPRINTF' => 1,
-+                        'AC_PROG_YACC' => 1,
-+                        'AC_SUBST_TRACE' => 1,
-+                        'AC_INIT' => 1,
-+                        'AC_STRUCT_TIMEZONE' => 1,
-+                        'AC_FUNC_CHOWN' => 1,
-+                        'AC_SUBST' => 1,
-+                        'AC_FUNC_ALLOCA' => 1,
-+                        'AC_FC_SRCEXT' => 1,
-+                        'AC_CANONICAL_HOST' => 1,
-+                        'AC_FUNC_GETPGRP' => 1,
-+                        'AC_PROG_RANLIB' => 1,
-+                        'AC_FUNC_SETPGRP' => 1,
-+                        'AM_INIT_AUTOMAKE' => 1,
-+                        'AC_CONFIG_SUBDIRS' => 1,
-+                        'AC_FUNC_MMAP' => 1,
-+                        'AC_FUNC_REALLOC' => 1,
-+                        'AC_TYPE_SIZE_T' => 1,
-+                        'AC_CHECK_TYPES' => 1,
-+                        'AC_CONFIG_LINKS' => 1,
-+                        'AC_REQUIRE_AUX_FILE' => 1,
-+                        'LT_SUPPORTED_TAG' => 1,
-+                        'AC_CHECK_MEMBERS' => 1,
-+                        'AM_MAINTAINER_MODE' => 1,
-+                        'AC_FUNC_UTIME_NULL' => 1,
-+                        'AC_FUNC_SELECT_ARGTYPES' => 1,
-+                        'AC_HEADER_STAT' => 1,
-+                        'AC_FUNC_STRFTIME' => 1,
-+                        'AC_PROG_CPP' => 1,
-+                        'AC_C_INLINE' => 1,
-+                        'AC_PROG_LEX' => 1,
-+                        'AC_C_CONST' => 1,
-+                        'AC_TYPE_PID_T' => 1,
-+                        'AC_CONFIG_FILES' => 1,
-+                        'include' => 1,
-+                        'AC_FUNC_SETVBUF_REVERSED' => 1,
-+                        'AC_PROG_INSTALL' => 1,
-+                        'AM_GNU_GETTEXT' => 1,
-+                        'AC_FUNC_OBSTACK' => 1,
-+                        'AC_CHECK_LIB' => 1,
-+                        'AC_FUNC_MALLOC' => 1,
-+                        'AC_FUNC_GETGROUPS' => 1,
-+                        'AC_FUNC_GETLOADAVG' => 1,
-+                        'AC_FC_FREEFORM' => 1,
-+                        'AH_OUTPUT' => 1,
-+                        'AC_FUNC_FSEEKO' => 1,
-+                        'AM_PROG_CC_C_O' => 1,
-+                        'AC_FUNC_MKTIME' => 1,
-+                        'AC_CANONICAL_SYSTEM' => 1,
-+                        'AM_CONDITIONAL' => 1,
-+                        'AC_CONFIG_HEADERS' => 1,
-+                        'AC_HEADER_SYS_WAIT' => 1,
-+                        'AC_PROG_LN_S' => 1,
-+                        'AC_FUNC_MEMCMP' => 1,
-+                        'm4_include' => 1,
-+                        'AC_HEADER_DIRENT' => 1,
-+                        'AC_CHECK_FUNCS' => 1
-+                      }
-+                    ], 'Autom4te::Request' )
-+           );
-+
-diff -urNad cyrus-imapd-2.2.13~/autom4te.cache/traces.0 cyrus-imapd-2.2.13/autom4te.cache/traces.0
---- cyrus-imapd-2.2.13~/autom4te.cache/traces.0	1970-01-01 00:00:00.000000000 +0000
-+++ cyrus-imapd-2.2.13/autom4te.cache/traces.0	2006-10-10 13:08:19.000000000 +0000
-@@ -0,0 +1,3267 @@
-+m4trace:cmulocal/afs.m4:19: -1- AC_DEFUN([CMU_AFS_INC_WHERE1], [
-+cmu_save_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$cmu_save_CPPFLAGS -I$1"
-+AC_TRY_COMPILE([#include <afs/param.h>],
-+[#ifndef SYS_NAME
-+choke me
-+#endif
-+int foo;],
-+ac_cv_found_afs_inc=yes,
-+ac_cv_found_afs_inc=no)
-+CPPFLAGS=$cmu_save_CPPFLAGS
-+])
-+m4trace:cmulocal/afs.m4:31: -1- AC_DEFUN([CMU_AFS_LIB_WHERE1], [
-+save_LIBS="$LIBS"
-+save_LDFLAGS="$LDFLAGS"
-+
-+LIBS="-lauth $1/afs/util.a $LIB_SOCKET $LIBS"
-+LDFLAGS="-L$1 -L$1/afs $LDFLAGS"
-+dnl suppress caching
-+AC_TRY_LINK([],[afsconf_Open();], ac_cv_found_afs_lib=yes, ac_cv_found_afs_lib=no)
-+LIBS="$save_LIBS"
-+LDFLAGS="$save_LDFLAGS"
-+])
-+m4trace:cmulocal/afs.m4:54: -1- AC_DEFUN([CMU_AFS_WHERE], [
-+AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
-+   for i in $1; do
-+      AC_MSG_CHECKING(for AFS in $i)
-+      CMU_AFS_INC_WHERE1("$i/include")
-+      ac_cv_found_lwp_inc=$ac_cv_found_afs_inc
-+      CMU_TEST_INCPATH($i/include, lwp) 
-+      ac_cv_found_afs_inc=$ac_cv_found_lwp_inc
-+      if test "$ac_cv_found_afs_inc" = "yes"; then
-+        CMU_AFS_LIB_WHERE1("$i/$CMU_LIB_SUBDIR")
-+        if test "$ac_cv_found_afs_lib" = "yes"; then
-+          ac_cv_afs_where=$i
-+          AC_MSG_RESULT(found)
-+          break
-+        else
-+          AC_MSG_RESULT(not found)
-+        fi
-+      else
-+        AC_MSG_RESULT(not found)
-+      fi
-+    done
-+])
-+m4trace:cmulocal/afs.m4:308: -1- AC_DEFUN([CMU_AFS], [
-+AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
-+AC_REQUIRE([CMU_SOCKETS])
-+AC_REQUIRE([CMU_LIBSSL])
-+AC_ARG_WITH(AFS,
-+	[  --with-afs=PREFIX      Compile with AFS support],
-+	[if test "X$with_AFS" = "X"; then
-+		with_AFS=yes
-+	fi])
-+
-+	if test "X$with_AFS" != "X"; then
-+	  ac_cv_afs_where=$with_AFS
-+	fi
-+	if test "X$ac_cv_afs_where" = "X"; then
-+	  CMU_AFS_WHERE(/usr/afsws /usr/local /usr/athena /Library/OpenAFS/Tools)
-+	fi
-+
-+	AC_MSG_CHECKING(whether to include AFS)
-+	if test "X$ac_cv_afs_where" = "Xno" -o "X$ac_cv_afs_where" = "X"; then
-+	  ac_cv_found_afs=no
-+	  AC_MSG_RESULT(no)
-+	else
-+	  ac_cv_found_afs=yes
-+	  AC_MSG_RESULT(yes)
-+	  AFS_INC_DIR="$ac_cv_afs_where/include"
-+	  AFS_LIB_DIR="$ac_cv_afs_where/$CMU_LIB_SUBDIR"
-+	  AFS_TOP_DIR="$ac_cv_afs_where"
-+	  AFS_INC_FLAGS="-I${AFS_INC_DIR}"
-+          AFS_LIB_FLAGS="-L${AFS_LIB_DIR} -L${AFS_LIB_DIR}/afs"
-+          cmu_save_LIBS="$LIBS"
-+          cmu_save_CPPFLAGS="$CPPFLAGS"
-+          CPPFLAGS="$CPPFLAGS ${AFS_INC_FLAGS}"
-+	  cmu_save_LDFLAGS="$LDFLAGS"
-+ 	  LDFLAGS="$cmu_save_LDFLAGS ${AFS_LIB_FLAGS}"
-+                        
-+          AC_CHECK_HEADERS(afs/stds.h)
-+
-+          AC_MSG_CHECKING([if libdes is needed])
-+          AC_TRY_LINK([],[des_quad_cksum();],AFS_DES_LIB="",AFS_DES_LIB="maybe")
-+          if test "X$AFS_DES_LIB" != "X"; then
-+              LIBS="$cmu_save_LIBS -ldes"
-+              AC_TRY_LINK([], [des_quad_cksum();],AFS_DES_LIB="yes")
-+              if test "X$AFS_DES_LIB" = "Xyes"; then
-+                  AC_MSG_RESULT([yes])
-+    	          AFS_LIBDES="-ldes"
-+    	          AFS_LIBDESA="${AFS_LIB_DIR}/libdes.a"
-+    	      else
-+   	          LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS"
-+ 	          AC_TRY_LINK([],
-+	          [des_quad_cksum();],AFS_DES_LIB="libcrypto")
-+	          if test "X$AFS_DES_LIB" = "Xlibcrypto"; then
-+	              AC_MSG_RESULT([libcrypto])
-+		      AFS_LIBDES="$LIBSSL_LIB_FLAGS"
-+	              AFS_LIBDESA="$LIBSSL_LIB_FLAGS"
-+    	          else
-+   	              LIBS="$cmu_save_LIBS -L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
-+ 	              AC_TRY_LINK([],
-+	              [des_quad_cksum();],AFS_DES_LIB="libcrypto+descompat")
-+	              if test "X$AFS_DES_LIB" = "Xlibcrypto+descompat"; then
-+	                  AC_MSG_RESULT([libcrypto+descompat])
-+		          AFS_LIBDES="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
-+	                  AFS_LIBDESA="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
-+	              else
-+         	          AC_MSG_RESULT([unknown])
-+	                  AC_MSG_ERROR([Could not use -ldes])
-+	              fi 
-+	          fi 
-+	      fi 
-+	  else
-+             AC_MSG_RESULT([no])
-+          fi
-+
-+
-+	  AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
-+          AFS_KTC_LIBS_STATIC="${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
-+	  AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
-+	  AFS_RX_LIBS="-lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
-+          AFS_KTC_LIBS="-lauth ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcom_err ${AFS_LIB_DIR}/afs/util.a"
-+
-+          LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}"
-+          AC_CHECK_FUNC(des_pcbc_init)
-+          if test "X$ac_cv_func_des_pcbc_init" != "Xyes"; then
-+           AC_CHECK_LIB(descompat, des_pcbc_init, AFS_DESCOMPAT_LIB="-ldescompat")
-+           if test "X$AFS_DESCOMPAT_LIB" != "X" ; then
-+                AFS_CLIENT_LIBS_STATIC="$AFS_CLIENT_LIBS_STATIC $AFS_DESCOMPAT_LIB"
-+                AFS_KTC_LIBS_STATIC="$AFS_KTC_LIBS_STATIC $AFS_DESCOMPAT_LIB"
-+                AFS_CLIENT_LIBS="$AFS_CLIENT_LIBS $AFS_DESCOMPAT_LIB"
-+                AFS_KTC_LIBS="$AFS_KTC_LIBS $AFS_DESCOMPAT_LIB"
-+           else
-+
-+           AC_MSG_CHECKING([if rxkad needs des_pcbc_init])
-+           AC_TRY_LINK(,[tkt_DecodeTicket();],RXKAD_PROBLEM=no,RXKAD_PROBLEM=maybe)
-+            if test "$RXKAD_PROBLEM" = "maybe"; then
-+              AC_TRY_LINK([int des_pcbc_init() { return 0;}],
-+              [tkt_DecodeTicket();],RXKAD_PROBLEM=yes,RXKAD_PROBLEM=error)
-+              if test "$RXKAD_PROBLEM" = "yes"; then
-+                    AC_MSG_RESULT([yes])
-+                    AC_MSG_ERROR([cannot use rxkad])
-+              else
-+                    AC_MSG_RESULT([unknown])        
-+                    AC_MSG_ERROR([Unknown error testing rxkad])
-+              fi
-+            else
-+              AC_MSG_RESULT([no])
-+            fi
-+           fi
-+          fi
-+
-+          LIBS="$cmu_save_LIBS"
-+          AC_CHECK_FUNC(flock)
-+          LIBS="$cmu_save_LIBS ${AFS_CLIENT_LIBS} ${LIB_SOCKET}"
-+          if test "X$ac_cv_func_flock" != "Xyes"; then
-+             AC_MSG_CHECKING([if AFS needs flock])
-+             AC_TRY_LINK([#include <afs/param.h>
-+#ifdef HAVE_AFS_STDS_H
-+#include <afs/stds.h>
-+#endif
-+#include <ubik.h>
-+#include <afs/cellconfig.h>
-+#include <afs/auth.h>
-+#include <afs/volser.h>
-+struct ubik_client * cstruct;
-+int sigvec() {return 0;}
-+extern int UV_SetSecurity();],
-+             [vsu_ClientInit(1,"","",0,
-+                             &cstruct,UV_SetSecurity)],
-+             AFS_FLOCK=no,AFS_FLOCK=yes)
-+             if test $AFS_FLOCK = "no"; then
-+                AC_MSG_RESULT([no])
-+             else
-+               AC_MSG_RESULT([yes])
-+               LDFLAGS="$LDFLAGS -L/usr/ucblib"
-+               AC_CHECK_LIB(ucb, flock,:, [AC_CHECK_LIB(BSD, flock)])
-+             fi
-+          fi
-+          LIBS="$cmu_save_LIBS"
-+          AC_CHECK_FUNC(sigvec)
-+          LIBS="$cmu_save_LIBS ${AFS_CLIENT_LIBS} ${LIB_SOCKET}"
-+          if test "X$ac_cv_func_sigvec" != "Xyes"; then
-+             AC_MSG_CHECKING([if AFS needs sigvec])
-+             AC_TRY_LINK([#include <afs/param.h>
-+#ifdef HAVE_AFS_STDS_H
-+#include <afs/stds.h>
-+#endif
-+#include <ubik.h>
-+#include <afs/cellconfig.h>
-+#include <afs/auth.h>
-+#include <afs/volser.h>
-+struct ubik_client * cstruct;
-+int flock() {return 0;}
-+extern int UV_SetSecurity();],
-+             [vsu_ClientInit(1,"","",0,
-+                             &cstruct,UV_SetSecurity)],
-+             AFS_SIGVEC=no,AFS_SIGVEC=yes)
-+             if test $AFS_SIGVEC = "no"; then
-+                AC_MSG_RESULT([no])
-+             else
-+               AC_MSG_RESULT([yes])
-+               LDFLAGS="$LDFLAGS -L/usr/ucblib"
-+               AC_CHECK_LIB(ucb, sigvec,:,[AC_CHECK_LIB(BSD, sigvec)])
-+             fi
-+          fi
-+          if test "$ac_cv_lib_ucb_flock" = "yes" -o "$ac_cv_lib_ucb_sigvec" = "yes"; then
-+             AFS_LIB_FLAGS="${AFS_LIB_FLAGS} -L/usr/ucblib -R/usr/ucblib"
-+          fi
-+          if test "$ac_cv_lib_ucb_flock" = "yes" -o "$ac_cv_lib_ucb_sigvec" = "yes"; then
-+             AFS_BSD_LIB="-lucb"
-+          elif test "$ac_cv_lib_BSD_flock" = "yes" -o "$ac_cv_lib_BSD_sigvec" = "yes"; then
-+             AFS_BSD_LIB="-lBSD"
-+          fi
-+          if test "X$AFS_BSD_LIB" != "X" ; then
-+                AFS_CLIENT_LIBS_STATIC="$AFS_CLIENT_LIBS_STATIC $AFS_BSD_LIB"
-+                AFS_KTC_LIBS_STATIC="$AFS_KTC_LIBS_STATIC $AFS_BSD_LIB"
-+                AFS_CLIENT_LIBS="$AFS_CLIENT_LIBS $AFS_BSD_LIB"
-+                AFS_RX_LIBS="$AFS_CLIENT_LIBS $AFS_BSD_LIB"
-+                AFS_KTC_LIBS="$AFS_KTC_LIBS $AFS_BSD_LIB"
-+          fi
-+
-+          AC_MSG_CHECKING([if libaudit is needed])
-+	  AFS_LIBAUDIT=""
-+          LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}"
-+          AC_TRY_LINK([#include <afs/param.h>
-+#ifdef HAVE_AFS_STDS_H
-+#include <afs/stds.h>
-+#endif
-+#include <afs/cellconfig.h>
-+#include <afs/auth.h>],
-+          [afsconf_SuperUser();],AFS_AUDIT_LIB="",AFS_AUDIT_LIB="maybe")
-+          if test "X$AFS_AUDIT_LIB" != "X"; then
-+          LIBS="$cmu_save_LIBS -lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB $LIB_SOCKET"
-+             AC_TRY_LINK([#include <afs/param.h>
-+#ifdef HAVE_AFS_STDS_H
-+#include <afs/stds.h>
-+#endif
-+#include <afs/cellconfig.h>
-+#include <afs/auth.h>],
-+             [afsconf_SuperUser();],AFS_AUDIT_LIB="yes")
-+             if test "X$AFS_AUDIT_LIB" = "Xyes"; then
-+                 AC_MSG_RESULT([yes])
-+	         AFS_LIBAUDIT="-laudit"
-+	         AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libaudit.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
-+                 AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB"
-+                 AFS_RX_LIBS="-lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB"
-+             else
-+                 AC_MSG_RESULT([unknown])
-+                 AC_MSG_ERROR([Could not use -lauth while testing for -laudit])
-+             fi 
-+          else
-+             AC_MSG_RESULT([no])
-+          fi
-+
-+	  AC_CHECK_FUNCS(VL_ProbeServer)
-+          AC_MSG_CHECKING([if new-style afs_ integer types are defined])
-+          AC_CACHE_VAL(ac_cv_afs_int32,
-+dnl The next few lines contain a quoted argument to egrep
-+dnl It is critical that there be no leading or trailing whitespace
-+dnl or newlines
-+[AC_EGREP_CPP(dnl
-+changequote(<<,>>)dnl
-+<<(^|[^a-zA-Z_0-9])afs_int32[^a-zA-Z_0-9]>>dnl
-+changequote([,]), [#include <afs/param.h>
-+#ifdef HAVE_AFS_STDS_H
-+#include <afs/stds.h>
-+#endif],
-+ac_cv_afs_int32=yes, ac_cv_afs_int32=no)])
-+          AC_MSG_RESULT($ac_cv_afs_int32)
-+          if test $ac_cv_afs_int32 = yes ; then
-+            AC_DEFINE(HAVE_AFS_INT32,, [AFS provides new "unambiguous" type names])
-+          else
-+            AC_DEFINE(afs_int16, int16, [it's a type definition])
-+            AC_DEFINE(afs_int32, int32, [it's a type definition])
-+            AC_DEFINE(afs_uint16, u_int16, [it's a type definition])
-+            AC_DEFINE(afs_uint32, u_int32, [it's a type definition])
-+          fi
-+
-+          CPPFLAGS="${cmu_save_CPPFLAGS}"
-+          LDFLAGS="${cmu_save_LDFLAGS}"
-+          LIBS="${cmu_save_LIBS}"
-+	  AC_DEFINE(AFS_ENV,, [Use AFS. (find what needs this and nuke it)])
-+          AC_DEFINE(AFS,, [Use AFS. (find what needs this and nuke it)])
-+          AC_SUBST(AFS_CLIENT_LIBS_STATIC)
-+          AC_SUBST(AFS_KTC_LIBS_STATIC)
-+          AC_SUBST(AFS_CLIENT_LIBS)
-+          AC_SUBST(AFS_RX_LIBS)
-+          AC_SUBST(AFS_KTC_LIBS)
-+          AC_SUBST(AFS_INC_FLAGS)
-+          AC_SUBST(AFS_LIB_FLAGS)
-+	  AC_SUBST(AFS_TOP_DIR)
-+	  AC_SUBST(AFS_LIBAUDIT)
-+	  AC_SUBST(AFS_LIBDES)
-+          AC_SUBST(AFS_LIBDESA)
-+       	fi
-+	])
-+m4trace:cmulocal/afs.m4:314: -1- AC_DEFUN([CMU_NEEDS_AFS], [AC_REQUIRE([CMU_AFS])
-+if test "$ac_cv_found_afs" != "yes"; then
-+        AC_ERROR([Cannot continue without AFS])
-+fi])
-+m4trace:cmulocal/berkdb.m4:13: -1- AC_DEFUN([CMU_DB_INC_WHERE1], [
-+saved_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$saved_CPPFLAGS -I$1"
-+AC_TRY_COMPILE([#include <db.h>],
-+[DB *db;
-+db_create(&db, NULL, 0);
-+db->open(db, "foo.db", NULL, DB_UNKNOWN, DB_RDONLY, 0644);],
-+ac_cv_found_db_inc=yes,
-+ac_cv_found_db_inc=no)
-+CPPFLAGS=$saved_CPPFLAGS
-+])
-+m4trace:cmulocal/berkdb.m4:28: -1- AC_DEFUN([CMU_DB_INC_WHERE], [
-+   for i in $1; do
-+      AC_MSG_CHECKING(for db headers in $i)
-+      CMU_DB_INC_WHERE1($i)
-+      CMU_TEST_INCPATH($i, db)
-+      if test "$ac_cv_found_db_inc" = "yes"; then
-+        ac_cv_db_where_inc=$i
-+        AC_MSG_RESULT(found)
-+        break
-+      else
-+        AC_MSG_RESULT(not found)
-+      fi
-+    done
-+])
-+m4trace:cmulocal/berkdb.m4:44: -1- AC_DEFUN([CMU_DB3_LIB_WHERE1], [
-+AC_REQUIRE([CMU_AFS])
-+AC_REQUIRE([CMU_KRB4])
-+saved_LIBS=$LIBS
-+  LIBS="$saved_LIBS -L$1 -ldb-3"
-+AC_TRY_LINK([#include <db.h>],
-+[db_env_create(NULL, 0);],
-+[ac_cv_found_db_3_lib=yes],
-+ac_cv_found_db_3_lib=no)
-+LIBS=$saved_LIBS
-+])
-+m4trace:cmulocal/berkdb.m4:55: -1- AC_DEFUN([CMU_DB4_LIB_WHERE1], [
-+AC_REQUIRE([CMU_AFS])
-+AC_REQUIRE([CMU_KRB4])
-+saved_LIBS=$LIBS
-+LIBS="$saved_LIBS -L$1 -ldb-4"
-+AC_TRY_LINK([#include <db.h>],
-+[db_env_create(NULL, 0);],
-+[ac_cv_found_db_4_lib=yes],
-+ac_cv_found_db_4_lib=no)
-+LIBS=$saved_LIBS
-+])
-+m4trace:cmulocal/berkdb.m4:77: -1- AC_DEFUN([CMU_DB_LIB_WHERE], [
-+   for i in $1; do
-+      AC_MSG_CHECKING(for db libraries in $i)
-+if test "$enable_db4" = "yes"; then
-+      CMU_DB4_LIB_WHERE1($i)
-+      CMU_TEST_LIBPATH($i, [db-4])
-+      ac_cv_found_db_lib=$ac_cv_found_db_4_lib
-+else
-+      CMU_DB3_LIB_WHERE1($i)
-+      CMU_TEST_LIBPATH($i, [db-3])
-+      ac_cv_found_db_lib=$ac_cv_found_db_3_lib
-+fi
-+      if test "$ac_cv_found_db_lib" = "yes" ; then
-+        ac_cv_db_where_lib=$i
-+        AC_MSG_RESULT(found)
-+        break
-+      else
-+        AC_MSG_RESULT(not found)
-+      fi
-+    done
-+])
-+m4trace:cmulocal/berkdb.m4:178: -1- AC_DEFUN([CMU_USE_DB], [
-+AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
-+AC_ARG_WITH(db,
-+	[  --with-db=PREFIX      Compile with db support],
-+	[if test "X$with_db" = "X"; then
-+		with_db=yes
-+	fi])
-+AC_ARG_WITH(db-lib,
-+	[  --with-db-lib=dir     use db libraries in dir],
-+	[if test "$withval" = "yes" -o "$withval" = "no"; then
-+		AC_MSG_ERROR([No argument for --with-db-lib])
-+	fi])
-+AC_ARG_WITH(db-include,
-+	[  --with-db-include=dir use db headers in dir],
-+	[if test "$withval" = "yes" -o "$withval" = "no"; then
-+		AC_MSG_ERROR([No argument for --with-db-include])
-+	fi])
-+AC_ARG_ENABLE(db4,
-+	[  --enable-db4          use db 4.x libraries])
-+	
-+	if test "X$with_db" != "X"; then
-+	  if test "$with_db" != "yes"; then
-+	    ac_cv_db_where_lib=$with_db/$CMU_LIB_SUBDIR
-+	    ac_cv_db_where_inc=$with_db/include
-+	  fi
-+	fi
-+
-+	if test "X$with_db_lib" != "X"; then
-+	  ac_cv_db_where_lib=$with_db_lib
-+	fi
-+	if test "X$ac_cv_db_where_lib" = "X"; then
-+	  CMU_DB_LIB_WHERE(/usr/athena/$CMU_LIB_SUBDIR /usr/$CMU_LIB_SUBDIR /usr/local/$CMU_LIB_SUBDIR)
-+	fi
-+
-+	if test "X$with_db_include" != "X"; then
-+	  ac_cv_db_where_inc=$with_db_include
-+	fi
-+	if test "X$ac_cv_db_where_inc" = "X"; then
-+	  CMU_DB_INC_WHERE(/usr/athena/include /usr/local/include)
-+	fi
-+
-+	AC_MSG_CHECKING(whether to include db)
-+	if test "X$ac_cv_db_where_lib" = "X" -o "X$ac_cv_db_where_inc" = "X"; then
-+	  ac_cv_found_db=no
-+	  AC_MSG_RESULT(no)
-+	else
-+	  ac_cv_found_db=yes
-+	  AC_MSG_RESULT(yes)
-+	  DB_INC_DIR=$ac_cv_db_where_inc
-+	  DB_LIB_DIR=$ac_cv_db_where_lib
-+	  DB_INC_FLAGS="-I${DB_INC_DIR}"
-+          if test "$enable_db4" = "yes"; then
-+	     DB_LIB_FLAGS="-L${DB_LIB_DIR} -ldb-4"
-+          else
-+	     DB_LIB_FLAGS="-L${DB_LIB_DIR} -ldb-3"
-+          fi
-+          dnl Do not force configure.in to put these in CFLAGS and LIBS unconditionally
-+          dnl Allow makefile substitutions....
-+          AC_SUBST(DB_INC_FLAGS)
-+          AC_SUBST(DB_LIB_FLAGS)
-+	  if test "X$RPATH" = "X"; then
-+		RPATH=""
-+	  fi
-+	  case "${host}" in
-+	    *-*-linux*)
-+	      if test "X$RPATH" = "X"; then
-+	        RPATH="-Wl,-rpath,${DB_LIB_DIR}"
-+	      else 
-+		RPATH="${RPATH}:${DB_LIB_DIR}"
-+	      fi
-+	      ;;
-+	    *-*-hpux*)
-+	      if test "X$RPATH" = "X"; then
-+	        RPATH="-Wl,+b${DB_LIB_DIR}"
-+	      else 
-+		RPATH="${RPATH}:${DB_LIB_DIR}"
-+	      fi
-+	      ;;
-+	    *-*-irix*)
-+	      if test "X$RPATH" = "X"; then
-+	        RPATH="-Wl,-rpath,${DB_LIB_DIR}"
-+	      else 
-+		RPATH="${RPATH}:${DB_LIB_DIR}"
-+	      fi
-+	      ;;
-+	    *-*-solaris2*)
-+	      if test "$ac_cv_prog_gcc" = yes; then
-+		if test "X$RPATH" = "X"; then
-+		  RPATH="-Wl,-R${DB_LIB_DIR}"
-+		else 
-+		  RPATH="${RPATH}:${DB_LIB_DIR}"
-+		fi
-+	      else
-+	        RPATH="${RPATH} -R${DB_LIB_DIR}"
-+	      fi
-+	      ;;
-+	  esac
-+	  AC_SUBST(RPATH)
-+	fi
-+	])
-+m4trace:cmulocal/berkdb.m4:235: -1- AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], [
-+	BDB_SAVE_LDFLAGS=$LDFLAGS
-+
-+	if test -d $with_bdb_lib; then
-+	    CMU_ADD_LIBPATH_TO($with_bdb_lib, LDFLAGS)
-+	    CMU_ADD_LIBPATH_TO($with_bdb_lib, BDB_LIBADD)
-+	else
-+	    BDB_LIBADD=""
-+	fi
-+
-+	saved_LIBS=$LIBS
-+        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+          do
-+	    LIBS="$saved_LIBS -l$dbname"
-+	    AC_TRY_LINK([#include <db.h>],
-+	    [db_create(NULL, NULL, 0);],
-+	    BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
-+            dblib="no")
-+	    if test "$dblib" = "berkeley"; then break; fi
-+          done
-+        if test "$dblib" = "no"; then
-+	    LIBS="$saved_LIBS -ldb"
-+	    AC_TRY_LINK([#include <db.h>],
-+	    [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
-+	    BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
-+            dblib="no")
-+        fi
-+	LIBS=$saved_LIBS
-+
-+	LDFLAGS=$BDB_SAVE_LDFLAGS
-+])
-+m4trace:cmulocal/berkdb.m4:247: -1- AC_DEFUN([CYRUS_BERKELEY_DB_OPTS], [
-+AC_ARG_WITH(bdb-libdir,
-+	[  --with-bdb-libdir=DIR   Berkeley DB lib files are in DIR],
-+	with_bdb_lib=$withval,
-+	[ test "${with_bdb_lib+set}" = set || with_bdb_lib=none])
-+AC_ARG_WITH(bdb-incdir,
-+	[  --with-bdb-incdir=DIR   Berkeley DB include files are in DIR],
-+	with_bdb_inc=$withval,
-+	[ test "${with_bdb_inc+set}" = set || with_bdb_inc=none ])
-+])
-+m4trace:cmulocal/berkdb.m4:269: -1- AC_DEFUN([CYRUS_BERKELEY_DB_CHK], [
-+	AC_REQUIRE([CYRUS_BERKELEY_DB_OPTS])
-+
-+	cmu_save_CPPFLAGS=$CPPFLAGS
-+
-+	if test -d $with_bdb_inc; then
-+	    CPPFLAGS="$CPPFLAGS -I$with_bdb_inc"
-+	    BDB_INCADD="-I$with_bdb_inc"
-+	else
-+	    BDB_INCADD=""
-+	fi
-+
-+	dnl Note that FreeBSD puts it in a wierd place
-+        dnl (but they should use with-bdb-incdir)
-+        AC_CHECK_HEADER(db.h,
-+                        [CYRUS_BERKELEY_DB_CHK_LIB()],
-+                        dblib="no")
-+
-+	CPPFLAGS=$cmu_save_CPPFLAGS
-+])
-+m4trace:cmulocal/bsd_sockets.m4:39: -1- AC_DEFUN([CMU_SOCKETS], [
-+	save_LIBS="$LIBS"
-+	LIB_SOCKET=""
-+	AC_CHECK_FUNC(connect, :,
-+		AC_CHECK_LIB(nsl, gethostbyname,
-+			     LIB_SOCKET="-lnsl $LIB_SOCKET")
-+		AC_CHECK_LIB(socket, connect,
-+			     LIB_SOCKET="-lsocket $LIB_SOCKET")
-+	)
-+	LIBS="$LIB_SOCKET $save_LIBS"
-+	AC_CHECK_FUNC(res_search, :,
-+		LIBS="-lresolv $LIB_SOCKET $save_LIBS"
-+		AC_TRY_LINK([[
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-+#include <arpa/nameser_compat.h>
-+#endif
-+#include <resolv.h>]],[[
-+const char host[12]="openafs.org";
-+u_char ans[1024];
-+res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
-+return 0;
-+]], LIB_SOCKET="-lresolv $LIB_SOCKET")
-+        )
-+	LIBS="$LIB_SOCKET $save_LIBS"
-+	AC_CHECK_FUNCS(dn_expand dns_lookup)
-+	LIBS="$save_LIBS"
-+	AC_SUBST(LIB_SOCKET)
-+	])
-+m4trace:cmulocal/c-attribute.m4:30: -1- AC_DEFUN([CMU_C___ATTRIBUTE__], [
-+AC_MSG_CHECKING(for __attribute__)
-+AC_CACHE_VAL(ac_cv___attribute__, [
-+AC_TRY_COMPILE([
-+#include <stdlib.h>
-+],
-+[
-+static void foo(void) __attribute__ ((noreturn));
-+
-+static void
-+foo(void)
-+{
-+  exit(1);
-+}
-+],
-+ac_cv___attribute__=yes,
-+ac_cv___attribute__=no)])
-+if test "$ac_cv___attribute__" = "yes"; then
-+  AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__])
-+fi
-+AC_MSG_RESULT($ac_cv___attribute__)
-+])
-+m4trace:cmulocal/c-fpic.m4:34: -1- AC_DEFUN([CMU_C_FPIC], [
-+AC_MSG_CHECKING(if compiler supports -fPIC)
-+AC_CACHE_VAL(ac_cv_fpic, [
-+save_CFLAGS=$CFLAGS
-+CFLAGS="${CFLAGS} -fPIC"
-+AC_TRY_COMPILE([
-+#include <stdlib.h>
-+],
-+[
-+static void
-+foo(void)
-+{
-+  exit(1);
-+}
-+],
-+ac_cv_fpic=yes,
-+ac_cv_fpic=no)
-+CFLAGS=$save_CFLAGS
-+])
-+if test "$ac_cv_fpic" = "yes"; then
-+    FPIC_CFLAGS="-fPIC"
-+else
-+    FPIC_CFLAGS=""
-+fi
-+AC_MSG_RESULT($ac_cv_fpic)
-+])
-+m4trace:cmulocal/common.m4:12: -1- AC_DEFUN([CMU_TEST_LIBPATH], [
-+changequote(<<, >>)
-+define(<<CMU_AC_CV_FOUND>>, translit(ac_cv_found_$2_lib, <<- *>>, <<__p>>))
-+changequote([, ])
-+if test "$CMU_AC_CV_FOUND" = "yes"; then
-+  if test \! -r "$1/lib$2.a" -a \! -r "$1/lib$2.so" -a \! -r "$1/lib$2.sl" -a \! -r "$1/lib$2.dylib"; then
-+    CMU_AC_CV_FOUND=no
-+  fi
-+fi
-+])
-+m4trace:cmulocal/common.m4:23: -1- AC_DEFUN([CMU_TEST_INCPATH], [
-+changequote(<<, >>)
-+define(<<CMU_AC_CV_FOUND>>, translit(ac_cv_found_$2_inc, [ *], [_p]))
-+changequote([, ])
-+if test "$CMU_AC_CV_FOUND" = "yes"; then
-+  if test \! -r "$1/$2.h"; then
-+    CMU_AC_CV_FOUND=no
-+  fi
-+fi
-+])
-+m4trace:cmulocal/common.m4:40: -1- AC_DEFUN([CMU_CHECK_HEADER_NOCACHE], [dnl Do the transliteration at runtime so arg 1 can be a shell variable.
-+ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
-+AC_MSG_CHECKING([for $1])
-+AC_TRY_CPP([#include <$1>], eval "ac_cv_header_$ac_safe=yes",
-+  eval "ac_cv_header_$ac_safe=no")
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  AC_MSG_RESULT(yes)
-+  ifelse([$2], , :, [$2])
-+else
-+  AC_MSG_RESULT(no)
-+ifelse([$3], , , [$3
-+])dnl
-+fi
-+])
-+m4trace:cmulocal/common.m4:61: -1- AC_DEFUN([CMU_FIND_LIB_SUBDIR], [dnl
-+AC_ARG_WITH([lib-subdir], AC_HELP_STRING([--with-lib-subdir=DIR],[Find libraries in DIR instead of lib]))
-+AC_CHECK_SIZEOF(long)
-+AC_CACHE_CHECK([what directory libraries are found in], [ac_cv_cmu_lib_subdir],
-+[test "X$with_lib_subdir" = "Xyes" && with_lib_subdir=
-+test "X$with_lib_subdir" = "Xno" && with_lib_subdir=
-+if test "X$with_lib_subdir" = "X" ; then
-+  ac_cv_cmu_lib_subdir=lib
-+  if test $ac_cv_sizeof_long -eq 4 ; then
-+    test -d /usr/lib32 && ac_cv_cmu_lib_subdir=lib32
-+  fi
-+  if test $ac_cv_sizeof_long -eq 8 ; then
-+    test -d /usr/lib64 && ac_cv_cmu_lib_subdir=lib64
-+  fi
-+else
-+  ac_cv_cmu_lib_subdir=$with_lib_subdir
-+fi])
-+AC_SUBST(CMU_LIB_SUBDIR, $ac_cv_cmu_lib_subdir)
-+])
-+m4trace:cmulocal/cyrus.m4:20: -1- AC_DEFUN([CMU_ADD_LIBPATH], [
-+  # this is CMU ADD LIBPATH
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	LDFLAGS="-L$1 ${LDFLAGS}"
-+  else
-+	LDFLAGS="-L$1 $andrew_runpath_switch$1 ${LDFLAGS}"
-+  fi
-+])
-+m4trace:cmulocal/cyrus.m4:31: -1- AC_DEFUN([CMU_ADD_LIBPATH_TO], [
-+  # this is CMU ADD LIBPATH TO
-+  if test "$andrew_runpath_switch" = "none" ; then
-+	$2="-L$1 ${$2}"
-+  else
-+	$2="-L$1 ${$2} $andrew_runpath_switch$1"
-+  fi
-+])
-+m4trace:cmulocal/cyrus.m4:38: -1- AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
-+   # CMU GUESS RUNPATH SWITCH
-+    andrew_runpath_switch="none"
-+])
-+m4trace:cmulocal/ipv6.m4:62: -1- AC_DEFUN([IPv6_CHECK_FUNC], [
-+AC_CHECK_FUNC($1, [dnl
-+  ac_cv_lib_socket_$1=no
-+  ac_cv_lib_inet6_$1=no
-+], [dnl
-+  AC_CHECK_LIB(socket, $1, [dnl
-+    LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_$1=no
-+  ], [dnl
-+    AC_MSG_CHECKING([whether your system has IPv6 directory])
-+    AC_CACHE_VAL(ipv6_cv_dir, [dnl
-+      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done])dnl
-+    AC_MSG_RESULT($ipv6_cv_dir)
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_$1=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      AC_CHECK_LIB(inet6, $1, [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi],)dnl
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi])dnl
-+])dnl
-+ipv6_cv_$1=no
-+if test $ac_cv_func_$1 = yes -o $ac_cv_lib_socket_$1 = yes \
-+     -o $ac_cv_lib_inet6_$1 = yes
-+then
-+  ipv6_cv_$1=yes
-+fi
-+if test $ipv6_cv_$1 = no; then
-+  if test $1 = getaddrinfo; then
-+    for ipv6_cv_pfx in o n; do
-+      AC_EGREP_HEADER(${ipv6_cv_pfx}$1, netdb.h,
-+		      [AC_CHECK_FUNC(${ipv6_cv_pfx}$1)])
-+      if eval test X\$ac_cv_func_${ipv6_cv_pfx}$1 = Xyes; then
-+        AC_DEFINE(HAVE_GETADDRINFO,[],[Do we have a getaddrinfo?])
-+        ipv6_cv_$1=yes
-+        break
-+      fi
-+    done
-+  fi
-+fi
-+if test $ipv6_cv_$1 = yes; then
-+  ifelse([$2], , :, [$2])
-+else
-+  ifelse([$3], , :, [$3])
-+fi])
-+m4trace:cmulocal/ipv6.m4:78: -1- AC_DEFUN([IPv6_CHECK_SS_FAMILY], [
-+AC_MSG_CHECKING([whether you have ss_family in struct sockaddr_storage])
-+AC_CACHE_VAL(ipv6_cv_ss_family, [dnl
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/socket.h>],
-+	[struct sockaddr_storage ss; int i = ss.ss_family;],
-+	[ipv6_cv_ss_family=yes], [ipv6_cv_ss_family=no])])dnl
-+if test $ipv6_cv_ss_family = yes; then
-+  ifelse([$1], , AC_DEFINE(HAVE_SS_FAMILY,[],[Is there an ss_family in sockaddr_storage?]), [$1])
-+else
-+  ifelse([$2], , :, [$2])
-+fi
-+AC_MSG_RESULT($ipv6_cv_ss_family)])
-+m4trace:cmulocal/ipv6.m4:94: -1- AC_DEFUN([IPv6_CHECK_SA_LEN], [
-+AC_MSG_CHECKING([whether you have sa_len in struct sockaddr])
-+AC_CACHE_VAL(ipv6_cv_sa_len, [dnl
-+AC_TRY_COMPILE([#include <sys/types.h>
-+#include <sys/socket.h>],
-+	       [struct sockaddr sa; int i = sa.sa_len;],
-+	       [ipv6_cv_sa_len=yes], [ipv6_cv_sa_len=no])])dnl
-+if test $ipv6_cv_sa_len = yes; then
-+  ifelse([$1], , AC_DEFINE(HAVE_SOCKADDR_SA_LEN,[],[Does sockaddr have an sa_len?]), [$1])
-+else
-+  ifelse([$2], , :, [$2])
-+fi
-+AC_MSG_RESULT($ipv6_cv_sa_len)])
-+m4trace:cmulocal/ipv6.m4:110: -1- AC_DEFUN([IPv6_CHECK_SOCKLEN_T], [
-+AC_MSG_CHECKING(for socklen_t)
-+AC_CACHE_VAL(ipv6_cv_socklen_t, [dnl
-+AC_TRY_LINK([#include <sys/types.h>
-+#include <sys/socket.h>],
-+	    [socklen_t len = 0;],
-+	    [ipv6_cv_socklen_t=yes], [ipv6_cv_socklen_t=no])])dnl
-+if test $ipv6_cv_socklen_t = yes; then
-+  ifelse([$1], , AC_DEFINE(HAVE_SOCKLEN_T,[],[Do we have a socklen_t?]), [$1])
-+else
-+  ifelse([$2], , :, [$2])
-+fi
-+AC_MSG_RESULT($ipv6_cv_socklen_t)])
-+m4trace:cmulocal/kerberos_v4.m4:23: -1- AC_DEFUN([CMU_KRB_SENDAUTH_PROTO], [
-+AC_MSG_CHECKING(for krb_sendauth prototype)
-+AC_TRY_COMPILE(
-+[#include <krb.h>
-+int krb_sendauth (long options, int fd, KTEXT ktext, char *service,
-+                  char *inst, char *realm, u_long checksum,
-+                  MSG_DAT *msg_data, CREDENTIALS *cred,
-+                  Key_schedule schedule, struct sockaddr_in *laddr,
-+                  struct sockaddr_in *faddr, char *version);],
-+[int foo = krb_sendauth(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); ],
-+ac_cv_krb_sendauth_proto=no,
-+ac_cv_krb_sendauth_proto=yes)
-+AC_MSG_RESULT($ac_cv_krb_sendauth_proto)
-+if test "$ac_cv_krb_sendauth_proto" = yes; then
-+        AC_DEFINE(HAVE_KRB_SENDAUTH_PROTO)dnl
-+fi
-+AC_MSG_RESULT($ac_cv_krb_sendauth_proto)
-+])
-+m4trace:cmulocal/kerberos_v4.m4:42: -1- AC_DEFUN([CMU_KRB_SET_KEY_PROTO], [
-+AC_MSG_CHECKING(for krb_set_key prototype)
-+AC_CACHE_VAL(ac_cv_krb_set_key_proto, [
-+cmu_save_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
-+AC_TRY_COMPILE(
-+[#include <krb.h>
-+int krb_set_key(char *key, int cvt);],
-+[int foo = krb_set_key(0, 0);],
-+ac_cv_krb_set_key_proto=no,
-+ac_cv_krb_set_key_proto=yes)
-+])
-+CPPFLAGS="${cmu_save_CPPFLAGS}"
-+if test "$ac_cv_krb_set_key_proto" = yes; then
-+	AC_DEFINE(HAVE_KRB_SET_KEY_PROTO)dnl
-+fi
-+AC_MSG_RESULT($ac_cv_krb_set_key_proto)
-+])
-+m4trace:cmulocal/kerberos_v4.m4:61: -1- AC_DEFUN([CMU_KRB4_32_DEFN], [
-+AC_MSG_CHECKING(for KRB4_32 definition)
-+AC_CACHE_VAL(ac_cv_krb4_32_defn, [
-+cmu_save_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
-+AC_TRY_COMPILE(
-+[#include <krb.h>
-+],
-+[KRB4_32 foo = 1;],
-+ac_cv_krb4_32_defn=yes,
-+ac_cv_krb4_32_defn=no)
-+])
-+CPPFLAGS="${cmu_save_CPPFLAGS}"
-+if test "$ac_cv_krb4_32_defn" = yes; then
-+	AC_DEFINE(HAVE_KRB4_32_DEFINE)dnl
-+fi
-+AC_MSG_RESULT($ac_cv_krb4_32_defn)
-+])
-+m4trace:cmulocal/kerberos_v4.m4:81: -1- AC_DEFUN([CMU_KRB_RD_REQ_PROTO], [
-+AC_MSG_CHECKING(for krb_rd_req prototype)
-+AC_CACHE_VAL(ac_cv_krb_rd_req_proto, [
-+cmu_save_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="${CPPFLAGS} ${KRB_INC_FLAGS}"
-+AC_TRY_COMPILE(
-+[#include <krb.h>
-+int krb_rd_req(KTEXT authent, char *service, char *instance,
-+unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn);],
-+[int foo = krb_rd_req(0,0,0,0,0,0);],
-+ac_cv_krb_rd_req_proto=no,
-+ac_cv_krb_rd_req_proto=yes)
-+])
-+CPPFLAGS="${cmu_save_CPPFLAGS}"
-+if test "$ac_cv_krb_rd_req_proto" = yes; then
-+	AC_DEFINE(HAVE_KRB_RD_REQ_PROTO)dnl
-+fi
-+AC_MSG_RESULT($ac_cv_krb_rd_req_proto)
-+])
-+m4trace:cmulocal/kerberos_v4.m4:98: -1- AC_DEFUN([CMU_KRB_INC_WHERE1], [
-+saved_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$saved_CPPFLAGS -I$1"
-+AC_TRY_COMPILE([#include <krb.h>],
-+[struct ktext foo;],
-+ac_cv_found_krb_inc=yes,
-+ac_cv_found_krb_inc=no)
-+if test "$ac_cv_found_krb_inc" = "no"; then
-+  CPPFLAGS="$saved_CPPFLAGS -I$1 -I$1/kerberosIV"
-+  AC_TRY_COMPILE([#include <krb.h>],
-+  [struct ktext foo;],
-+  [ac_cv_found_krb_inc=yes],
-+  ac_cv_found_krb_inc=no)
-+fi
-+CPPFLAGS=$saved_CPPFLAGS
-+])
-+m4trace:cmulocal/kerberos_v4.m4:113: -1- AC_DEFUN([CMU_KRB_INC_WHERE], [
-+   for i in $1; do
-+      AC_MSG_CHECKING(for kerberos headers in $i)
-+      CMU_KRB_INC_WHERE1($i)
-+      CMU_TEST_INCPATH($i, krb)
-+      if test "$ac_cv_found_krb_inc" = "yes"; then
-+        ac_cv_krb_where_inc=$i
-+        AC_MSG_RESULT(found)
-+        break
-+      else
-+        AC_MSG_RESULT(not found)
-+      fi
-+    done
-+])
-+m4trace:cmulocal/kerberos_v4.m4:127: -1- AC_DEFUN([CMU_KRB_LIB_WHERE1], [
-+saved_LIBS=$LIBS
-+LIBS="$saved_LIBS -L$1 -lkrb ${KRB_LIBDES}"
-+AC_TRY_LINK(,
-+[dest_tkt();],
-+[ac_cv_found_krb_lib=yes],
-+ac_cv_found_krb_lib=no)
-+LIBS=$saved_LIBS
-+])
-+m4trace:cmulocal/kerberos_v4.m4:143: -1- AC_DEFUN([CMU_KRB_LIB_WHERE], [
-+   for i in $1; do
-+      AC_MSG_CHECKING(for kerberos libraries in $i)
-+      CMU_KRB_LIB_WHERE1($i)
-+      dnl deal with false positives from implicit link paths
-+      CMU_TEST_LIBPATH($i, krb)
-+      if test "$ac_cv_found_krb_lib" = "yes" ; then
-+        ac_cv_krb_where_lib=$i
-+        AC_MSG_RESULT(found)
-+        break
-+      else
-+        AC_MSG_RESULT(not found)
-+      fi
-+    done
-+])
-+m4trace:cmulocal/kerberos_v4.m4:284: -1- AC_DEFUN([CMU_KRB4], [
-+AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
-+AC_REQUIRE([CMU_SOCKETS])
-+AC_REQUIRE([CMU_LIBSSL])
-+AC_ARG_WITH(krb4,
-+	[  --with-krb4=PREFIX      Compile with Kerberos 4 support],
-+	[if test "X$with_krb4" = "X"; then
-+		with_krb4=yes
-+	fi])
-+AC_ARG_WITH(krb4-lib,
-+	[  --with-krb4-lib=dir     use kerberos 4 libraries in dir],
-+	[if test "$withval" = "yes" -o "$withval" = "no"; then
-+		AC_MSG_ERROR([No argument for --with-krb4-lib])
-+	fi])
-+AC_ARG_WITH(krb4-include,
-+	[  --with-krb4-include=dir use kerberos 4 headers in dir],
-+	[if test "$withval" = "yes" -o "$withval" = "no"; then
-+		AC_MSG_ERROR([No argument for --with-krb4-include])
-+	fi])
-+
-+	if test "X$with_krb4" != "X"; then
-+	  if test "$with_krb4" != "yes" -a "$with_krb4" != "no"; then
-+	    ac_cv_krb_where_lib=$with_krb4/$CMU_LIB_SUBDIR
-+	    ac_cv_krb_where_inc=$with_krb4/include
-+	  fi
-+	fi
-+       
-+	if test "$with_krb4" != "no"; then
-+	  if test "X$with_krb4_lib" != "X"; then
-+	    ac_cv_krb_where_lib=$with_krb4_lib
-+	  fi
-+	  if test "X$with_krb4_include" != "X"; then
-+	    ac_cv_krb_where_inc=$with_krb4_include
-+	  fi
-+	  if test "X$ac_cv_krb_where_inc" = "X"; then
-+	    CMU_KRB_INC_WHERE(/usr/athena/include /usr/include/kerberosIV /usr/local/include /usr/include/kerberos)
-+	  fi
-+
-+          AC_MSG_CHECKING([if libdes is needed])
-+          AC_TRY_LINK([],[des_quad_cksum();],KRB_DES_LIB="",KRB_DES_LIB="maybe")
-+          if test "X$KRB_DES_LIB" != "X"; then
-+              LIBS="$cmu_save_LIBS -ldes"
-+              AC_TRY_LINK([], [des_quad_cksum();],KRB_DES_LIB="yes")
-+              if test "X$KRB_DES_LIB" = "Xyes"; then
-+                  AC_MSG_RESULT([yes])
-+                  KRB_LIBDES="-ldes"
-+                  KRB_LIBDESA='$(KRB_LIB_DIR)/libdes.a'
-+              else
-+                  LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS"
-+                  AC_TRY_LINK([],
-+                  [des_quad_cksum();],KRB_DES_LIB="libcrypto")
-+                  if test "X$KRB_DES_LIB" = "Xlibcrypto"; then
-+                      AC_MSG_RESULT([libcrypto])
-+                      KRB_LIBDES="$LIBSSL_LIB_FLAGS"
-+                      KRB_LIBDESA="$LIBSSL_LIB_FLAGS"
-+                  else
-+                      LIBS="$cmu_save_LIBS -L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
-+                      AC_TRY_LINK([],
-+                      [des_quad_cksum();],KRB_DES_LIB="libcrypto+descompat")
-+                      if test "X$KRB_DES_LIB" = "Xlibcrypto+descompat"; then
-+                          AC_MSG_RESULT([libcrypto+descompat])
-+                          KRB_LIBDES="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
-+                          KRB_LIBDESA="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
-+                      else
-+                          AC_MSG_RESULT([unknown])
-+                          AC_MSG_ERROR([Could not use -ldes])
-+                      fi 
-+                  fi 
-+              fi 
-+          else
-+             AC_MSG_RESULT([no])
-+          fi
-+          if test "X$ac_cv_krb_where_lib" = "X"; then
-+            CMU_KRB_LIB_WHERE(/usr/athena/$CMU_LIB_SUBDIR /usr/local/$CMU_LIB_SUBDIR /usr/$CMU_LIB_SUBDIR)
-+          fi
-+	fi
-+	  LIBS="${cmu_save_LIBS}"
-+
-+
-+	AC_MSG_CHECKING([whether to include kerberos 4])
-+	if test "X$ac_cv_krb_where_lib" = "X" -o "X$ac_cv_krb_where_inc" = "X"; then
-+	  ac_cv_found_krb=no
-+	  AC_MSG_RESULT(no)
-+	else
-+	  ac_cv_found_krb=yes
-+	  AC_MSG_RESULT(yes)
-+	  KRB_INC_DIR=$ac_cv_krb_where_inc
-+	  KRB_LIB_DIR=$ac_cv_krb_where_lib
-+	  KRB_INC_FLAGS="-I${KRB_INC_DIR}"
-+	  KRB_LIB_FLAGS="-L${KRB_LIB_DIR} -lkrb ${KRB_LIBDES}"
-+	  LIBS="${cmu_save_LIBS} ${KRB_LIB_FLAGS}"
-+	  AC_CHECK_LIB(resolv, dns_lookup, KRB_LIB_FLAGS="${KRB_LIB_FLAGS} -lresolv",,"${KRB_LIB_FLAGS}")
-+	  AC_CHECK_LIB(crypt, crypt, KRB_LIB_FLAGS="${KRB_LIB_FLAGS} -lcrypt",,"${KRB_LIB_FLAGS}")
-+	  LIBS="${LIBS} ${KRB_LIB_FLAGS}"
-+	  AC_CHECK_FUNCS(krb_get_int krb_life_to_time)
-+          AC_SUBST(KRB_INC_FLAGS)
-+          AC_SUBST(KRB_LIB_FLAGS)
-+	  LIBS="${cmu_save_LIBS}"
-+	  AC_DEFINE(HAVE_KRB4,,[Kerberos V4 is present])dnl zephyr uses this
-+	  AC_DEFINE(KERBEROS,,[Use kerberos 4. find out what needs this symbol])
-+	  if test "X$RPATH" = "X"; then
-+		RPATH=""
-+	  fi
-+	  case "${host}" in
-+	    *-*-linux*)
-+	      if test "X$RPATH" = "X"; then
-+	        RPATH="-Wl,-rpath,${KRB_LIB_DIR}"
-+	      else 
-+		RPATH="${RPATH}:${KRB_LIB_DIR}"
-+	      fi
-+	      ;;
-+	    *-*-hpux*)
-+	      if test "X$RPATH" = "X"; then
-+	        RPATH="-Wl,+b${KRB_LIB_DIR}"
-+	      else 
-+		RPATH="${RPATH}:${KRB_LIB_DIR}"
-+	      fi
-+	      ;;
-+	    *-*-irix*)
-+	      if test "X$RPATH" = "X"; then
-+	        RPATH="-Wl,-rpath,${KRB_LIB_DIR}"
-+	      else 
-+		RPATH="${RPATH}:${KRB_LIB_DIR}"
-+	      fi
-+	      ;;
-+	    *-*-solaris2*)
-+	      if test "$ac_cv_prog_gcc" = yes; then
-+		if test "X$RPATH" = "X"; then
-+		  RPATH="-Wl,-R${KRB_LIB_DIR}"
-+		else 
-+		  RPATH="${RPATH}:${KRB_LIB_DIR}"
-+		fi
-+	      else
-+	        RPATH="${RPATH} -R${KRB_LIB_DIR}"
-+	      fi
-+	      ;;
-+	  esac
-+	  AC_SUBST(RPATH)
-+	fi
-+	])
-+m4trace:cmulocal/libssl.m4:13: -1- AC_DEFUN([CMU_LIBSSL_INC_WHERE1], [
-+saved_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$saved_CPPFLAGS -I$1"
-+CMU_CHECK_HEADER_NOCACHE(openssl/ssl.h,
-+ac_cv_found_libssl_inc=yes,
-+ac_cv_found_libssl_inc=no)
-+CPPFLAGS=$saved_CPPFLAGS
-+])
-+m4trace:cmulocal/libssl.m4:28: -1- AC_DEFUN([CMU_LIBSSL_INC_WHERE], [
-+   for i in $1; do
-+      AC_MSG_CHECKING(for libssl headers in $i)
-+      CMU_LIBSSL_INC_WHERE1($i)
-+      CMU_TEST_INCPATH($i, ssl)
-+      if test "$ac_cv_found_libssl_inc" = "yes"; then
-+        ac_cv_libssl_where_inc=$i
-+        AC_MSG_RESULT(found)
-+        break
-+      else
-+        AC_MSG_RESULT(not found)
-+      fi
-+    done
-+])
-+m4trace:cmulocal/libssl.m4:38: -1- AC_DEFUN([CMU_LIBSSL_LIB_WHERE1], [
-+saved_LIBS=$LIBS
-+LIBS="$saved_LIBS -L$1 -lssl -lcrypto $LIB_SOCKET"
-+AC_TRY_LINK(,
-+[SSL_write();],
-+[ac_cv_found_ssl_lib=yes],
-+ac_cv_found_ssl_lib=no)
-+LIBS=$saved_LIBS
-+])
-+m4trace:cmulocal/libssl.m4:54: -1- AC_DEFUN([CMU_LIBSSL_LIB_WHERE], [
-+   for i in $1; do
-+      AC_MSG_CHECKING(for libssl libraries in $i)
-+      CMU_LIBSSL_LIB_WHERE1($i)
-+      dnl deal with false positives from implicit link paths
-+      CMU_TEST_LIBPATH($i, ssl)
-+      if test "$ac_cv_found_ssl_lib" = "yes" ; then
-+        ac_cv_libssl_where_lib=$i
-+        AC_MSG_RESULT(found)
-+        break
-+      else
-+        AC_MSG_RESULT(not found)
-+      fi
-+    done
-+])
-+m4trace:cmulocal/libssl.m4:152: -1- AC_DEFUN([CMU_LIBSSL], [
-+AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
-+AC_REQUIRE([CMU_SOCKETS])
-+AC_ARG_WITH(libssl,
-+	[  --with-libssl=PREFIX      Compile with Libssl support],
-+	[if test "X$with_libssl" = "X"; then
-+		with_libssl=yes
-+	fi])
-+AC_ARG_WITH(libssl-lib,
-+	[  --with-libssl-lib=dir     use libssl libraries in dir],
-+	[if test "$withval" = "yes" -o "$withval" = "no"; then
-+		AC_MSG_ERROR([No argument for --with-libssl-lib])
-+	fi])
-+AC_ARG_WITH(libssl-include,
-+	[  --with-libssl-include=dir use libssl headers in dir],
-+	[if test "$withval" = "yes" -o "$withval" = "no"; then
-+		AC_MSG_ERROR([No argument for --with-libssl-include])
-+	fi])
-+
-+	if test "X$with_libssl" != "X"; then
-+	  if test "$with_libssl" != "yes" -a "$with_libssl" != no; then
-+	    ac_cv_libssl_where_lib=$with_libssl/$CMU_LIB_SUBDIR
-+	    ac_cv_libssl_where_inc=$with_libssl/include
-+	  fi
-+	fi
-+
-+	if test "$with_libssl" != "no"; then 
-+	  if test "X$with_libssl_lib" != "X"; then
-+	    ac_cv_libssl_where_lib=$with_libssl_lib
-+	  fi
-+	  if test "X$ac_cv_libssl_where_lib" = "X"; then
-+	    CMU_LIBSSL_LIB_WHERE(/usr/local/$CMU_LIB_SUBDIR/openssl /usr/$CMU_LIB_SUBDIR/openssl /usr/local/$CMU_LIB_SUBDIR /usr/$CMU_LIB_SUBDIR)
-+	  fi
-+
-+	  if test "X$with_libssl_include" != "X"; then
-+	    ac_cv_libssl_where_inc=$with_libssl_include
-+	  fi
-+	  if test "X$ac_cv_libssl_where_inc" = "X"; then
-+	    CMU_LIBSSL_INC_WHERE(/usr/local/include /usr/include)
-+	  fi
-+	fi
-+
-+	AC_MSG_CHECKING(whether to include libssl)
-+	if test "X$ac_cv_libssl_where_lib" = "X" -a "X$ac_cv_libssl_where_inc" = "X"; then
-+	  ac_cv_found_libssl=no
-+	  AC_MSG_RESULT(no)
-+	else
-+	  ac_cv_found_libssl=yes
-+	  AC_MSG_RESULT(yes)
-+	  LIBSSL_INC_DIR=$ac_cv_libssl_where_inc
-+	  LIBSSL_LIB_DIR=$ac_cv_libssl_where_lib
-+	  LIBSSL_INC_FLAGS="-I${LIBSSL_INC_DIR}"
-+	  LIBSSL_LIB_FLAGS="-L${LIBSSL_LIB_DIR} -lssl -lcrypto"
-+	  if test "X$RPATH" = "X"; then
-+		RPATH=""
-+	  fi
-+	  case "${host}" in
-+	    *-*-linux*)
-+	      if test "X$RPATH" = "X"; then
-+	        RPATH="-Wl,-rpath,${LIBSSL_LIB_DIR}"
-+	      else 
-+ 		RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
-+	      fi
-+	      ;;
-+	    *-*-hpux*)
-+	      if test "X$RPATH" = "X"; then
-+	        RPATH="-Wl,+b${LIBSSL_LIB_DIR}"
-+	      else 
-+		RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
-+	      fi
-+	      ;;
-+	    *-*-irix*)
-+	      if test "X$RPATH" = "X"; then
-+	        RPATH="-Wl,-rpath,${LIBSSL_LIB_DIR}"
-+	      else 
-+		RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
-+	      fi
-+	      ;;
-+	    *-*-solaris2*)
-+	      if test "$ac_cv_prog_gcc" = yes; then
-+		if test "X$RPATH" = "X"; then
-+		  RPATH="-Wl,-R${LIBSSL_LIB_DIR}"
-+		else 
-+		  RPATH="${RPATH}:${LIBSSL_LIB_DIR}"
-+		fi
-+	      else
-+	        RPATH="${RPATH} -R${LIBSSL_LIB_DIR}"
-+	      fi
-+	      ;;
-+	  esac
-+	  AC_SUBST(RPATH)
-+	fi
-+	AC_SUBST(LIBSSL_INC_DIR)
-+	AC_SUBST(LIBSSL_LIB_DIR)
-+	AC_SUBST(LIBSSL_INC_FLAGS)
-+	AC_SUBST(LIBSSL_LIB_FLAGS)
-+	])
-+m4trace:cmulocal/libwrap.m4:30: -1- AC_DEFUN([CMU_LIBWRAP], [
-+AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
-+  AC_REQUIRE([CMU_SOCKETS])
-+  AC_ARG_WITH(libwrap, 
-+              [  --with-libwrap=DIR      use libwrap (rooted in DIR) [yes] ],
-+              with_libwrap=$withval, with_libwrap=yes)
-+  if test "$with_libwrap" != no; then
-+    if test -d "$with_libwrap"; then
-+      CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
-+      LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
-+    fi
-+    cmu_save_LIBS="$LIBS"
-+    AC_CHECK_LIB(wrap, request_init, [
-+		 AC_CHECK_HEADER(tcpd.h,, with_libwrap=no)],
-+		 with_libwrap=no, ${LIB_SOCKET})
-+    LIBS="$cmu_save_LIBS"
-+  fi
-+  AC_MSG_CHECKING(libwrap support)
-+  AC_MSG_RESULT($with_libwrap)
-+  LIB_WRAP=""
-+  if test "$with_libwrap" != no; then
-+    AC_DEFINE(HAVE_LIBWRAP,[],[Do we have TCP wrappers?])
-+    LIB_WRAP="-lwrap"
-+    AC_CHECK_LIB(nsl, yp_get_default_domain, LIB_WRAP="${LIB_WRAP} -lnsl")
-+  fi
-+  AC_SUBST(LIB_WRAP)
-+])
-+m4trace:cmulocal/sasl2.m4:267: -1- AC_DEFUN([SASL_GSSAPI_CHK], [AC_REQUIRE([SASL2_CRYPT_CHK])
-+AC_REQUIRE([CMU_SOCKETS])
-+AC_ARG_ENABLE([gssapi],
-+              [AC_HELP_STRING([--enable-gssapi=<DIR>],
-+                              [enable GSSAPI authentication [yes]])],
-+              [gssapi=$enableval],
-+              [gssapi=yes])
-+AC_ARG_WITH([gss_impl],
-+            [AC_HELP_STRING([--with-gss_impl={heimdal|mit|cybersafe|seam|auto}],
-+                            [choose specific GSSAPI implementation [[auto]]])],
-+            [gss_impl=$withval],
-+            [gss_impl=auto])
-+
-+if test "$gssapi" != no; then
-+  platform=
-+  case "${host}" in
-+    *-*-linux*)
-+      platform=__linux
-+      ;;
-+    *-*-hpux*)
-+      platform=__hpux
-+      ;;
-+    *-*-irix*)
-+      platform=__irix
-+      ;;
-+    *-*-solaris2*)
-+# When should we use __sunos?
-+      platform=__solaris
-+      ;;
-+    *-*-aix*)
-+###_AIX
-+      platform=__aix
-+      ;;
-+    *)
-+      AC_WARN([The system type is not recognized. If you believe that CyberSafe GSSAPI works on this platform, please update the configure script])
-+      if test "$gss_impl" = "cybersafe"; then
-+        AC_ERROR([CyberSafe was forced, cannot continue as platform is not supported])
-+      fi
-+      ;;
-+  esac
-+
-+  cmu_saved_CPPFLAGS=$CPPFLAGS
-+
-+  if test -d ${gssapi}; then
-+    CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-+# We want to keep -I in our CPPFLAGS, but only if we succeed
-+    cmu_saved_CPPFLAGS=$CPPFLAGS
-+### I am not sure how useful is this (and whether this is required at all
-+### especially when we have to provide two -L flags for new CyberSafe
-+    LDFLAGS="$LDFLAGS -L$gssapi/lib"
-+
-+    if test -n "$platform"; then
-+      if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
-+        CPPFLAGS="$CPPFLAGS -D$platform"
-+        if test -d "${gssapi}/appsec-sdk/include"; then
-+          CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
-+        fi
-+      fi
-+    fi
-+  fi
-+  AC_CHECK_HEADER([gssapi.h],
-+                  [AC_DEFINE(HAVE_GSSAPI_H,,
-+                             [Define if you have the gssapi.h header file])],
-+                  [AC_CHECK_HEADER([gssapi/gssapi.h],,
-+                                   [AC_WARN([Disabling GSSAPI - no include files found]); gssapi=no])])
-+
-+  CPPFLAGS=$cmu_saved_CPPFLAGS
-+
-+fi
-+
-+if test "$gssapi" != no; then
-+  # We need to find out which gssapi implementation we are
-+  # using. Supported alternatives are: MIT Kerberos 5,
-+  # Heimdal Kerberos 5 (http://www.pdc.kth.se/heimdal),
-+  # CyberSafe Kerberos 5 (http://www.cybersafe.com/)
-+  # and Sun SEAM (http://wwws.sun.com/software/security/kerberos/)
-+  #
-+  # The choice is reflected in GSSAPIBASE_LIBS
-+
-+  AC_CHECK_LIB(resolv,res_search)
-+  if test -d ${gssapi}; then
-+     gssapi_dir="${gssapi}/lib"
-+     GSSAPIBASE_LIBS="-L$gssapi_dir"
-+     GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
-+  else
-+     # FIXME: This is only used for building cyrus, and then only as
-+     # a real hack.  it needs to be fixed.
-+     gssapi_dir="/usr/local/lib"
-+  fi
-+
-+  # Check a full link against the Heimdal libraries.
-+  # If this fails, check a full link against the MIT libraries.
-+  # If this fails, check a full link against the CyberSafe libraries.
-+  # If this fails, check a full link against the Solaris 8 and up libgss.
-+
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
-+    gss_failed=0
-+    AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",gss_failed=1,
-+                 ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET})
-+    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
-+      gss_impl="failed"
-+    fi
-+  fi
-+
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
-+    # check for libkrb5support first
-+    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
-+
-+    gss_failed=0
-+    AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
-+                 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
-+    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
-+      gss_impl="failed"
-+    fi
-+  fi
-+
-+  # For Cybersafe one has to set a platform define in order to make compilation work
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "cybersafe"; then
-+
-+    cmu_saved_CPPFLAGS=$CPPFLAGS
-+    cmu_saved_GSSAPIBASE_LIBS=$GSSAPIBASE_LIBS
-+# FIXME - Note that the libraries are in .../lib64 for 64bit kernels
-+    if test -d "${gssapi}/appsec-rt/lib"; then
-+      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -L${gssapi}/appsec-rt/lib"
-+    fi
-+    CPPFLAGS="$CPPFLAGS -D$platform"
-+    if test -d "${gssapi}/appsec-sdk/include"; then
-+      CPPFLAGS="$CPPFLAGS -I${gssapi}/appsec-sdk/include"
-+    fi
-+
-+    gss_failed=0
-+
-+# Check for CyberSafe with two libraries first, than fall back to a single 
-+# library (older CyberSafe)
-+
-+    unset ac_cv_lib_gss_csf_gss_acq_user
-+    AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe03",
-+                 [unset ac_cv_lib_gss_csf_gss_acq_user;
-+                  AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe",
-+                               gss_failed=1,$GSSAPIBASE_LIBS -lgss)],
-+                 [${GSSAPIBASE_LIBS} -lgss -lcstbk5])
-+
-+    if test "$gss_failed" = "1"; then
-+# Restore variables
-+      GSSAPIBASE_LIBS=$cmu_saved_GSSAPIBASE_LIBS
-+      CPPFLAGS=$cmu_saved_CPPFLAGS
-+
-+      if test "$gss_impl" != "auto"; then
-+        gss_impl="failed"
-+      fi
-+    fi
-+  fi
-+
-+  if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
-+    gss_failed=0
-+    AC_CHECK_LIB(gss,gss_unwrap,gss_impl="seam",gss_failed=1,-lgss)
-+    if test "$gss_impl" != "auto" -a "$gss_failed" = "1"; then
-+      gss_impl="failed"
-+    fi
-+  fi
-+
-+  if test "$gss_impl" = "mit"; then
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP}"
-+    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
-+  elif test "$gss_impl" = "heimdal"; then
-+    CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-+    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
-+  elif test "$gss_impl" = "cybersafe03"; then
-+# Version of CyberSafe with two libraries
-+    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss -lcstbk5"
-+    # there is no static libgss for CyberSafe
-+    GSSAPIBASE_STATIC_LIBS=none
-+  elif test "$gss_impl" = "cybersafe"; then
-+    CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgss"
-+    # there is no static libgss for CyberSafe
-+    GSSAPIBASE_STATIC_LIBS=none
-+  elif test "$gss_impl" = "seam"; then
-+    GSSAPIBASE_LIBS=-lgss
-+    # there is no static libgss on Solaris 8 and up
-+    GSSAPIBASE_STATIC_LIBS=none
-+  elif test "$gss_impl" = "failed"; then
-+    gssapi="no"
-+    GSSAPIBASE_LIBS=
-+    GSSAPIBASE_STATIC_LIBS=
-+    AC_WARN([Disabling GSSAPI - specified library not found])
-+  else
-+    gssapi="no"
-+    GSSAPIBASE_LIBS=
-+    GSSAPIBASE_STATIC_LIBS=
-+    AC_WARN([Disabling GSSAPI - no library])
-+  fi
-+fi
-+
-+#
-+# Cybersafe defines both GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME
-+# in gssapi\rfckrb5.h
-+#
-+if test "$gssapi" != "no"; then
-+  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes,
-+                 [#include <gssapi/gssapi.h>
-+                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
-+                    hostbased_service_gss_nt_yes
-+                  #endif],
-+                 [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+                            [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])],
-+                 [AC_WARN([Cybersafe define not found])])
-+
-+  elif test "$ac_cv_header_gssapi_h" = "yes"; then
-+    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
-+                    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+                               [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])])
-+  elif test "$ac_cv_header_gssapi_gssapi_h"; then
-+    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h,
-+                    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+                               [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])])
-+  fi
-+
-+  if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
-+    AC_EGREP_CPP(user_name_yes_gss_nt,
-+                 [#include <gssapi/gssapi.h>
-+                  #ifdef GSS_C_NT_USER_NAME
-+                   user_name_yes_gss_nt
-+                  #endif],
-+                 [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
-+                            [Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])],
-+                 [AC_WARN([Cybersafe define not found])])
-+  elif test "$ac_cv_header_gssapi_h" = "yes"; then
-+    AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h,
-+                    [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
-+                               [Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])])
-+  elif test "$ac_cv_header_gssapi_gssapi_h"; then
-+    AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi/gssapi.h,
-+                    [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
-+                               [Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])])
-+  fi
-+fi
-+
-+GSSAPI_LIBS=""
-+AC_MSG_CHECKING([GSSAPI])
-+if test "$gssapi" != no; then
-+  AC_MSG_RESULT([with implementation ${gss_impl}])
-+  AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
-+  SASL_MECHS="$SASL_MECHS libgssapiv2.la"
-+  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
-+  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
-+
-+  cmu_save_LIBS="$LIBS"
-+  LIBS="$LIBS $GSSAPIBASE_LIBS"
-+  AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
-+  LIBS="$cmu_save_LIBS"
-+else
-+  AC_MSG_RESULT([disabled])
-+fi
-+AC_SUBST(GSSAPI_LIBS)
-+AC_SUBST(GSSAPIBASE_LIBS)
-+])
-+m4trace:cmulocal/sasl2.m4:274: -1- AC_DEFUN([SASL_SET_GSSAPI_LIBS], [SASL_GSSAPI_LIBS_SET="yes"
-+])
-+m4trace:cmulocal/sasl2.m4:403: -1- AC_DEFUN([CMU_SASL2], [AC_REQUIRE([SASL_GSSAPI_CHK])
-+
-+AC_ARG_WITH(sasl,
-+            [AC_HELP_STRING([--with-sasl=DIR],[Compile with libsasl2 in <DIR>])],
-+            with_sasl="$withval",
-+            with_sasl="yes")
-+
-+AC_ARG_WITH(staticsasl,
-+            [AC_HELP_STRING([--with-staticsasl=DIR],
-+                            [Compile with staticly linked libsasl2 in <DIR>])],
-+            [with_staticsasl="$withval";
-+             if test $with_staticsasl != "no"; then
-+               using_static_sasl="static"
-+             fi],
-+            [with_staticsasl="no"; using_static_sasl="no"])
-+
-+SASLFLAGS=""
-+LIB_SASL=""
-+
-+cmu_saved_CPPFLAGS=$CPPFLAGS
-+cmu_saved_LDFLAGS=$LDFLAGS
-+cmu_saved_LIBS=$LIBS
-+
-+if test ${with_staticsasl} != "no"; then
-+  if test -d ${with_staticsasl}; then
-+    if test -d ${with_staticsasl}/lib64 ; then
-+      ac_cv_sasl_where_lib=${with_staticsasl}/lib64
-+    else
-+      ac_cv_sasl_where_lib=${with_staticsasl}/lib
-+    fi
-+    ac_cv_sasl_where_lib=${with_staticsasl}/lib
-+    ac_cv_sasl_where_inc=${with_staticsasl}/include
-+
-+    SASLFLAGS="-I$ac_cv_sasl_where_inc"
-+    LIB_SASL="-L$ac_cv_sasl_where_lib"
-+    CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
-+    LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
-+  else
-+    with_staticsasl="/usr"
-+  fi
-+
-+  AC_CHECK_HEADER(sasl/sasl.h,
-+                  [AC_CHECK_HEADER(sasl/saslutil.h,
-+                                   [for i42 in lib64 lib; do
-+                                      if test -r ${with_staticsasl}/$i42/libsasl2.a; then
-+                                        ac_cv_found_sasl=yes
-+                                        AC_MSG_CHECKING([for static libsasl])
-+                                        LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
-+                                      fi
-+                                    done
-+                                    if test ! "$ac_cv_found_sasl" = "yes"; then
-+                                      AC_MSG_CHECKING([for static libsasl])
-+                                      AC_ERROR([Could not find ${with_staticsasl}/lib*/libsasl2.a])
-+                                    fi])])
-+
-+  AC_MSG_RESULT([found])
-+
-+  if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
-+    LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
-+  else
-+    SASL_GSSAPI_LIBS_SET=""
-+    cmu_saved_LIBS="$GSSAPIBASE_STATIC_LIBS $cmu_saved_LIBS" 
-+  fi
-+fi
-+
-+if test -d ${with_sasl}; then
-+  ac_cv_sasl_where_lib=${with_sasl}/lib
-+  ac_cv_sasl_where_inc=${with_sasl}/include
-+
-+  DYNSASLFLAGS="-I$ac_cv_sasl_where_inc"
-+  if test "$ac_cv_sasl_where_lib" != ""; then
-+    CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, LIB_DYN_SASL)
-+  fi
-+  LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
-+  CPPFLAGS="${cmu_saved_CPPFLAGS} -I${ac_cv_sasl_where_inc}"
-+  LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
-+fi
-+
-+# be sure to check for a SASLv2 specific function
-+AC_CHECK_HEADER(sasl/sasl.h,
-+                [AC_CHECK_HEADER(sasl/saslutil.h,
-+                                 [AC_CHECK_LIB(sasl2, prop_get, 
-+                                               ac_cv_found_sasl=yes,
-+                                               ac_cv_found_sasl=no)],
-+                                 ac_cv_found_sasl=no)],
-+                ac_cv_found_sasl=no)
-+
-+if test "$ac_cv_found_sasl" = "yes"; then
-+  if test "$ac_cv_sasl_where_lib" != ""; then
-+    CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, DYNLIB_SASL)
-+  fi
-+  DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
-+  if test "$using_static_sasl" != "static"; then
-+    LIB_SASL=$DYNLIB_SASL
-+    SASLFLAGS=$DYNSASLFLAGS
-+  fi
-+else
-+  DYNLIB_SASL=""
-+  DYNSASLFLAGS=""
-+  using_static_sasl="staticonly"
-+fi
-+
-+if test "x$SASL_GSSAPI_LIBS_SET" != "x"; then
-+  SASL_GSSAPI_LIBS_SET=""
-+  cmu_saved_LIBS="$GSSAPIBASE_LIBS $cmu_saved_LIBS" 
-+fi
-+
-+LIBS="$cmu_saved_LIBS"
-+LDFLAGS="$cmu_saved_LDFLAGS"
-+CPPFLAGS="$cmu_saved_CPPFLAGS"
-+
-+AC_SUBST(LIB_DYN_SASL)
-+AC_SUBST(DYNSASLFLAGS)
-+AC_SUBST(LIB_SASL)
-+AC_SUBST(SASLFLAGS)
-+])
-+m4trace:cmulocal/sasl2.m4:413: -1- AC_DEFUN([CMU_SASL2_REQUIRED], [AC_REQUIRE([CMU_SASL2])
-+if test "$ac_cv_found_sasl" != "yes"; then
-+  AC_ERROR([Cannot continue without libsasl2.
-+Get it from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/.])
-+fi])
-+m4trace:cmulocal/sasl2.m4:444: -1- AC_DEFUN([CMU_SASL2_REQUIRE_VER], [AC_REQUIRE([CMU_SASL2_REQUIRED])
-+
-+cmu_saved_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS="$CPPFLAGS $SASLFLAGS"
-+
-+AC_TRY_CPP([
-+#include <sasl/sasl.h>
-+
-+#ifndef SASL_VERSION_MAJOR
-+#error SASL_VERSION_MAJOR not defined
-+#endif
-+#ifndef SASL_VERSION_MINOR
-+#error SASL_VERSION_MINOR not defined
-+#endif
-+#ifndef SASL_VERSION_STEP
-+#error SASL_VERSION_STEP not defined
-+#endif
-+
-+#if SASL_VERSION_MAJOR < $1 || SASL_VERSION_MINOR < $2 || SASL_VERSION_STEP < $3
-+#error SASL version is less than $1.$2.$3
-+#endif
-+],,
-+           [AC_ERROR([Incorrect SASL headers found.  This package requires SASL $1.$2.$3 or newer.])])
-+
-+CPPFLAGS=$cmu_saved_CPPFLAGS
-+])
-+m4trace:cmulocal/sasl2.m4:461: -1- AC_DEFUN([CMU_SASL2_CHECKAPOP_REQUIRED], [AC_REQUIRE([CMU_SASL2_REQUIRED])
-+
-+cmu_saved_LDFLAGS=$LDFLAGS
-+
-+LDFLAGS="$LDFLAGS $LIB_SASL"
-+
-+AC_CHECK_LIB(sasl2, sasl_checkapop,
-+             [AC_DEFINE(HAVE_APOP,[],[Does SASL support APOP?])],
-+             [AC_MSG_ERROR([libsasl2 without working sasl_checkapop.  Cannot continue.])])
-+
-+LDFLAGS=$cmu_saved_LDFLAGS
-+])
-+m4trace:cmulocal/sasl2.m4:472: -1- AC_DEFUN([SASL2_CRYPT_CHK], [AC_CHECK_FUNC(crypt, cmu_have_crypt=yes,
-+               [AC_CHECK_LIB(crypt, crypt,
-+                             LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes,
-+                             cmu_have_crypt=no)])
-+AC_SUBST(LIB_CRYPT)
-+])
-+m4trace:cmulocal/ucdsnmp.m4:71: -1- AC_DEFUN([CMU_UCDSNMP], [
-+AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
-+  AC_REQUIRE([CMU_SOCKETS])
-+  AC_ARG_WITH(snmp, 
-+              [  --with-snmp=DIR         use ucd|net snmp (rooted in DIR) [yes] ],
-+              with_snmp=$withval, with_snmp=yes)
-+
-+  dnl
-+  dnl Maintain backwards compatibility with old --with-ucdsnmp option
-+  dnl
-+  AC_ARG_WITH(ucdsnmp,, with_snmp=$withval,)
-+
-+if test "$with_snmp" != "no"; then
-+
-+  dnl
-+  dnl Try net-snmp first
-+  dnl
-+  if test "$with_snmp" = "yes"; then
-+    AC_PATH_PROG(SNMP_CONFIG,net-snmp-config,,[/usr/local/bin:$PATH])
-+  else
-+    SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
-+  fi
-+
-+  if test -x "$SNMP_CONFIG"; then
-+    AC_MSG_CHECKING(NET SNMP libraries)
-+
-+    SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
-+    SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-+
-+    if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
-+      CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
-+      LIB_UCDSNMP=$SNMP_LIBS
-+      AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?])
-+      AC_SUBST(LIB_UCDSNMP)
-+      AC_MSG_RESULT(yes)
-+    else
-+      AC_MSG_RESULT(no)
-+      AC_MSG_WARN([Could not find the required paths. Please check your net-snmp installation.])
-+    fi
-+  else
-+    dnl
-+    dnl Try ucd-snmp if net-snmp test failed
-+    dnl
-+    if test "$with_snmp" != no; then
-+      if test -d "$with_snmp"; then
-+        CPPFLAGS="$CPPFLAGS -I${with_snmp}/include"
-+        LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
-+      fi
-+      cmu_save_LIBS="$LIBS"
-+      AC_CHECK_LIB(snmp, sprint_objid, [
-+  		 AC_CHECK_HEADER(ucd-snmp/version.h,, with_snmp=no)],
-+  		 with_snmp=no, ${LIB_SOCKET})
-+      LIBS="$cmu_save_LIBS"
-+    fi
-+    AC_MSG_CHECKING(UCD SNMP libraries)
-+    AC_MSG_RESULT($with_snmp)
-+    LIB_UCDSNMP=""
-+    if test "$with_snmp" != no; then
-+      AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
-+      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+      AC_CHECK_LIB(rpm, rpmdbOpen,
-+		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
-+    fi
-+    AC_SUBST(LIB_UCDSNMP)
-+  fi
-+fi
-+
-+])
-+m4trace:configure.in:49: -1- AC_INIT([imap/imapd.c])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([^_?A[CHUM]_])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([_AC_])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^AS_FLAGS$])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([^_?m4_])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([^dnl$])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([^_?AS_])
-+m4trace:configure.in:49: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([SHELL])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^SHELL$])
-+m4trace:configure.in:49: -1- AC_SUBST([PATH_SEPARATOR])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE_NAME])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_NAME$])
-+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE_STRING])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_STRING$])
-+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-+m4trace:configure.in:49: -1- AC_SUBST([exec_prefix], [NONE])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([exec_prefix])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^exec_prefix$])
-+m4trace:configure.in:49: -1- AC_SUBST([prefix], [NONE])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([prefix])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^prefix$])
-+m4trace:configure.in:49: -1- AC_SUBST([program_transform_name], [s,x,x,])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([program_transform_name])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^program_transform_name$])
-+m4trace:configure.in:49: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([bindir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^bindir$])
-+m4trace:configure.in:49: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([sbindir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^sbindir$])
-+m4trace:configure.in:49: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([libexecdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^libexecdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([datarootdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^datarootdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([datadir], ['${datarootdir}'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([datadir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^datadir$])
-+m4trace:configure.in:49: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([sysconfdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^sysconfdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([sharedstatedir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^sharedstatedir$])
-+m4trace:configure.in:49: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([localstatedir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^localstatedir$])
-+m4trace:configure.in:49: -1- AC_SUBST([includedir], ['${prefix}/include'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([includedir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^includedir$])
-+m4trace:configure.in:49: -1- AC_SUBST([oldincludedir], ['/usr/include'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([oldincludedir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^oldincludedir$])
-+m4trace:configure.in:49: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-+				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
-+				     ['${datarootdir}/doc/${PACKAGE}'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([docdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^docdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([infodir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^infodir$])
-+m4trace:configure.in:49: -1- AC_SUBST([htmldir], ['${docdir}'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([htmldir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^htmldir$])
-+m4trace:configure.in:49: -1- AC_SUBST([dvidir], ['${docdir}'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([dvidir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^dvidir$])
-+m4trace:configure.in:49: -1- AC_SUBST([pdfdir], ['${docdir}'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([pdfdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^pdfdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([psdir], ['${docdir}'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([psdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^psdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([libdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^libdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([localedir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^localedir$])
-+m4trace:configure.in:49: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([mandir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^mandir$])
-+m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_NAME$])
-+m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
-+#undef PACKAGE_NAME])
-+m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-+m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME])
-+m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-+m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
-+#undef PACKAGE_VERSION])
-+m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_STRING$])
-+m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING])
-+m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-+m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT])
-+m4trace:configure.in:49: -1- AC_SUBST([DEFS])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([DEFS])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^DEFS$])
-+m4trace:configure.in:49: -1- AC_SUBST([ECHO_C])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([ECHO_C])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^ECHO_C$])
-+m4trace:configure.in:49: -1- AC_SUBST([ECHO_N])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([ECHO_N])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^ECHO_N$])
-+m4trace:configure.in:49: -1- AC_SUBST([ECHO_T])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([ECHO_T])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^ECHO_T$])
-+m4trace:configure.in:49: -1- AC_SUBST([LIBS])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([LIBS])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^LIBS$])
-+m4trace:configure.in:49: -1- AC_SUBST([build_alias])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([build_alias])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^build_alias$])
-+m4trace:configure.in:49: -1- AC_SUBST([host_alias])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([host_alias])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^host_alias$])
-+m4trace:configure.in:49: -1- AC_SUBST([target_alias])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([target_alias])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^target_alias$])
-+m4trace:configure.in:51: -1- AC_CONFIG_HEADERS([config.h])
-+m4trace:configure.in:52: -1- AC_CANONICAL_HOST
-+m4trace:configure.in:52: -1- AC_CANONICAL_BUILD
-+m4trace:configure.in:52: -1- AC_REQUIRE_AUX_FILE([config.sub])
-+m4trace:configure.in:52: -1- AC_REQUIRE_AUX_FILE([config.guess])
-+m4trace:configure.in:52: -1- AC_SUBST([build], [$ac_cv_build])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([build])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^build$])
-+m4trace:configure.in:52: -1- AC_SUBST([build_cpu], [$[1]])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([build_cpu])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^build_cpu$])
-+m4trace:configure.in:52: -1- AC_SUBST([build_vendor], [$[2]])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([build_vendor])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^build_vendor$])
-+m4trace:configure.in:52: -1- AC_SUBST([build_os])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([build_os])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^build_os$])
-+m4trace:configure.in:52: -1- AC_SUBST([host], [$ac_cv_host])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([host])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^host$])
-+m4trace:configure.in:52: -1- AC_SUBST([host_cpu], [$[1]])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([host_cpu])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^host_cpu$])
-+m4trace:configure.in:52: -1- AC_SUBST([host_vendor], [$[2]])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([host_vendor])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^host_vendor$])
-+m4trace:configure.in:52: -1- AC_SUBST([host_os])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([host_os])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^host_os$])
-+m4trace:configure.in:57: -1- AC_SUBST([WARNERROR])
-+m4trace:configure.in:57: -1- AC_SUBST_TRACE([WARNERROR])
-+m4trace:configure.in:57: -1- m4_pattern_allow([^WARNERROR$])
-+m4trace:configure.in:61: -1- AC_DEFINE_TRACE_LITERAL([EXTRA_IDENT])
-+m4trace:configure.in:61: -1- m4_pattern_allow([^EXTRA_IDENT$])
-+m4trace:configure.in:61: -1- AH_OUTPUT([EXTRA_IDENT], [/* Extra version information for imap/version.h */
-+#undef EXTRA_IDENT])
-+m4trace:configure.in:63: -1- AC_SUBST([MAKEDEPEND])
-+m4trace:configure.in:63: -1- AC_SUBST_TRACE([MAKEDEPEND])
-+m4trace:configure.in:63: -1- m4_pattern_allow([^MAKEDEPEND$])
-+m4trace:configure.in:69: -2- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+configure.in:69: the top level])
-+m4trace:configure.in:73: -1- AC_SUBST([cyrus_prefix])
-+m4trace:configure.in:73: -1- AC_SUBST_TRACE([cyrus_prefix])
-+m4trace:configure.in:73: -1- m4_pattern_allow([^cyrus_prefix$])
-+m4trace:configure.in:74: -1- AC_DEFINE_TRACE_LITERAL([CYRUS_PATH])
-+m4trace:configure.in:74: -1- m4_pattern_allow([^CYRUS_PATH$])
-+m4trace:configure.in:74: -1- AH_OUTPUT([CYRUS_PATH], [/* Where will we be installed? */
-+#undef CYRUS_PATH])
-+m4trace:configure.in:77: -1- AC_SUBST([service_path])
-+m4trace:configure.in:77: -1- AC_SUBST_TRACE([service_path])
-+m4trace:configure.in:77: -1- m4_pattern_allow([^service_path$])
-+m4trace:configure.in:78: -1- AC_DEFINE_TRACE_LITERAL([SERVICE_PATH])
-+m4trace:configure.in:78: -1- m4_pattern_allow([^SERVICE_PATH$])
-+m4trace:configure.in:78: -1- AH_OUTPUT([SERVICE_PATH], [/* Directiory to use for service binaries */
-+#undef SERVICE_PATH])
-+m4trace:configure.in:81: -1- AC_SUBST([cyrus_user])
-+m4trace:configure.in:81: -1- AC_SUBST_TRACE([cyrus_user])
-+m4trace:configure.in:81: -1- m4_pattern_allow([^cyrus_user$])
-+m4trace:configure.in:82: -1- AC_DEFINE_TRACE_LITERAL([CYRUS_USER])
-+m4trace:configure.in:82: -1- m4_pattern_allow([^CYRUS_USER$])
-+m4trace:configure.in:82: -1- AH_OUTPUT([CYRUS_USER], [/* What user will we run as? */
-+#undef CYRUS_USER])
-+m4trace:configure.in:85: -1- AC_SUBST([cyrus_group])
-+m4trace:configure.in:85: -1- AC_SUBST_TRACE([cyrus_group])
-+m4trace:configure.in:85: -1- m4_pattern_allow([^cyrus_group$])
-+m4trace:configure.in:92: -1- AC_DEFINE_TRACE_LITERAL([SYSCONFDIR])
-+m4trace:configure.in:92: -1- m4_pattern_allow([^SYSCONFDIR$])
-+m4trace:configure.in:92: -1- AH_OUTPUT([SYSCONFDIR], [/* Config File Location */
-+#undef SYSCONFDIR])
-+m4trace:configure.in:94: -1- AC_PROG_CC
-+m4trace:configure.in:94: -1- AC_SUBST([CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([CFLAGS])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CFLAGS])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CFLAGS$])
-+m4trace:configure.in:94: -1- AC_SUBST([LDFLAGS])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([LDFLAGS])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^LDFLAGS$])
-+m4trace:configure.in:94: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:94: -1- AC_SUBST([CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([ac_ct_CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([ac_ct_CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^ac_ct_CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([EXEEXT])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^EXEEXT$])
-+m4trace:configure.in:94: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([OBJEXT])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^OBJEXT$])
-+m4trace:configure.in:95: -1- AC_PROG_RANLIB
-+m4trace:configure.in:95: -1- AC_SUBST([RANLIB])
-+m4trace:configure.in:95: -1- AC_SUBST_TRACE([RANLIB])
-+m4trace:configure.in:95: -1- m4_pattern_allow([^RANLIB$])
-+m4trace:configure.in:96: -1- AC_PROG_MAKE_SET
-+m4trace:configure.in:96: -1- AC_SUBST([SET_MAKE])
-+m4trace:configure.in:96: -1- AC_SUBST_TRACE([SET_MAKE])
-+m4trace:configure.in:96: -1- m4_pattern_allow([^SET_MAKE$])
-+m4trace:configure.in:97: -1- AC_PROG_INSTALL
-+m4trace:configure.in:97: -1- AC_REQUIRE_AUX_FILE([install-sh])
-+m4trace:configure.in:97: -1- AC_SUBST([INSTALL_PROGRAM])
-+m4trace:configure.in:97: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-+m4trace:configure.in:97: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-+m4trace:configure.in:97: -1- AC_SUBST([INSTALL_SCRIPT])
-+m4trace:configure.in:97: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-+m4trace:configure.in:97: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-+m4trace:configure.in:97: -1- AC_SUBST([INSTALL_DATA])
-+m4trace:configure.in:97: -1- AC_SUBST_TRACE([INSTALL_DATA])
-+m4trace:configure.in:97: -1- m4_pattern_allow([^INSTALL_DATA$])
-+m4trace:configure.in:98: -1- AH_OUTPUT([_ALL_SOURCE], [/* Define to 1 if on AIX 3.
-+   System headers sometimes define this.
-+   We just want to avoid a redefinition error message.  */
-+@%:@ifndef _ALL_SOURCE
-+@%:@ undef _ALL_SOURCE
-+@%:@endif])
-+m4trace:configure.in:98: -1- AC_PROG_CPP
-+m4trace:configure.in:98: -1- AC_SUBST([CPP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([CPP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^CPP$])
-+m4trace:configure.in:98: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:98: -1- AC_SUBST([CPP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([CPP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^CPP$])
-+m4trace:configure.in:98: -1- AC_SUBST([GREP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([GREP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^GREP$])
-+m4trace:configure.in:98: -1- AC_SUBST([GREP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([GREP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^GREP$])
-+m4trace:configure.in:98: -1- AC_SUBST([EGREP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([EGREP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^EGREP$])
-+m4trace:configure.in:98: -1- AC_SUBST([EGREP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([EGREP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^EGREP$])
-+m4trace:configure.in:98: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^_ALL_SOURCE$])
-+m4trace:configure.in:100: -1- AC_PROG_AWK
-+m4trace:configure.in:100: -1- AC_SUBST([AWK])
-+m4trace:configure.in:100: -1- AC_SUBST_TRACE([AWK])
-+m4trace:configure.in:100: -1- m4_pattern_allow([^AWK$])
-+m4trace:configure.in:101: -1- AC_C_CONST
-+m4trace:configure.in:101: -1- AC_DEFINE_TRACE_LITERAL([const])
-+m4trace:configure.in:101: -1- m4_pattern_allow([^const$])
-+m4trace:configure.in:101: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
-+#undef const])
-+m4trace:configure.in:108: -1- AC_C_INLINE
-+m4trace:configure.in:108: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
-+   calls it, or to nothing if \'inline\' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif])
-+m4trace:configure.in:110: -1- CMU_C___ATTRIBUTE__
-+m4trace:configure.in:110: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
-+cmulocal/c-attribute.m4:30: CMU_C___ATTRIBUTE__ is expanded from...
-+configure.in:110: the top level])
-+m4trace:configure.in:110: -1- AC_DEFINE_TRACE_LITERAL([HAVE___ATTRIBUTE__])
-+m4trace:configure.in:110: -1- m4_pattern_allow([^HAVE___ATTRIBUTE__$])
-+m4trace:configure.in:110: -1- AH_OUTPUT([HAVE___ATTRIBUTE__], [/* define if your compiler has __attribute__ */
-+#undef HAVE___ATTRIBUTE__])
-+m4trace:configure.in:111: -1- CMU_C_FPIC
-+m4trace:configure.in:111: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
-+cmulocal/c-fpic.m4:34: CMU_C_FPIC is expanded from...
-+configure.in:111: the top level])
-+m4trace:configure.in:113: -1- AC_HEADER_STDC
-+m4trace:configure.in:113: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-+m4trace:configure.in:113: -1- m4_pattern_allow([^STDC_HEADERS$])
-+m4trace:configure.in:113: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS])
-+m4trace:configure.in:113: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H])
-+m4trace:configure.in:113: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
-+m4trace:configure.in:113: -1- m4_pattern_allow([^SIZEOF_LONG$])
-+m4trace:configure.in:113: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of `long\', as computed by sizeof. */
-+#undef SIZEOF_LONG])
-+m4trace:configure.in:116: -1- CMU_GUESS_RUNPATH_SWITCH
-+m4trace:configure.in:118: -1- AC_CHECK_HEADERS([unistd.h sys/select.h sys/param.h stdarg.h])
-+m4trace:configure.in:118: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H])
-+m4trace:configure.in:118: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
-+#undef HAVE_SYS_SELECT_H])
-+m4trace:configure.in:118: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
-+#undef HAVE_SYS_PARAM_H])
-+m4trace:configure.in:118: -1- AH_OUTPUT([HAVE_STDARG_H], [/* Define to 1 if you have the <stdarg.h> header file. */
-+#undef HAVE_STDARG_H])
-+m4trace:configure.in:119: -1- AC_LIBSOURCE([memmove.c])
-+m4trace:configure.in:119: -1- AC_LIBSOURCE([strcasecmp.c])
-+m4trace:configure.in:119: -1- AC_LIBSOURCE([ftruncate.c])
-+m4trace:configure.in:119: -1- AC_LIBSOURCE([strerror.c])
-+m4trace:configure.in:119: -1- AC_CHECK_FUNCS([memmove strcasecmp ftruncate strerror], [], [_AC_LIBOBJ($ac_func)])
-+m4trace:configure.in:119: -1- AH_OUTPUT([HAVE_MEMMOVE], [/* Define to 1 if you have the `memmove\' function. */
-+#undef HAVE_MEMMOVE])
-+m4trace:configure.in:119: -1- AH_OUTPUT([HAVE_STRCASECMP], [/* Define to 1 if you have the `strcasecmp\' function. */
-+#undef HAVE_STRCASECMP])
-+m4trace:configure.in:119: -1- AH_OUTPUT([HAVE_FTRUNCATE], [/* Define to 1 if you have the `ftruncate\' function. */
-+#undef HAVE_FTRUNCATE])
-+m4trace:configure.in:119: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
-+#undef HAVE_STRERROR])
-+m4trace:configure.in:119: -1- AC_SUBST([LIB@&t at OBJS], ["$LIB@&t at OBJS $ac_func.$ac_objext"])
-+m4trace:configure.in:119: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
-+m4trace:configure.in:119: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-+m4trace:configure.in:120: -1- AC_CHECK_FUNCS([strlcat strlcpy])
-+m4trace:configure.in:120: -1- AH_OUTPUT([HAVE_STRLCAT], [/* Define to 1 if you have the `strlcat\' function. */
-+#undef HAVE_STRLCAT])
-+m4trace:configure.in:120: -1- AH_OUTPUT([HAVE_STRLCPY], [/* Define to 1 if you have the `strlcpy\' function. */
-+#undef HAVE_STRLCPY])
-+m4trace:configure.in:121: -1- AC_HEADER_DIRENT
-+m4trace:configure.in:121: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
-+   */
-+#undef HAVE_DIRENT_H])
-+m4trace:configure.in:121: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
-+   */
-+#undef HAVE_SYS_NDIR_H])
-+m4trace:configure.in:121: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
-+   */
-+#undef HAVE_SYS_DIR_H])
-+m4trace:configure.in:121: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
-+#undef HAVE_NDIR_H])
-+m4trace:configure.in:124: -1- CMU_SOCKETS
-+m4trace:configure.in:124: -2- AC_CHECK_LIB([nsl], [gethostbyname], [LIB_SOCKET="-lnsl $LIB_SOCKET"])
-+m4trace:configure.in:124: -2- AC_CHECK_LIB([socket], [connect], [LIB_SOCKET="-lsocket $LIB_SOCKET"])
-+m4trace:configure.in:124: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2429: AC_TRY_LINK is expanded from...
-+cmulocal/bsd_sockets.m4:39: CMU_SOCKETS is expanded from...
-+configure.in:124: the top level])
-+m4trace:configure.in:124: -1- AC_CHECK_FUNCS([dn_expand dns_lookup])
-+m4trace:configure.in:124: -1- AH_OUTPUT([HAVE_DN_EXPAND], [/* Define to 1 if you have the `dn_expand\' function. */
-+#undef HAVE_DN_EXPAND])
-+m4trace:configure.in:124: -1- AH_OUTPUT([HAVE_DNS_LOOKUP], [/* Define to 1 if you have the `dns_lookup\' function. */
-+#undef HAVE_DNS_LOOKUP])
-+m4trace:configure.in:124: -1- AC_SUBST([LIB_SOCKET])
-+m4trace:configure.in:124: -1- AC_SUBST_TRACE([LIB_SOCKET])
-+m4trace:configure.in:124: -1- m4_pattern_allow([^LIB_SOCKET$])
-+m4trace:configure.in:131: -1- IPv6_CHECK_FUNC([getaddrinfo], [IPv6_CHECK_FUNC(gai_strerror,
-+	AC_DEFINE(HAVE_GETADDRINFO,[],[Do we have a getaddrinfo?]),
-+	cyrus_cv_getaddrinfo=no)], [cyrus_cv_getaddrinfo=no])
-+m4trace:configure.in:131: -1- AC_CHECK_LIB([socket], [getaddrinfo], [dnl
-+    LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_getaddrinfo=no
-+  ], [dnl
-+    AC_MSG_CHECKING([whether your system has IPv6 directory])
-+    AC_CACHE_VAL(ipv6_cv_dir, [dnl
-+      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done])dnl
-+    AC_MSG_RESULT($ipv6_cv_dir)
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_getaddrinfo=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      AC_CHECK_LIB(inet6, getaddrinfo, [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi],)dnl
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi])
-+m4trace:configure.in:131: -1- AC_CHECK_LIB([inet6], [getaddrinfo], [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi], [])
-+m4trace:configure.in:131: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
-+m4trace:configure.in:131: -1- m4_pattern_allow([^HAVE_GETADDRINFO$])
-+m4trace:configure.in:131: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
-+#undef HAVE_GETADDRINFO])
-+m4trace:configure.in:131: -2- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
-+m4trace:configure.in:131: -2- m4_pattern_allow([^HAVE_GETADDRINFO$])
-+m4trace:configure.in:131: -2- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
-+#undef HAVE_GETADDRINFO])
-+m4trace:configure.in:131: -1- IPv6_CHECK_FUNC([gai_strerror], [
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETADDRINFO 
-+_ACEOF
-+], [cyrus_cv_getaddrinfo=no])
-+m4trace:configure.in:131: -1- AC_CHECK_LIB([socket], [gai_strerror], [dnl
-+    LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_gai_strerror=no
-+  ], [dnl
-+    AC_MSG_CHECKING([whether your system has IPv6 directory])
-+    AC_CACHE_VAL(ipv6_cv_dir, [dnl
-+      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done])dnl
-+    AC_MSG_RESULT($ipv6_cv_dir)
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_gai_strerror=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      AC_CHECK_LIB(inet6, gai_strerror, [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi],)dnl
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi])
-+m4trace:configure.in:131: -1- AC_CHECK_LIB([inet6], [gai_strerror], [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi], [])
-+m4trace:configure.in:131: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
-+m4trace:configure.in:131: -1- m4_pattern_allow([^HAVE_GETADDRINFO$])
-+m4trace:configure.in:131: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
-+#undef HAVE_GETADDRINFO])
-+m4trace:configure.in:139: -2- AC_DEFINE_TRACE_LITERAL([HAVE_GETNAMEINFO])
-+m4trace:configure.in:139: -2- m4_pattern_allow([^HAVE_GETNAMEINFO$])
-+m4trace:configure.in:139: -2- AH_OUTPUT([HAVE_GETNAMEINFO], [/* Do we have a getnameinfo? */
-+#undef HAVE_GETNAMEINFO])
-+m4trace:configure.in:140: -1- IPv6_CHECK_FUNC([getnameinfo], [
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETNAMEINFO 
-+_ACEOF
-+], [cyrus_cv_getnameinfo=no])
-+m4trace:configure.in:140: -1- AC_CHECK_LIB([socket], [getnameinfo], [dnl
-+    LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_getnameinfo=no
-+  ], [dnl
-+    AC_MSG_CHECKING([whether your system has IPv6 directory])
-+    AC_CACHE_VAL(ipv6_cv_dir, [dnl
-+      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done])dnl
-+    AC_MSG_RESULT($ipv6_cv_dir)
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_getnameinfo=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      AC_CHECK_LIB(inet6, getnameinfo, [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi],)dnl
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi])
-+m4trace:configure.in:140: -1- AC_CHECK_LIB([inet6], [getnameinfo], [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi], [])
-+m4trace:configure.in:140: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
-+m4trace:configure.in:140: -1- m4_pattern_allow([^HAVE_GETADDRINFO$])
-+m4trace:configure.in:140: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
-+#undef HAVE_GETADDRINFO])
-+m4trace:configure.in:146: -1- IPv6_CHECK_SS_FAMILY([])
-+m4trace:configure.in:146: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
-+cmulocal/ipv6.m4:78: IPv6_CHECK_SS_FAMILY is expanded from...
-+configure.in:146: the top level])
-+m4trace:configure.in:146: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SS_FAMILY])
-+m4trace:configure.in:146: -2- m4_pattern_allow([^HAVE_SS_FAMILY$])
-+m4trace:configure.in:146: -2- AH_OUTPUT([HAVE_SS_FAMILY], [/* Is there an ss_family in sockaddr_storage? */
-+#undef HAVE_SS_FAMILY])
-+m4trace:configure.in:147: -1- IPv6_CHECK_SA_LEN([])
-+m4trace:configure.in:147: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
-+cmulocal/ipv6.m4:94: IPv6_CHECK_SA_LEN is expanded from...
-+configure.in:147: the top level])
-+m4trace:configure.in:147: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_SA_LEN])
-+m4trace:configure.in:147: -2- m4_pattern_allow([^HAVE_SOCKADDR_SA_LEN$])
-+m4trace:configure.in:147: -2- AH_OUTPUT([HAVE_SOCKADDR_SA_LEN], [/* Does sockaddr have an sa_len? */
-+#undef HAVE_SOCKADDR_SA_LEN])
-+m4trace:configure.in:149: -1- AC_SUBST([IPV6_OBJS])
-+m4trace:configure.in:149: -1- AC_SUBST_TRACE([IPV6_OBJS])
-+m4trace:configure.in:149: -1- m4_pattern_allow([^IPV6_OBJS$])
-+m4trace:configure.in:152: -1- AC_CHECK_HEADERS([sys/time.h])
-+m4trace:configure.in:152: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H])
-+m4trace:configure.in:153: -1- AC_HEADER_TIME
-+m4trace:configure.in:153: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
-+m4trace:configure.in:153: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-+m4trace:configure.in:153: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#undef TIME_WITH_SYS_TIME])
-+m4trace:configure.in:154: -1- AC_STRUCT_TM
-+m4trace:configure.in:154: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
-+m4trace:configure.in:154: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
-+m4trace:configure.in:154: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
-+#undef TM_IN_SYS_TIME])
-+m4trace:configure.in:155: -1- AC_STRUCT_TIMEZONE
-+m4trace:configure.in:155: -1- AC_CHECK_MEMBERS([struct tm.tm_zone], [], [], [#include <sys/types.h>
-+#include <$ac_cv_struct_tm>
-+])
-+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_TM_TM_ZONE])
-+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_STRUCT_TM_TM_ZONE$])
-+m4trace:configure.in:155: -1- AH_OUTPUT([HAVE_STRUCT_TM_TM_ZONE], [/* Define to 1 if `tm_zone\' is member of `struct tm\'. */
-+#undef HAVE_STRUCT_TM_TM_ZONE])
-+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TM_ZONE])
-+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_TM_ZONE$])
-+m4trace:configure.in:155: -1- AH_OUTPUT([HAVE_TM_ZONE], [/* Define to 1 if your `struct tm\' has `tm_zone\'. Deprecated, use
-+   `HAVE_STRUCT_TM_TM_ZONE\' instead. */
-+#undef HAVE_TM_ZONE])
-+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_TZNAME])
-+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_DECL_TZNAME$])
-+m4trace:configure.in:155: -1- AH_OUTPUT([HAVE_DECL_TZNAME], [/* Define to 1 if you have the declaration of `tzname\', and to 0 if you don\'t.
-+   */
-+#undef HAVE_DECL_TZNAME])
-+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_TZNAME])
-+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_DECL_TZNAME$])
-+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TZNAME])
-+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_TZNAME$])
-+m4trace:configure.in:155: -1- AH_OUTPUT([HAVE_TZNAME], [/* Define to 1 if you don\'t have `tm_zone\' but do have the external array
-+   `tzname\'. */
-+#undef HAVE_TZNAME])
-+m4trace:configure.in:157: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:157: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:157: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:158: -1- AC_SUBST([PRE_SUBDIRS])
-+m4trace:configure.in:158: -1- AC_SUBST_TRACE([PRE_SUBDIRS])
-+m4trace:configure.in:158: -1- m4_pattern_allow([^PRE_SUBDIRS$])
-+m4trace:configure.in:159: -1- AC_SUBST([EXTRA_SUBDIRS])
-+m4trace:configure.in:159: -1- AC_SUBST_TRACE([EXTRA_SUBDIRS])
-+m4trace:configure.in:159: -1- m4_pattern_allow([^EXTRA_SUBDIRS$])
-+m4trace:configure.in:160: -1- AC_SUBST([DEPLIBS])
-+m4trace:configure.in:160: -1- AC_SUBST_TRACE([DEPLIBS])
-+m4trace:configure.in:160: -1- m4_pattern_allow([^DEPLIBS$])
-+m4trace:configure.in:161: -1- AC_SUBST([LOCALDEFS])
-+m4trace:configure.in:161: -1- AC_SUBST_TRACE([LOCALDEFS])
-+m4trace:configure.in:161: -1- m4_pattern_allow([^LOCALDEFS$])
-+m4trace:configure.in:162: -1- AC_FUNC_VPRINTF
-+m4trace:configure.in:162: -1- AC_CHECK_FUNCS([vprintf], [
-+AC_CHECK_FUNC(_doprnt,
-+	       [AC_DEFINE(HAVE_DOPRNT, 1,
-+			  [Define to 1 if you don't have `vprintf' but do have
-+			  `_doprnt.'])])])
-+m4trace:configure.in:162: -1- AH_OUTPUT([HAVE_VPRINTF], [/* Define to 1 if you have the `vprintf\' function. */
-+#undef HAVE_VPRINTF])
-+m4trace:configure.in:162: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DOPRNT])
-+m4trace:configure.in:162: -1- m4_pattern_allow([^HAVE_DOPRNT$])
-+m4trace:configure.in:162: -1- AH_OUTPUT([HAVE_DOPRNT], [/* Define to 1 if you don\'t have `vprintf\' but do have `_doprnt.\' */
-+#undef HAVE_DOPRNT])
-+m4trace:configure.in:195: -1- CYRUS_BERKELEY_DB_CHK([])
-+m4trace:configure.in:195: -1- CYRUS_BERKELEY_DB_OPTS
-+m4trace:configure.in:195: -1- CYRUS_BERKELEY_DB_CHK_LIB([])
-+m4trace:configure.in:195: -1- CMU_ADD_LIBPATH_TO([$with_bdb_lib], [LDFLAGS])
-+m4trace:configure.in:195: -1- CMU_ADD_LIBPATH_TO([$with_bdb_lib], [BDB_LIBADD])
-+m4trace:configure.in:195: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2429: AC_TRY_LINK is expanded from...
-+cmulocal/berkdb.m4:235: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+cmulocal/berkdb.m4:269: CYRUS_BERKELEY_DB_CHK is expanded from...
-+configure.in:195: the top level])
-+m4trace:configure.in:195: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2429: AC_TRY_LINK is expanded from...
-+cmulocal/berkdb.m4:235: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+cmulocal/berkdb.m4:269: CYRUS_BERKELEY_DB_CHK is expanded from...
-+configure.in:195: the top level])
-+m4trace:configure.in:199: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+configure.in:199: the top level])
-+m4trace:configure.in:203: -1- CMU_ADD_LIBPATH([$with_bdb_lib])
-+m4trace:configure.in:208: -1- AC_SUBST([BDB_INC])
-+m4trace:configure.in:208: -1- AC_SUBST_TRACE([BDB_INC])
-+m4trace:configure.in:208: -1- m4_pattern_allow([^BDB_INC$])
-+m4trace:configure.in:209: -1- AC_SUBST([BDB_LIB])
-+m4trace:configure.in:209: -1- AC_SUBST_TRACE([BDB_LIB])
-+m4trace:configure.in:209: -1- m4_pattern_allow([^BDB_LIB$])
-+m4trace:configure.in:215: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BDB])
-+m4trace:configure.in:215: -1- m4_pattern_allow([^HAVE_BDB$])
-+m4trace:configure.in:215: -1- AH_OUTPUT([HAVE_BDB], [/* Build in Berkeley DB support? */
-+#undef HAVE_BDB])
-+m4trace:configure.in:220: -1- AC_SUBST([CYRUSDB_OBJS])
-+m4trace:configure.in:220: -1- AC_SUBST_TRACE([CYRUSDB_OBJS])
-+m4trace:configure.in:220: -1- m4_pattern_allow([^CYRUSDB_OBJS$])
-+m4trace:configure.in:232: -1- AC_SUBST([SIEVE_OBJS])
-+m4trace:configure.in:232: -1- AC_SUBST_TRACE([SIEVE_OBJS])
-+m4trace:configure.in:232: -1- m4_pattern_allow([^SIEVE_OBJS$])
-+m4trace:configure.in:234: -1- AC_SUBST([SIEVE_LIBS])
-+m4trace:configure.in:234: -1- AC_SUBST_TRACE([SIEVE_LIBS])
-+m4trace:configure.in:234: -1- m4_pattern_allow([^SIEVE_LIBS$])
-+m4trace:configure.in:236: -1- AC_SUBST([SIEVE_CPPFLAGS])
-+m4trace:configure.in:236: -1- AC_SUBST_TRACE([SIEVE_CPPFLAGS])
-+m4trace:configure.in:236: -1- m4_pattern_allow([^SIEVE_CPPFLAGS$])
-+m4trace:configure.in:237: -1- AC_DEFINE_TRACE_LITERAL([USE_SIEVE])
-+m4trace:configure.in:237: -1- m4_pattern_allow([^USE_SIEVE$])
-+m4trace:configure.in:237: -1- AH_OUTPUT([USE_SIEVE], [/* Build in Sieve support? */
-+#undef USE_SIEVE])
-+m4trace:configure.in:240: -1- AC_PROG_YACC
-+m4trace:configure.in:240: -1- AC_SUBST([YACC])
-+m4trace:configure.in:240: -1- AC_SUBST_TRACE([YACC])
-+m4trace:configure.in:240: -1- m4_pattern_allow([^YACC$])
-+m4trace:configure.in:240: -1- AC_SUBST([YACC])
-+m4trace:configure.in:240: -1- AC_SUBST_TRACE([YACC])
-+m4trace:configure.in:240: -1- m4_pattern_allow([^YACC$])
-+m4trace:configure.in:240: -1- AC_SUBST([YFLAGS])
-+m4trace:configure.in:240: -1- AC_SUBST_TRACE([YFLAGS])
-+m4trace:configure.in:240: -1- m4_pattern_allow([^YFLAGS$])
-+m4trace:configure.in:241: -1- AC_PROG_LEX
-+m4trace:configure.in:241: -1- AC_SUBST([LEX])
-+m4trace:configure.in:241: -1- AC_SUBST_TRACE([LEX])
-+m4trace:configure.in:241: -1- m4_pattern_allow([^LEX$])
-+m4trace:configure.in:241: -1- AC_SUBST([LEX_OUTPUT_ROOT], [$ac_cv_prog_lex_root])
-+m4trace:configure.in:241: -1- AC_SUBST_TRACE([LEX_OUTPUT_ROOT])
-+m4trace:configure.in:241: -1- m4_pattern_allow([^LEX_OUTPUT_ROOT$])
-+m4trace:configure.in:241: -1- AC_SUBST([LEXLIB])
-+m4trace:configure.in:241: -1- AC_SUBST_TRACE([LEXLIB])
-+m4trace:configure.in:241: -1- m4_pattern_allow([^LEXLIB$])
-+m4trace:configure.in:241: -1- AC_DEFINE_TRACE_LITERAL([YYTEXT_POINTER])
-+m4trace:configure.in:241: -1- m4_pattern_allow([^YYTEXT_POINTER$])
-+m4trace:configure.in:241: -1- AH_OUTPUT([YYTEXT_POINTER], [/* Define to 1 if `lex\' declares `yytext\' as a `char *\' by default, not a
-+   `char[]\'. */
-+#undef YYTEXT_POINTER])
-+m4trace:configure.in:242: -1- AC_CHECK_LIB([fl], [main])
-+m4trace:configure.in:242: -1- AH_OUTPUT([HAVE_LIBFL], [/* Define to 1 if you have the `fl\' library (-lfl). */
-+#undef HAVE_LIBFL])
-+m4trace:configure.in:242: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBFL])
-+m4trace:configure.in:242: -1- m4_pattern_allow([^HAVE_LIBFL$])
-+m4trace:configure.in:246: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_REGEX])
-+m4trace:configure.in:246: -1- m4_pattern_allow([^ENABLE_REGEX$])
-+m4trace:configure.in:246: -1- AH_OUTPUT([ENABLE_REGEX], [/* Do we have a decent regex library? */
-+#undef ENABLE_REGEX])
-+m4trace:configure.in:246: -2- AC_DEFINE_TRACE_LITERAL([HAVE_RX])
-+m4trace:configure.in:246: -2- m4_pattern_allow([^HAVE_RX$])
-+m4trace:configure.in:246: -2- AH_OUTPUT([HAVE_RX], [/* Do we have rxposix.h? */
-+#undef HAVE_RX])
-+m4trace:configure.in:253: -1- AC_SUBST([SIEVE_SUBDIRS])
-+m4trace:configure.in:253: -1- AC_SUBST_TRACE([SIEVE_SUBDIRS])
-+m4trace:configure.in:253: -1- m4_pattern_allow([^SIEVE_SUBDIRS$])
-+m4trace:configure.in:256: -2- AC_DEFINE_TRACE_LITERAL([HAS_STRERROR])
-+m4trace:configure.in:256: -2- m4_pattern_allow([^HAS_STRERROR$])
-+m4trace:configure.in:256: -2- AH_OUTPUT([HAS_STRERROR], [/* Do we have strerror()? */
-+#undef HAS_STRERROR])
-+m4trace:configure.in:257: -2- AC_DEFINE_TRACE_LITERAL([NEED_SYS_ERRLIST])
-+m4trace:configure.in:257: -2- m4_pattern_allow([^NEED_SYS_ERRLIST$])
-+m4trace:configure.in:257: -2- AH_OUTPUT([NEED_SYS_ERRLIST], [/* Do we have a sys_errlist? */
-+#undef NEED_SYS_ERRLIST])
-+m4trace:configure.in:257: -1- _m4_warn([obsolete], [The macro `AC_FUNC_CHECK' is obsolete.
-+You should run autoupdate.], [autoconf/functions.m4:138: AC_FUNC_CHECK is expanded from...
-+configure.in:257: the top level])
-+m4trace:configure.in:260: -1- AC_CHECK_HEADERS([sys/resource.h])
-+m4trace:configure.in:260: -1- AH_OUTPUT([HAVE_SYS_RESOURCE_H], [/* Define to 1 if you have the <sys/resource.h> header file. */
-+#undef HAVE_SYS_RESOURCE_H])
-+m4trace:configure.in:261: -1- AC_CHECK_FUNCS([setrlimit])
-+m4trace:configure.in:261: -1- AH_OUTPUT([HAVE_SETRLIMIT], [/* Define to 1 if you have the `setrlimit\' function. */
-+#undef HAVE_SETRLIMIT])
-+m4trace:configure.in:262: -1- AC_CHECK_FUNCS([getrlimit])
-+m4trace:configure.in:262: -1- AH_OUTPUT([HAVE_GETRLIMIT], [/* Define to 1 if you have the `getrlimit\' function. */
-+#undef HAVE_GETRLIMIT])
-+m4trace:configure.in:265: -1- AC_CHECK_FUNCS([daemon setsid])
-+m4trace:configure.in:265: -1- AH_OUTPUT([HAVE_DAEMON], [/* Define to 1 if you have the `daemon\' function. */
-+#undef HAVE_DAEMON])
-+m4trace:configure.in:265: -1- AH_OUTPUT([HAVE_SETSID], [/* Define to 1 if you have the `setsid\' function. */
-+#undef HAVE_SETSID])
-+m4trace:configure.in:268: -1- AC_CHECK_FUNCS([shutdown])
-+m4trace:configure.in:268: -1- AH_OUTPUT([HAVE_SHUTDOWN], [/* Define to 1 if you have the `shutdown\' function. */
-+#undef HAVE_SHUTDOWN])
-+m4trace:configure.in:270: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKLEN_T])
-+m4trace:configure.in:270: -2- m4_pattern_allow([^HAVE_SOCKLEN_T$])
-+m4trace:configure.in:270: -2- AH_OUTPUT([HAVE_SOCKLEN_T], [/* Do we have a socklen_t? */
-+#undef HAVE_SOCKLEN_T])
-+m4trace:configure.in:272: -2- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR_STORAGE])
-+m4trace:configure.in:272: -2- m4_pattern_allow([^HAVE_STRUCT_SOCKADDR_STORAGE$])
-+m4trace:configure.in:272: -2- AH_OUTPUT([HAVE_STRUCT_SOCKADDR_STORAGE], [/* Do we have a sockaddr_storage? */
-+#undef HAVE_STRUCT_SOCKADDR_STORAGE])
-+m4trace:configure.in:273: -2- AC_DEFINE_TRACE_LITERAL([HAVE_RLIM_T])
-+m4trace:configure.in:273: -2- m4_pattern_allow([^HAVE_RLIM_T$])
-+m4trace:configure.in:273: -2- AH_OUTPUT([HAVE_RLIM_T], [/* Do we have an rlim_t? */
-+#undef HAVE_RLIM_T])
-+m4trace:configure.in:281: -1- AC_CHECK_LIB([util], [setproctitle], [spt_type=SPT_BUILTIN
-+			LIBS="${LIBS} -lutil"])
-+m4trace:configure.in:296: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+configure.in:296: the top level])
-+m4trace:configure.in:307: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+configure.in:307: the top level])
-+m4trace:configure.in:318: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+configure.in:318: the top level])
-+m4trace:configure.in:325: -1- AC_DEFINE_TRACE_LITERAL([SPT_TYPE])
-+m4trace:configure.in:325: -1- m4_pattern_allow([^SPT_TYPE$])
-+m4trace:configure.in:325: -1- AH_OUTPUT([SPT_TYPE], [/* Do we already have setproctitle? */
-+#undef SPT_TYPE])
-+m4trace:configure.in:335: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2429: AC_TRY_LINK is expanded from...
-+configure.in:335: the top level])
-+m4trace:configure.in:337: -1- AC_SUBST([WITH_NONBLOCK])
-+m4trace:configure.in:337: -1- AC_SUBST_TRACE([WITH_NONBLOCK])
-+m4trace:configure.in:337: -1- m4_pattern_allow([^WITH_NONBLOCK$])
-+m4trace:configure.in:344: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
-+configure.in:344: the top level])
-+m4trace:configure.in:346: -1- AC_SUBST([WITH_GMTOFF])
-+m4trace:configure.in:346: -1- AC_SUBST_TRACE([WITH_GMTOFF])
-+m4trace:configure.in:346: -1- m4_pattern_allow([^WITH_GMTOFF$])
-+m4trace:configure.in:374: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2493: AC_TRY_RUN is expanded from...
-+configure.in:374: the top level])
-+m4trace:configure.in:406: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2493: AC_TRY_RUN is expanded from...
-+configure.in:406: the top level])
-+m4trace:configure.in:417: -1- AC_SUBST([WITH_MAP])
-+m4trace:configure.in:417: -1- AC_SUBST_TRACE([WITH_MAP])
-+m4trace:configure.in:417: -1- m4_pattern_allow([^WITH_MAP$])
-+m4trace:configure.in:426: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/functions.m4:75: AC_CHECK_FUNC is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/functions.m4:75: AC_CHECK_FUNC is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1400: AC_ARG_WITH is expanded from...
-+configure.in:426: the top level])
-+m4trace:configure.in:428: -1- AC_SUBST([WITH_LOCK])
-+m4trace:configure.in:428: -1- AC_SUBST_TRACE([WITH_LOCK])
-+m4trace:configure.in:428: -1- m4_pattern_allow([^WITH_LOCK$])
-+m4trace:configure.in:432: -2- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
-+m4trace:configure.in:432: -2- m4_pattern_allow([^HAVE_FDATASYNC$])
-+m4trace:configure.in:432: -2- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
-+#undef HAVE_FDATASYNC])
-+m4trace:configure.in:437: -1- AC_CHECK_LIB([rt], [fdatasync], [
-+	LIB_RT="-lrt"
-+	AC_DEFINE(HAVE_FDATASYNC,[],[Do we have fdatasync()?])
-+  ])
-+m4trace:configure.in:437: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
-+m4trace:configure.in:437: -1- m4_pattern_allow([^HAVE_FDATASYNC$])
-+m4trace:configure.in:437: -1- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
-+#undef HAVE_FDATASYNC])
-+m4trace:configure.in:458: -1- AC_CHECK_LIB([BSD], [sigvec], [cyrus_sigveclib="-lBSD"], [
-+    dnl not hp flavor
-+    SAVE_LDFLAGS="$LDFLAGS"
-+    dnl solaris flavor
-+    LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
-+    AC_CHECK_LIB(ucb, sigvec, [
-+      dnl more solaris flavor
-+      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"],
-+      [ cant_find_sigvec=yes ])
-+    LDFLAGS="$SAVE_LDFLAGS"])
-+m4trace:configure.in:458: -1- AC_CHECK_LIB([ucb], [sigvec], [
-+      dnl more solaris flavor
-+      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"], [ cant_find_sigvec=yes ])
-+m4trace:configure.in:459: -1- AC_SUBST([cyrus_sigveclib])
-+m4trace:configure.in:459: -1- AC_SUBST_TRACE([cyrus_sigveclib])
-+m4trace:configure.in:459: -1- m4_pattern_allow([^cyrus_sigveclib$])
-+m4trace:configure.in:473: -1- SASL_SET_GSSAPI_LIBS
-+m4trace:configure.in:473: -1- AC_DEFINE_TRACE_LITERAL([AFSPTS_USE_KRB5])
-+m4trace:configure.in:473: -1- m4_pattern_allow([^AFSPTS_USE_KRB5$])
-+m4trace:configure.in:473: -1- AH_OUTPUT([AFSPTS_USE_KRB5], [/* Should the AFS PTS plugin use krb5? */
-+#undef AFSPTS_USE_KRB5])
-+m4trace:configure.in:485: -1- CMU_ADD_LIBPATH_TO([/usr/ucblib], [AFS_LDFLAGS])
-+m4trace:configure.in:506: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2429: AC_TRY_LINK is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
-+configure.in:506: the top level])
-+m4trace:configure.in:512: -1- AC_SUBST([AFS_LIBS])
-+m4trace:configure.in:512: -1- AC_SUBST_TRACE([AFS_LIBS])
-+m4trace:configure.in:512: -1- m4_pattern_allow([^AFS_LIBS$])
-+m4trace:configure.in:513: -1- AC_SUBST([AFS_LDFLAGS])
-+m4trace:configure.in:513: -1- AC_SUBST_TRACE([AFS_LDFLAGS])
-+m4trace:configure.in:513: -1- m4_pattern_allow([^AFS_LDFLAGS$])
-+m4trace:configure.in:514: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
-+m4trace:configure.in:514: -1- m4_pattern_allow([^HAVE_AFSKRB$])
-+m4trace:configure.in:514: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
-+#undef HAVE_AFSKRB])
-+m4trace:configure.in:518: -1- AC_SUBST([AFS_LIBS])
-+m4trace:configure.in:518: -1- AC_SUBST_TRACE([AFS_LIBS])
-+m4trace:configure.in:518: -1- m4_pattern_allow([^AFS_LIBS$])
-+m4trace:configure.in:519: -1- AC_SUBST([AFS_LDFLAGS])
-+m4trace:configure.in:519: -1- AC_SUBST_TRACE([AFS_LDFLAGS])
-+m4trace:configure.in:519: -1- m4_pattern_allow([^AFS_LDFLAGS$])
-+m4trace:configure.in:520: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
-+m4trace:configure.in:520: -1- m4_pattern_allow([^HAVE_AFSKRB$])
-+m4trace:configure.in:520: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
-+#undef HAVE_AFSKRB])
-+m4trace:configure.in:548: -1- AC_CHECK_LIB([ldap], [ldap_initialize], [ AC_DEFINE(HAVE_LDAP,[],[Should we build ldap pts module?])
-+          AC_SUBST(LDAP_CPPFLAGS)
-+          AC_SUBST(LDAP_LDFLAGS)
-+          AC_SUBST(LDAP_LIBS)	
-+          LDAP_LIBS="-lldap -llber" ], [], [-llber])
-+m4trace:configure.in:548: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDAP])
-+m4trace:configure.in:548: -1- m4_pattern_allow([^HAVE_LDAP$])
-+m4trace:configure.in:548: -1- AH_OUTPUT([HAVE_LDAP], [/* Should we build ldap pts module? */
-+#undef HAVE_LDAP])
-+m4trace:configure.in:548: -1- AC_SUBST([LDAP_CPPFLAGS])
-+m4trace:configure.in:548: -1- AC_SUBST_TRACE([LDAP_CPPFLAGS])
-+m4trace:configure.in:548: -1- m4_pattern_allow([^LDAP_CPPFLAGS$])
-+m4trace:configure.in:548: -1- AC_SUBST([LDAP_LDFLAGS])
-+m4trace:configure.in:548: -1- AC_SUBST_TRACE([LDAP_LDFLAGS])
-+m4trace:configure.in:548: -1- m4_pattern_allow([^LDAP_LDFLAGS$])
-+m4trace:configure.in:548: -1- AC_SUBST([LDAP_LIBS])
-+m4trace:configure.in:548: -1- AC_SUBST_TRACE([LDAP_LIBS])
-+m4trace:configure.in:548: -1- m4_pattern_allow([^LDAP_LIBS$])
-+m4trace:configure.in:557: -1- AC_DEFINE_TRACE_LITERAL([WITH_PTS])
-+m4trace:configure.in:557: -1- m4_pattern_allow([^WITH_PTS$])
-+m4trace:configure.in:557: -1- AH_OUTPUT([WITH_PTS], [/* Build in PTS support? */
-+#undef WITH_PTS])
-+m4trace:configure.in:566: -1- AC_SUBST([SERVER_SUBDIRS])
-+m4trace:configure.in:566: -1- AC_SUBST_TRACE([SERVER_SUBDIRS])
-+m4trace:configure.in:566: -1- m4_pattern_allow([^SERVER_SUBDIRS$])
-+m4trace:configure.in:584: -1- AC_CHECK_LIB([resolv], [res_search])
-+m4trace:configure.in:584: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
-+#undef HAVE_LIBRESOLV])
-+m4trace:configure.in:584: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
-+m4trace:configure.in:584: -1- m4_pattern_allow([^HAVE_LIBRESOLV$])
-+m4trace:configure.in:601: -1- AC_CHECK_LIB([des], [des_ecb_encrypt], [if test "$with_statickrb" = "yes"; then
-+          KRB_LIBS="$with_krb/lib/libdes.a"
-+      else
-+          KRB_LIBS="-ldes"
-+      fi], [{ { echo "$as_me:$LINENO: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&5
-+echo "$as_me: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&2;}
-+   { (exit 1); exit 1; }; }])
-+m4trace:configure.in:621: -1- CMU_ADD_LIBPATH([${with_krb}/lib])
-+m4trace:configure.in:638: -3- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+configure.in:638: the top level])
-+m4trace:configure.in:639: -2- AC_CHECK_LIB([${KRBLIB}], [krb_mk_priv], [if test "$with_statickrb" = "yes"; then
-+          KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
-+      else
-+          KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
-+      fi], [{ echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
-+echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no], [$KRB_LIBS])
-+m4trace:configure.in:640: -2- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+configure.in:640: the top level])
-+m4trace:configure.in:642: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+configure.in:642: the top level])
-+m4trace:configure.in:647: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB])
-+m4trace:configure.in:647: -1- m4_pattern_allow([^HAVE_KRB$])
-+m4trace:configure.in:647: -1- AH_OUTPUT([HAVE_KRB], [/* Support for Kerberos? */
-+#undef HAVE_KRB])
-+m4trace:configure.in:652: -1- SASL_SET_GSSAPI_LIBS
-+m4trace:configure.in:671: -1- AC_CHECK_LIB([rsaref], [RSAPublicEncrypt], [LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes], [cmu_have_rsaref=no])
-+m4trace:configure.in:676: -1- AC_CHECK_LIB([crypto], [BIO_accept], [LIBS="-lcrypto $LIB_RSAREF ${LIBS}"], [with_openssl="no"], [$LIB_RSAREF])
-+m4trace:configure.in:678: -1- AC_CHECK_LIB([ssl], [SSL_CTX_new], [LIBS="-lssl ${LIBS}"], [with_openssl="no"], [-lcrypto $LIB_RSAREF])
-+m4trace:configure.in:685: -1- CMU_ADD_LIBPATH([${OPENSSL_LIBPATH}])
-+m4trace:configure.in:686: -1- CMU_ADD_LIBPATH_TO([${OPENSSL_LIBPATH}], [OPENSSL_LIB])
-+m4trace:configure.in:694: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSL])
-+m4trace:configure.in:694: -1- m4_pattern_allow([^HAVE_SSL$])
-+m4trace:configure.in:694: -1- AH_OUTPUT([HAVE_SSL], [/* Build with SSL support? */
-+#undef HAVE_SSL])
-+m4trace:configure.in:697: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_ENABLE_OLD_DES_SUPPORT])
-+m4trace:configure.in:697: -1- m4_pattern_allow([^OPENSSL_ENABLE_OLD_DES_SUPPORT$])
-+m4trace:configure.in:697: -1- AH_OUTPUT([OPENSSL_ENABLE_OLD_DES_SUPPORT], [/* Configure OpenSSL to provide legacy des apis */
-+#undef OPENSSL_ENABLE_OLD_DES_SUPPORT])
-+m4trace:configure.in:698: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_DES_LIBDES_COMPATIBILITY])
-+m4trace:configure.in:698: -1- m4_pattern_allow([^OPENSSL_DES_LIBDES_COMPATIBILITY$])
-+m4trace:configure.in:698: -1- AH_OUTPUT([OPENSSL_DES_LIBDES_COMPATIBILITY], [/* Configure OpenSSL to provide krb4-compatible legacy des apis */
-+#undef OPENSSL_DES_LIBDES_COMPATIBILITY])
-+m4trace:configure.in:701: -1- AC_SUBST([OPENSSL_INC])
-+m4trace:configure.in:701: -1- AC_SUBST_TRACE([OPENSSL_INC])
-+m4trace:configure.in:701: -1- m4_pattern_allow([^OPENSSL_INC$])
-+m4trace:configure.in:702: -1- AC_SUBST([OPENSSL_LIB])
-+m4trace:configure.in:702: -1- AC_SUBST_TRACE([OPENSSL_LIB])
-+m4trace:configure.in:702: -1- m4_pattern_allow([^OPENSSL_LIB$])
-+m4trace:configure.in:713: -1- AC_DEFINE_TRACE_LITERAL([EGD_SOCKET])
-+m4trace:configure.in:713: -1- m4_pattern_allow([^EGD_SOCKET$])
-+m4trace:configure.in:713: -1- AH_OUTPUT([EGD_SOCKET], [/* Alternative to /dev/urandom? */
-+#undef EGD_SOCKET])
-+m4trace:configure.in:733: -1- AC_CHECK_LIB([zephyr], [ZInitialize], [ZEPHYR_LIBS="-lzephyr"], [with_zephyr="no"], [])
-+m4trace:configure.in:741: -1- AC_SUBST([ZEPHYR_LIBS])
-+m4trace:configure.in:741: -1- AC_SUBST_TRACE([ZEPHYR_LIBS])
-+m4trace:configure.in:741: -1- m4_pattern_allow([^ZEPHYR_LIBS$])
-+m4trace:configure.in:742: -1- AC_SUBST([ZEPHYR_CPPFLAGS])
-+m4trace:configure.in:742: -1- AC_SUBST_TRACE([ZEPHYR_CPPFLAGS])
-+m4trace:configure.in:742: -1- m4_pattern_allow([^ZEPHYR_CPPFLAGS$])
-+m4trace:configure.in:744: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ZEPHYR])
-+m4trace:configure.in:744: -1- m4_pattern_allow([^HAVE_ZEPHYR$])
-+m4trace:configure.in:744: -1- AH_OUTPUT([HAVE_ZEPHYR], [/* Build with Zephyr support? */
-+#undef HAVE_ZEPHYR])
-+m4trace:configure.in:754: -1- AC_DEFINE_TRACE_LITERAL([MASTER_PIDFILE])
-+m4trace:configure.in:754: -1- m4_pattern_allow([^MASTER_PIDFILE$])
-+m4trace:configure.in:754: -1- AH_OUTPUT([MASTER_PIDFILE], [/* Name of the pidfile for master */
-+#undef MASTER_PIDFILE])
-+m4trace:configure.in:762: -1- AC_SUBST([WITH_IDLE])
-+m4trace:configure.in:762: -1- AC_SUBST_TRACE([WITH_IDLE])
-+m4trace:configure.in:762: -1- m4_pattern_allow([^WITH_IDLE$])
-+m4trace:configure.in:784: -1- AC_SUBST([IMAP_PROGS])
-+m4trace:configure.in:784: -1- AC_SUBST_TRACE([IMAP_PROGS])
-+m4trace:configure.in:784: -1- m4_pattern_allow([^IMAP_PROGS$])
-+m4trace:configure.in:816: -1- AC_CHECK_LIB([com_err], [com_err], [
-+		# com_err is already in library path
-+		# guess we're okay
-+		# can use system com_err
-+		with_com_err=""
-+		AC_CHECK_HEADER(et/com_err.h,
-+		  [AC_DEFINE(HAVE_ET_COM_ERR_H,[],[We need et/com_err.h])],
-+		  [AC_CHECK_HEADER(com_err.h,[],[AC_ERROR([cannot locate com_err.h])])])
-+		AC_PATH_PROG(COMPILE_ET, compile_et, [no compile et])
-+	], [
-+	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
-+		with_com_err="/usr/local"
-+		AC_PATH_PROG(COMPILE_ET, /usr/local/bin/compile_et, [no compile et])
-+	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
-+		with_com_err="/usr"
-+		AC_PATH_PROG(COMPILE_ET, /usr/bin/compile_et, [no compile et])
-+	else
-+		# use ours
-+		with_com_err=yes
-+	fi
-+	])
-+m4trace:configure.in:816: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ET_COM_ERR_H])
-+m4trace:configure.in:816: -1- m4_pattern_allow([^HAVE_ET_COM_ERR_H$])
-+m4trace:configure.in:816: -1- AH_OUTPUT([HAVE_ET_COM_ERR_H], [/* We need et/com_err.h */
-+#undef HAVE_ET_COM_ERR_H])
-+m4trace:configure.in:816: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/libs.m4:139: AC_CHECK_LIB is expanded from...
-+configure.in:816: the top level])
-+m4trace:configure.in:816: -1- AC_SUBST([COMPILE_ET])
-+m4trace:configure.in:816: -1- AC_SUBST_TRACE([COMPILE_ET])
-+m4trace:configure.in:816: -1- m4_pattern_allow([^COMPILE_ET$])
-+m4trace:configure.in:816: -1- AC_SUBST([COMPILE_ET])
-+m4trace:configure.in:816: -1- AC_SUBST_TRACE([COMPILE_ET])
-+m4trace:configure.in:816: -1- m4_pattern_allow([^COMPILE_ET$])
-+m4trace:configure.in:816: -1- AC_SUBST([COMPILE_ET])
-+m4trace:configure.in:816: -1- AC_SUBST_TRACE([COMPILE_ET])
-+m4trace:configure.in:816: -1- m4_pattern_allow([^COMPILE_ET$])
-+m4trace:configure.in:857: -1- AC_SUBST([COMPILE_ET])
-+m4trace:configure.in:857: -1- AC_SUBST_TRACE([COMPILE_ET])
-+m4trace:configure.in:857: -1- m4_pattern_allow([^COMPILE_ET$])
-+m4trace:configure.in:858: -1- AC_SUBST([COM_ERR_LIBS])
-+m4trace:configure.in:858: -1- AC_SUBST_TRACE([COM_ERR_LIBS])
-+m4trace:configure.in:858: -1- m4_pattern_allow([^COM_ERR_LIBS$])
-+m4trace:configure.in:859: -1- AC_SUBST([COM_ERR_LDFLAGS])
-+m4trace:configure.in:859: -1- AC_SUBST_TRACE([COM_ERR_LDFLAGS])
-+m4trace:configure.in:859: -1- m4_pattern_allow([^COM_ERR_LDFLAGS$])
-+m4trace:configure.in:860: -1- AC_SUBST([COM_ERR_CPPFLAGS])
-+m4trace:configure.in:860: -1- AC_SUBST_TRACE([COM_ERR_CPPFLAGS])
-+m4trace:configure.in:860: -1- m4_pattern_allow([^COM_ERR_CPPFLAGS$])
-+m4trace:configure.in:866: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+configure.in:866: the top level])
-+m4trace:configure.in:881: -1- AC_DEFINE_TRACE_LITERAL([SYSLOG_FACILITY])
-+m4trace:configure.in:881: -1- m4_pattern_allow([^SYSLOG_FACILITY$])
-+m4trace:configure.in:881: -1- AH_OUTPUT([SYSLOG_FACILITY], [/* Syslog facility to use. */
-+#undef SYSLOG_FACILITY])
-+m4trace:configure.in:885: -1- AC_LIBSOURCE([getdtablesize.c])
-+m4trace:configure.in:885: -1- AC_CHECK_FUNCS([getdtablesize], [], [_AC_LIBOBJ($ac_func)])
-+m4trace:configure.in:885: -1- AH_OUTPUT([HAVE_GETDTABLESIZE], [/* Define to 1 if you have the `getdtablesize\' function. */
-+#undef HAVE_GETDTABLESIZE])
-+m4trace:configure.in:885: -1- AC_SUBST([LIB@&t at OBJS], ["$LIB@&t at OBJS $ac_func.$ac_objext"])
-+m4trace:configure.in:885: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
-+m4trace:configure.in:885: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-+m4trace:configure.in:898: -2- AC_DEFINE_TRACE_LITERAL([OLD_SIEVE_SERVICE_NAME])
-+m4trace:configure.in:898: -2- m4_pattern_allow([^OLD_SIEVE_SERVICE_NAME$])
-+m4trace:configure.in:898: -2- AH_OUTPUT([OLD_SIEVE_SERVICE_NAME], [/* Use "imap" as sieve service name? */
-+#undef OLD_SIEVE_SERVICE_NAME])
-+m4trace:configure.in:907: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_LISTEXT])
-+m4trace:configure.in:907: -2- m4_pattern_allow([^ENABLE_LISTEXT$])
-+m4trace:configure.in:907: -2- AH_OUTPUT([ENABLE_LISTEXT], [/* Enable the LISTEXT extension? */
-+#undef ENABLE_LISTEXT])
-+m4trace:configure.in:914: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_X_NETSCAPE_HACK])
-+m4trace:configure.in:914: -2- m4_pattern_allow([^ENABLE_X_NETSCAPE_HACK$])
-+m4trace:configure.in:914: -2- AH_OUTPUT([ENABLE_X_NETSCAPE_HACK], [/* Enable Netscape Menu Option Hack? */
-+#undef ENABLE_X_NETSCAPE_HACK])
-+m4trace:configure.in:917: -1- AC_CHECK_LIB([dl], [dlopen])
-+m4trace:configure.in:917: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
-+#undef HAVE_LIBDL])
-+m4trace:configure.in:917: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
-+m4trace:configure.in:917: -1- m4_pattern_allow([^HAVE_LIBDL$])
-+m4trace:configure.in:918: -1- CMU_SASL2_REQUIRE_VER([2], [1], [7])
-+m4trace:configure.in:918: -1- CMU_SASL2_REQUIRED
-+m4trace:configure.in:918: -1- CMU_SASL2
-+m4trace:configure.in:918: -1- SASL_GSSAPI_CHK
-+m4trace:configure.in:918: -1- SASL2_CRYPT_CHK
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([crypt], [crypt], [LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes], [cmu_have_crypt=no])
-+m4trace:configure.in:918: -1- AC_SUBST([LIB_CRYPT])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([LIB_CRYPT])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^LIB_CRYPT$])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+autoconf/general.m4:1382: AC_ARG_ENABLE is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+autoconf/general.m4:1400: AC_ARG_WITH is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSSAPI_H])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSSAPI_H$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSSAPI_H], [/* Define if you have the gssapi.h header file */
-+#undef HAVE_GSSAPI_H])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([resolv], [res_search])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
-+#undef HAVE_LIBRESOLV])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_LIBRESOLV$])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([gssapi], [gss_unwrap], [gss_impl="heimdal"], [gss_failed=1], [${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET}])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([krb5support], [krb5int_getspecific], [K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a], [], [${LIB_SOCKET}])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([gssapi_krb5], [gss_unwrap], [gss_impl="mit"], [gss_failed=1], [${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe03"], [unset ac_cv_lib_gss_csf_gss_acq_user;
-+                  AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe",
-+                               gss_failed=1,$GSSAPIBASE_LIBS -lgss)], [${GSSAPIBASE_LIBS} -lgss -lcstbk5])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe"], [gss_failed=1], [$GSSAPIBASE_LIBS -lgss])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([gss], [gss_unwrap], [gss_impl="seam"], [gss_failed=1], [-lgss])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_HOSTBASED_SERVICE$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-+#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:2334: AC_EGREP_CPP is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_HOSTBASED_SERVICE$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-+#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_HOSTBASED_SERVICE$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-+#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_USER_NAME$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-+#undef HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:2334: AC_EGREP_CPP is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_USER_NAME$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-+#undef HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_USER_NAME$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-+#undef HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([resolv], [res_search], [GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"])
-+m4trace:configure.in:918: -1- AC_CHECK_FUNCS([gsskrb5_register_acceptor_identity])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY], [/* Define to 1 if you have the `gsskrb5_register_acceptor_identity\' function.
-+   */
-+#undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY])
-+m4trace:configure.in:918: -1- AC_SUBST([GSSAPI_LIBS])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([GSSAPI_LIBS])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^GSSAPI_LIBS$])
-+m4trace:configure.in:918: -1- AC_SUBST([GSSAPIBASE_LIBS])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([GSSAPIBASE_LIBS])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^GSSAPIBASE_LIBS$])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+autoconf/general.m4:1400: AC_ARG_WITH is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+autoconf/general.m4:1400: AC_ARG_WITH is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- CMU_ADD_LIBPATH_TO([$ac_cv_sasl_where_lib], [LIB_DYN_SASL])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([sasl2], [prop_get], [ac_cv_found_sasl=yes], [ac_cv_found_sasl=no])
-+m4trace:configure.in:918: -1- CMU_ADD_LIBPATH_TO([$ac_cv_sasl_where_lib], [DYNLIB_SASL])
-+m4trace:configure.in:918: -1- AC_SUBST([LIB_DYN_SASL])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([LIB_DYN_SASL])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^LIB_DYN_SASL$])
-+m4trace:configure.in:918: -1- AC_SUBST([DYNSASLFLAGS])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([DYNSASLFLAGS])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^DYNSASLFLAGS$])
-+m4trace:configure.in:918: -1- AC_SUBST([LIB_SASL])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([LIB_SASL])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^LIB_SASL$])
-+m4trace:configure.in:918: -1- AC_SUBST([SASLFLAGS])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([SASLFLAGS])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^SASLFLAGS$])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:2294: _AC_PREPROC_IFELSE is expanded from...
-+autoconf/general.m4:2304: AC_PREPROC_IFELSE is expanded from...
-+autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:919: -1- CMU_SASL2_CHECKAPOP_REQUIRED
-+m4trace:configure.in:919: -1- AC_CHECK_LIB([sasl2], [sasl_checkapop], [AC_DEFINE(HAVE_APOP,[],[Does SASL support APOP?])], [AC_MSG_ERROR([libsasl2 without working sasl_checkapop.  Cannot continue.])])
-+m4trace:configure.in:919: -1- AC_DEFINE_TRACE_LITERAL([HAVE_APOP])
-+m4trace:configure.in:919: -1- m4_pattern_allow([^HAVE_APOP$])
-+m4trace:configure.in:919: -1- AH_OUTPUT([HAVE_APOP], [/* Does SASL support APOP? */
-+#undef HAVE_APOP])
-+m4trace:configure.in:932: -1- AC_SUBST([PERL])
-+m4trace:configure.in:932: -1- AC_SUBST_TRACE([PERL])
-+m4trace:configure.in:932: -1- m4_pattern_allow([^PERL$])
-+m4trace:configure.in:948: -1- AC_SUBST([PERL_CCCDLFLAGS])
-+m4trace:configure.in:948: -1- AC_SUBST_TRACE([PERL_CCCDLFLAGS])
-+m4trace:configure.in:948: -1- m4_pattern_allow([^PERL_CCCDLFLAGS$])
-+m4trace:configure.in:966: -2- AC_CHECK_LIB([md], [MD5Init], [LIBS="${LIBS} -lmd"], [MD5OBJ="md5.o"])
-+m4trace:configure.in:966: -1- _m4_warn([obsolete], [The macro `AC_FUNC_CHECK' is obsolete.
-+You should run autoupdate.], [autoconf/functions.m4:138: AC_FUNC_CHECK is expanded from...
-+configure.in:966: the top level])
-+m4trace:configure.in:967: -1- AC_SUBST([MD5OBJ])
-+m4trace:configure.in:967: -1- AC_SUBST_TRACE([MD5OBJ])
-+m4trace:configure.in:967: -1- m4_pattern_allow([^MD5OBJ$])
-+m4trace:configure.in:972: -1- AC_SUBST([SNMP_SUBDIRS])
-+m4trace:configure.in:972: -1- AC_SUBST_TRACE([SNMP_SUBDIRS])
-+m4trace:configure.in:972: -1- m4_pattern_allow([^SNMP_SUBDIRS$])
-+m4trace:configure.in:974: -1- CMU_LIBWRAP
-+m4trace:configure.in:974: -1- CMU_FIND_LIB_SUBDIR
-+m4trace:configure.in:974: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+cmulocal/common.m4:61: CMU_FIND_LIB_SUBDIR is expanded from...
-+cmulocal/libwrap.m4:30: CMU_LIBWRAP is expanded from...
-+configure.in:974: the top level])
-+m4trace:configure.in:974: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
-+m4trace:configure.in:974: -1- m4_pattern_allow([^SIZEOF_LONG$])
-+m4trace:configure.in:974: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of `long\', as computed by sizeof. */
-+#undef SIZEOF_LONG])
-+m4trace:configure.in:974: -1- AC_SUBST([CMU_LIB_SUBDIR], [$ac_cv_cmu_lib_subdir])
-+m4trace:configure.in:974: -1- AC_SUBST_TRACE([CMU_LIB_SUBDIR])
-+m4trace:configure.in:974: -1- m4_pattern_allow([^CMU_LIB_SUBDIR$])
-+m4trace:configure.in:974: -1- AC_CHECK_LIB([wrap], [request_init], [
-+		 AC_CHECK_HEADER(tcpd.h,, with_libwrap=no)], [with_libwrap=no], [${LIB_SOCKET}])
-+m4trace:configure.in:974: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWRAP])
-+m4trace:configure.in:974: -1- m4_pattern_allow([^HAVE_LIBWRAP$])
-+m4trace:configure.in:974: -1- AH_OUTPUT([HAVE_LIBWRAP], [/* Do we have TCP wrappers? */
-+#undef HAVE_LIBWRAP])
-+m4trace:configure.in:974: -1- AC_CHECK_LIB([nsl], [yp_get_default_domain], [LIB_WRAP="${LIB_WRAP} -lnsl"])
-+m4trace:configure.in:974: -1- AC_SUBST([LIB_WRAP])
-+m4trace:configure.in:974: -1- AC_SUBST_TRACE([LIB_WRAP])
-+m4trace:configure.in:974: -1- m4_pattern_allow([^LIB_WRAP$])
-+m4trace:configure.in:975: -1- CMU_UCDSNMP
-+m4trace:configure.in:975: -1- AC_SUBST([SNMP_CONFIG])
-+m4trace:configure.in:975: -1- AC_SUBST_TRACE([SNMP_CONFIG])
-+m4trace:configure.in:975: -1- m4_pattern_allow([^SNMP_CONFIG$])
-+m4trace:configure.in:975: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NETSNMP])
-+m4trace:configure.in:975: -1- m4_pattern_allow([^HAVE_NETSNMP$])
-+m4trace:configure.in:975: -1- AH_OUTPUT([HAVE_NETSNMP], [/* Do we have Net-SNMP support? */
-+#undef HAVE_NETSNMP])
-+m4trace:configure.in:975: -1- AC_SUBST([LIB_UCDSNMP])
-+m4trace:configure.in:975: -1- AC_SUBST_TRACE([LIB_UCDSNMP])
-+m4trace:configure.in:975: -1- m4_pattern_allow([^LIB_UCDSNMP$])
-+m4trace:configure.in:975: -1- AC_CHECK_LIB([snmp], [sprint_objid], [
-+  		 AC_CHECK_HEADER(ucd-snmp/version.h,, with_snmp=no)], [with_snmp=no], [${LIB_SOCKET}])
-+m4trace:configure.in:975: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UCDSNMP])
-+m4trace:configure.in:975: -1- m4_pattern_allow([^HAVE_UCDSNMP$])
-+m4trace:configure.in:975: -1- AH_OUTPUT([HAVE_UCDSNMP], [/* Do we have UCD-SNMP support? */
-+#undef HAVE_UCDSNMP])
-+m4trace:configure.in:975: -1- AC_CHECK_LIB([rpm], [rpmdbOpen], [LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"], [], [-lpopt])
-+m4trace:configure.in:975: -1- AC_SUBST([LIB_UCDSNMP])
-+m4trace:configure.in:975: -1- AC_SUBST_TRACE([LIB_UCDSNMP])
-+m4trace:configure.in:975: -1- m4_pattern_allow([^LIB_UCDSNMP$])
-+m4trace:configure.in:1010: -1- AC_SUBST([LIB_RT])
-+m4trace:configure.in:1010: -1- AC_SUBST_TRACE([LIB_RT])
-+m4trace:configure.in:1010: -1- m4_pattern_allow([^LIB_RT$])
-+m4trace:configure.in:1011: -1- AC_SUBST([IMAP_COM_ERR_LIBS])
-+m4trace:configure.in:1011: -1- AC_SUBST_TRACE([IMAP_COM_ERR_LIBS])
-+m4trace:configure.in:1011: -1- m4_pattern_allow([^IMAP_COM_ERR_LIBS$])
-+m4trace:configure.in:1012: -1- AC_SUBST([IMAP_LIBS])
-+m4trace:configure.in:1012: -1- AC_SUBST_TRACE([IMAP_LIBS])
-+m4trace:configure.in:1012: -1- m4_pattern_allow([^IMAP_LIBS$])
-+m4trace:configure.in:1020: -1- AC_SUBST([PERL_SUBDIRS])
-+m4trace:configure.in:1020: -1- AC_SUBST_TRACE([PERL_SUBDIRS])
-+m4trace:configure.in:1020: -1- m4_pattern_allow([^PERL_SUBDIRS$])
-+m4trace:configure.in:1021: -1- AC_SUBST([PERL_DEPSUBDIRS])
-+m4trace:configure.in:1021: -1- AC_SUBST_TRACE([PERL_DEPSUBDIRS])
-+m4trace:configure.in:1021: -1- m4_pattern_allow([^PERL_DEPSUBDIRS$])
-+m4trace:configure.in:1022: -1- AC_SUBST([PERL])
-+m4trace:configure.in:1022: -1- AC_SUBST_TRACE([PERL])
-+m4trace:configure.in:1022: -1- m4_pattern_allow([^PERL$])
-+m4trace:configure.in:1068: -1- AH_OUTPUT([00001], [
-+/* $Id: configure.in,v 1.296 2005/10/13 19:56:14 jeaton Exp $ */
-+/* 
-+ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer. 
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * 3. The name "Carnegie Mellon University" must not be used to
-+ *    endorse or promote products derived from this software without
-+ *    prior written permission. For permission or any other legal
-+ *    details, please contact  
-+ *      Office of Technology Transfer
-+ *      Carnegie Mellon University
-+ *      5000 Forbes Avenue
-+ *      Pittsburgh, PA  15213-3890
-+ *      (412) 268-4387, fax: (412) 268-7395
-+ *      tech-transfer at andrew.cmu.edu
-+ *
-+ * 4. Redistributions of any form whatsoever must retain the following
-+ *    acknowledgment:
-+ *    "This product includes software developed by Computing Services
-+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-+ *
-+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _CYRUS_IMAPD_CONFIG_H_
-+#define _CYRUS_IMAPD_CONFIG_H_
-+])
-+m4trace:configure.in:1217: -1- AH_OUTPUT([zzzz2], [
-+/* time.h */
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+#  include <sys/time.h>
-+# else
-+#  include <time.h>
-+# endif
-+#endif
-+
-+/* com_err.h, as needed */
-+#ifndef IN_COM_ERR
-+#ifdef HAVE_ET_COM_ERR_H
-+#include <et/com_err.h>
-+#else
-+#include <com_err.h>
-+#endif /* HAVE_ET_COM_ERR_H */
-+#endif /* IN_COM_ERR */
-+
-+/* This allows us to work even when we don\'t have an fdatasync */
-+#ifndef HAVE_FDATASYNC
-+#define fdatasync(fd) fsync(fd)
-+#endif
-+
-+/* A similar setup for not having O_DSYNC */
-+#include <fcntl.h>
-+
-+#ifndef O_DSYNC
-+#  ifdef O_SYNC
-+#    define O_DSYNC     O_SYNC          /* POSIX */
-+#  else
-+#    define O_DSYNC     O_FSYNC         /* BSD */
-+#  endif
-+#endif
-+
-+#ifndef HAVE___ATTRIBUTE__
-+/* Can\'t use attributes... */
-+#define __attribute__(foo)
-+#endif
-+
-+#ifndef HAVE_SOCKLEN_T
-+typedef unsigned int socklen_t;
-+#endif
-+
-+#ifndef HAVE_RLIM_T
-+typedef int rlim_t;
-+#endif
-+
-+/* some potentially memory saving tradeoffs, 
-+   preconfigured in memory-saving mode */
-+
-+/* save the cmdlines for the ID command */
-+#undef ID_SAVE_CMDLINE
-+
-+/* IPv6 things */
-+#include <netdb.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
-+#define	_SS_MAXSIZE	128	/* Implementation specific max size */
-+#define	_SS_PADSIZE	(_SS_MAXSIZE - sizeof (struct sockaddr))
-+
-+struct sockaddr_storage {
-+	struct	sockaddr ss_sa;
-+	char		__ss_pad2[_SS_PADSIZE];
-+};
-+# define ss_family ss_sa.sa_family
-+# define HAVE_SS_FAMILY
-+#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
-+
-+#ifndef HAVE_SS_FAMILY
-+#define ss_family	__ss_family
-+#endif
-+
-+#ifndef AF_INET6
-+/* Define it to something that should never appear */
-+#define	AF_INET6	AF_MAX
-+#endif
-+
-+#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
-+#include "gai.h"
-+#endif
-+
-+/* End IPv6 things */
-+
-+#ifdef OLD_SIEVE_SERVICE_NAME
-+#define SIEVE_SERVICE_NAME "imap"
-+#else
-+#define SIEVE_SERVICE_NAME "sieve"
-+#endif
-+
-+/* filenames */
-+#define FNAME_DBDIR "/db"
-+#define FNAME_USERDIR "/user/"
-+#define FNAME_DOMAINDIR "/domain/"
-+#define FNAME_LOGDIR "/log/"
-+#define FNAME_PTSDB "/ptclient/ptscache.db"
-+#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
-+#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
-+
-+#ifndef HAVE_SHUTDOWN
-+#define shutdown(fd, mode) 0
-+#endif
-+
-+/* compile time options; think carefully before modifying */
-+enum {
-+    /* should we send an UNAVAILABLE message to master when
-+     * a service is exiting (master is already going to be 
-+     * informed of the exit by the SIGCHLD signal anyway) ? */
-+    MESSAGE_MASTER_ON_EXIT = 0,
-+
-+    /* should a hierarchical rename stop on error? */
-+    RENAME_STOP_ON_ERROR = 1,
-+
-+    /* should we call fsync() to maybe help with softupdates? (it should) */
-+    APPEND_ULTRA_PARANOID = 1,
-+
-+    /* should we log extra information at the DEBUG level for DB stuff? 
-+     * 0 -> nothing; 1 -> some; higher -> even more */
-+    CONFIG_DB_VERBOSE = 1,
-+
-+    /* log timing information to LOG_DEBUG */
-+    CONFIG_TIMING_VERBOSE = 0,
-+
-+    /* should we be pedantic about namespace or sleezy? */
-+    SLEEZY_NAMESPACE = 1,
-+
-+    /* should we do a fast TLS session shutdown? */
-+    TLS_FAST_SHUTDOWN = 1,
-+
-+    /* should we use the SQUAT engine to accelerate SEARCH? */
-+    SQUAT_ENGINE = 1,
-+
-+    /* should we have long LMTP error messages? */
-+    LMTP_LONG_ERROR_MSGS = 1,
-+
-+    /* default time to wait, in seconds, before giving up
-+     * trying to lock something */
-+    LOCK_GIVEUP_TIMER_DEFAULT = 100
-+};
-+
-+#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-+])
-+m4trace:configure.in:1220: -1- AC_CONFIG_FILES([man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile])
-+m4trace:configure.in:1220: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
-+You should run autoupdate.], [])
-+m4trace:configure.in:1220: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
-+m4trace:configure.in:1220: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-+m4trace:configure.in:1220: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([LTLIBOBJS])
-+m4trace:configure.in:1220: -1- m4_pattern_allow([^LTLIBOBJS$])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([top_builddir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([srcdir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([abs_srcdir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([top_srcdir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([abs_top_srcdir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([builddir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([abs_builddir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([abs_top_builddir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([INSTALL])
-diff -urNad cyrus-imapd-2.2.13~/autom4te.cache/traces.1 cyrus-imapd-2.2.13/autom4te.cache/traces.1
---- cyrus-imapd-2.2.13~/autom4te.cache/traces.1	1970-01-01 00:00:00.000000000 +0000
-+++ cyrus-imapd-2.2.13/autom4te.cache/traces.1	2006-10-10 13:08:25.000000000 +0000
-@@ -0,0 +1,1522 @@
-+m4trace:aclocal.m4:14: -1- m4_include([cmulocal/berkdb.m4])
-+m4trace:aclocal.m4:15: -1- m4_include([cmulocal/bsd_sockets.m4])
-+m4trace:aclocal.m4:16: -1- m4_include([cmulocal/c-attribute.m4])
-+m4trace:aclocal.m4:17: -1- m4_include([cmulocal/c-fpic.m4])
-+m4trace:aclocal.m4:18: -1- m4_include([cmulocal/common.m4])
-+m4trace:aclocal.m4:19: -1- m4_include([cmulocal/cyrus.m4])
-+m4trace:aclocal.m4:20: -1- m4_include([cmulocal/ipv6.m4])
-+m4trace:aclocal.m4:21: -1- m4_include([cmulocal/libwrap.m4])
-+m4trace:aclocal.m4:22: -1- m4_include([cmulocal/sasl2.m4])
-+m4trace:aclocal.m4:23: -1- m4_include([cmulocal/ucdsnmp.m4])
-+m4trace:configure.in:49: -1- AC_INIT([imap/imapd.c])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([^_?A[CHUM]_])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([_AC_])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^AS_FLAGS$])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([^_?m4_])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([^dnl$])
-+m4trace:configure.in:49: -1- m4_pattern_forbid([^_?AS_])
-+m4trace:configure.in:49: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([SHELL])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^SHELL$])
-+m4trace:configure.in:49: -1- AC_SUBST([PATH_SEPARATOR])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PATH_SEPARATOR])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PATH_SEPARATOR$])
-+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE_NAME])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_NAME$])
-+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE_TARNAME])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE_VERSION])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE_STRING])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_STRING$])
-+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-+m4trace:configure.in:49: -1- AC_SUBST([exec_prefix], [NONE])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([exec_prefix])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^exec_prefix$])
-+m4trace:configure.in:49: -1- AC_SUBST([prefix], [NONE])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([prefix])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^prefix$])
-+m4trace:configure.in:49: -1- AC_SUBST([program_transform_name], [s,x,x,])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([program_transform_name])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^program_transform_name$])
-+m4trace:configure.in:49: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([bindir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^bindir$])
-+m4trace:configure.in:49: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([sbindir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^sbindir$])
-+m4trace:configure.in:49: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([libexecdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^libexecdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([datarootdir], ['${prefix}/share'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([datarootdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^datarootdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([datadir], ['${datarootdir}'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([datadir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^datadir$])
-+m4trace:configure.in:49: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([sysconfdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^sysconfdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([sharedstatedir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^sharedstatedir$])
-+m4trace:configure.in:49: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([localstatedir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^localstatedir$])
-+m4trace:configure.in:49: -1- AC_SUBST([includedir], ['${prefix}/include'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([includedir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^includedir$])
-+m4trace:configure.in:49: -1- AC_SUBST([oldincludedir], ['/usr/include'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([oldincludedir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^oldincludedir$])
-+m4trace:configure.in:49: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
-+				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
-+				     ['${datarootdir}/doc/${PACKAGE}'])])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([docdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^docdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([infodir], ['${datarootdir}/info'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([infodir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^infodir$])
-+m4trace:configure.in:49: -1- AC_SUBST([htmldir], ['${docdir}'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([htmldir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^htmldir$])
-+m4trace:configure.in:49: -1- AC_SUBST([dvidir], ['${docdir}'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([dvidir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^dvidir$])
-+m4trace:configure.in:49: -1- AC_SUBST([pdfdir], ['${docdir}'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([pdfdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^pdfdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([psdir], ['${docdir}'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([psdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^psdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([libdir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^libdir$])
-+m4trace:configure.in:49: -1- AC_SUBST([localedir], ['${datarootdir}/locale'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([localedir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^localedir$])
-+m4trace:configure.in:49: -1- AC_SUBST([mandir], ['${datarootdir}/man'])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([mandir])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^mandir$])
-+m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_NAME$])
-+m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
-+#undef PACKAGE_NAME])
-+m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_TARNAME$])
-+m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME])
-+m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_VERSION$])
-+m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
-+#undef PACKAGE_VERSION])
-+m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_STRING$])
-+m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING])
-+m4trace:configure.in:49: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$])
-+m4trace:configure.in:49: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT])
-+m4trace:configure.in:49: -1- AC_SUBST([DEFS])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([DEFS])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^DEFS$])
-+m4trace:configure.in:49: -1- AC_SUBST([ECHO_C])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([ECHO_C])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^ECHO_C$])
-+m4trace:configure.in:49: -1- AC_SUBST([ECHO_N])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([ECHO_N])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^ECHO_N$])
-+m4trace:configure.in:49: -1- AC_SUBST([ECHO_T])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([ECHO_T])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^ECHO_T$])
-+m4trace:configure.in:49: -1- AC_SUBST([LIBS])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([LIBS])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^LIBS$])
-+m4trace:configure.in:49: -1- AC_SUBST([build_alias])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([build_alias])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^build_alias$])
-+m4trace:configure.in:49: -1- AC_SUBST([host_alias])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([host_alias])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^host_alias$])
-+m4trace:configure.in:49: -1- AC_SUBST([target_alias])
-+m4trace:configure.in:49: -1- AC_SUBST_TRACE([target_alias])
-+m4trace:configure.in:49: -1- m4_pattern_allow([^target_alias$])
-+m4trace:configure.in:51: -1- AC_CONFIG_HEADERS([config.h])
-+m4trace:configure.in:52: -1- AC_CANONICAL_HOST
-+m4trace:configure.in:52: -1- AC_CANONICAL_BUILD
-+m4trace:configure.in:52: -1- AC_REQUIRE_AUX_FILE([config.sub])
-+m4trace:configure.in:52: -1- AC_REQUIRE_AUX_FILE([config.guess])
-+m4trace:configure.in:52: -1- AC_SUBST([build], [$ac_cv_build])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([build])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^build$])
-+m4trace:configure.in:52: -1- AC_SUBST([build_cpu], [$[1]])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([build_cpu])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^build_cpu$])
-+m4trace:configure.in:52: -1- AC_SUBST([build_vendor], [$[2]])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([build_vendor])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^build_vendor$])
-+m4trace:configure.in:52: -1- AC_SUBST([build_os])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([build_os])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^build_os$])
-+m4trace:configure.in:52: -1- AC_SUBST([host], [$ac_cv_host])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([host])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^host$])
-+m4trace:configure.in:52: -1- AC_SUBST([host_cpu], [$[1]])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([host_cpu])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^host_cpu$])
-+m4trace:configure.in:52: -1- AC_SUBST([host_vendor], [$[2]])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([host_vendor])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^host_vendor$])
-+m4trace:configure.in:52: -1- AC_SUBST([host_os])
-+m4trace:configure.in:52: -1- AC_SUBST_TRACE([host_os])
-+m4trace:configure.in:52: -1- m4_pattern_allow([^host_os$])
-+m4trace:configure.in:57: -1- AC_SUBST([WARNERROR])
-+m4trace:configure.in:57: -1- AC_SUBST_TRACE([WARNERROR])
-+m4trace:configure.in:57: -1- m4_pattern_allow([^WARNERROR$])
-+m4trace:configure.in:61: -1- AC_DEFINE_TRACE_LITERAL([EXTRA_IDENT])
-+m4trace:configure.in:61: -1- m4_pattern_allow([^EXTRA_IDENT$])
-+m4trace:configure.in:61: -1- AH_OUTPUT([EXTRA_IDENT], [/* Extra version information for imap/version.h */
-+#undef EXTRA_IDENT])
-+m4trace:configure.in:63: -1- AC_SUBST([MAKEDEPEND])
-+m4trace:configure.in:63: -1- AC_SUBST_TRACE([MAKEDEPEND])
-+m4trace:configure.in:63: -1- m4_pattern_allow([^MAKEDEPEND$])
-+m4trace:configure.in:69: -2- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+configure.in:69: the top level])
-+m4trace:configure.in:73: -1- AC_SUBST([cyrus_prefix])
-+m4trace:configure.in:73: -1- AC_SUBST_TRACE([cyrus_prefix])
-+m4trace:configure.in:73: -1- m4_pattern_allow([^cyrus_prefix$])
-+m4trace:configure.in:74: -1- AC_DEFINE_TRACE_LITERAL([CYRUS_PATH])
-+m4trace:configure.in:74: -1- m4_pattern_allow([^CYRUS_PATH$])
-+m4trace:configure.in:74: -1- AH_OUTPUT([CYRUS_PATH], [/* Where will we be installed? */
-+#undef CYRUS_PATH])
-+m4trace:configure.in:77: -1- AC_SUBST([service_path])
-+m4trace:configure.in:77: -1- AC_SUBST_TRACE([service_path])
-+m4trace:configure.in:77: -1- m4_pattern_allow([^service_path$])
-+m4trace:configure.in:78: -1- AC_DEFINE_TRACE_LITERAL([SERVICE_PATH])
-+m4trace:configure.in:78: -1- m4_pattern_allow([^SERVICE_PATH$])
-+m4trace:configure.in:78: -1- AH_OUTPUT([SERVICE_PATH], [/* Directiory to use for service binaries */
-+#undef SERVICE_PATH])
-+m4trace:configure.in:81: -1- AC_SUBST([cyrus_user])
-+m4trace:configure.in:81: -1- AC_SUBST_TRACE([cyrus_user])
-+m4trace:configure.in:81: -1- m4_pattern_allow([^cyrus_user$])
-+m4trace:configure.in:82: -1- AC_DEFINE_TRACE_LITERAL([CYRUS_USER])
-+m4trace:configure.in:82: -1- m4_pattern_allow([^CYRUS_USER$])
-+m4trace:configure.in:82: -1- AH_OUTPUT([CYRUS_USER], [/* What user will we run as? */
-+#undef CYRUS_USER])
-+m4trace:configure.in:85: -1- AC_SUBST([cyrus_group])
-+m4trace:configure.in:85: -1- AC_SUBST_TRACE([cyrus_group])
-+m4trace:configure.in:85: -1- m4_pattern_allow([^cyrus_group$])
-+m4trace:configure.in:92: -1- AC_DEFINE_TRACE_LITERAL([SYSCONFDIR])
-+m4trace:configure.in:92: -1- m4_pattern_allow([^SYSCONFDIR$])
-+m4trace:configure.in:92: -1- AH_OUTPUT([SYSCONFDIR], [/* Config File Location */
-+#undef SYSCONFDIR])
-+m4trace:configure.in:94: -1- AC_PROG_CC
-+m4trace:configure.in:94: -1- AC_SUBST([CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([CFLAGS])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CFLAGS])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CFLAGS$])
-+m4trace:configure.in:94: -1- AC_SUBST([LDFLAGS])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([LDFLAGS])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^LDFLAGS$])
-+m4trace:configure.in:94: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:94: -1- AC_SUBST([CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([ac_ct_CC])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([ac_ct_CC])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^ac_ct_CC$])
-+m4trace:configure.in:94: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([EXEEXT])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^EXEEXT$])
-+m4trace:configure.in:94: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
-+m4trace:configure.in:94: -1- AC_SUBST_TRACE([OBJEXT])
-+m4trace:configure.in:94: -1- m4_pattern_allow([^OBJEXT$])
-+m4trace:configure.in:95: -1- AC_PROG_RANLIB
-+m4trace:configure.in:95: -1- AC_SUBST([RANLIB])
-+m4trace:configure.in:95: -1- AC_SUBST_TRACE([RANLIB])
-+m4trace:configure.in:95: -1- m4_pattern_allow([^RANLIB$])
-+m4trace:configure.in:96: -1- AC_PROG_MAKE_SET
-+m4trace:configure.in:96: -1- AC_SUBST([SET_MAKE])
-+m4trace:configure.in:96: -1- AC_SUBST_TRACE([SET_MAKE])
-+m4trace:configure.in:96: -1- m4_pattern_allow([^SET_MAKE$])
-+m4trace:configure.in:97: -1- AC_PROG_INSTALL
-+m4trace:configure.in:97: -1- AC_REQUIRE_AUX_FILE([install-sh])
-+m4trace:configure.in:97: -1- AC_SUBST([INSTALL_PROGRAM])
-+m4trace:configure.in:97: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
-+m4trace:configure.in:97: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-+m4trace:configure.in:97: -1- AC_SUBST([INSTALL_SCRIPT])
-+m4trace:configure.in:97: -1- AC_SUBST_TRACE([INSTALL_SCRIPT])
-+m4trace:configure.in:97: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-+m4trace:configure.in:97: -1- AC_SUBST([INSTALL_DATA])
-+m4trace:configure.in:97: -1- AC_SUBST_TRACE([INSTALL_DATA])
-+m4trace:configure.in:97: -1- m4_pattern_allow([^INSTALL_DATA$])
-+m4trace:configure.in:98: -1- AH_OUTPUT([_ALL_SOURCE], [/* Define to 1 if on AIX 3.
-+   System headers sometimes define this.
-+   We just want to avoid a redefinition error message.  */
-+@%:@ifndef _ALL_SOURCE
-+@%:@ undef _ALL_SOURCE
-+@%:@endif])
-+m4trace:configure.in:98: -1- AC_PROG_CPP
-+m4trace:configure.in:98: -1- AC_SUBST([CPP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([CPP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^CPP$])
-+m4trace:configure.in:98: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:98: -1- AC_SUBST([CPP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([CPP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^CPP$])
-+m4trace:configure.in:98: -1- AC_SUBST([GREP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([GREP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^GREP$])
-+m4trace:configure.in:98: -1- AC_SUBST([GREP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([GREP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^GREP$])
-+m4trace:configure.in:98: -1- AC_SUBST([EGREP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([EGREP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^EGREP$])
-+m4trace:configure.in:98: -1- AC_SUBST([EGREP])
-+m4trace:configure.in:98: -1- AC_SUBST_TRACE([EGREP])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^EGREP$])
-+m4trace:configure.in:98: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
-+m4trace:configure.in:98: -1- m4_pattern_allow([^_ALL_SOURCE$])
-+m4trace:configure.in:100: -1- AC_PROG_AWK
-+m4trace:configure.in:100: -1- AC_SUBST([AWK])
-+m4trace:configure.in:100: -1- AC_SUBST_TRACE([AWK])
-+m4trace:configure.in:100: -1- m4_pattern_allow([^AWK$])
-+m4trace:configure.in:101: -1- AC_C_CONST
-+m4trace:configure.in:101: -1- AC_DEFINE_TRACE_LITERAL([const])
-+m4trace:configure.in:101: -1- m4_pattern_allow([^const$])
-+m4trace:configure.in:101: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
-+#undef const])
-+m4trace:configure.in:108: -1- AC_C_INLINE
-+m4trace:configure.in:108: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
-+   calls it, or to nothing if \'inline\' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif])
-+m4trace:configure.in:110: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
-+cmulocal/c-attribute.m4:30: CMU_C___ATTRIBUTE__ is expanded from...
-+configure.in:110: the top level])
-+m4trace:configure.in:110: -1- AC_DEFINE_TRACE_LITERAL([HAVE___ATTRIBUTE__])
-+m4trace:configure.in:110: -1- m4_pattern_allow([^HAVE___ATTRIBUTE__$])
-+m4trace:configure.in:110: -1- AH_OUTPUT([HAVE___ATTRIBUTE__], [/* define if your compiler has __attribute__ */
-+#undef HAVE___ATTRIBUTE__])
-+m4trace:configure.in:111: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
-+cmulocal/c-fpic.m4:34: CMU_C_FPIC is expanded from...
-+configure.in:111: the top level])
-+m4trace:configure.in:113: -1- AC_HEADER_STDC
-+m4trace:configure.in:113: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-+m4trace:configure.in:113: -1- m4_pattern_allow([^STDC_HEADERS$])
-+m4trace:configure.in:113: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS])
-+m4trace:configure.in:113: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H])
-+m4trace:configure.in:113: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H])
-+m4trace:configure.in:113: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
-+m4trace:configure.in:113: -1- m4_pattern_allow([^SIZEOF_LONG$])
-+m4trace:configure.in:113: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of `long\', as computed by sizeof. */
-+#undef SIZEOF_LONG])
-+m4trace:configure.in:118: -1- AC_CHECK_HEADERS([unistd.h sys/select.h sys/param.h stdarg.h])
-+m4trace:configure.in:118: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H])
-+m4trace:configure.in:118: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
-+#undef HAVE_SYS_SELECT_H])
-+m4trace:configure.in:118: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
-+#undef HAVE_SYS_PARAM_H])
-+m4trace:configure.in:118: -1- AH_OUTPUT([HAVE_STDARG_H], [/* Define to 1 if you have the <stdarg.h> header file. */
-+#undef HAVE_STDARG_H])
-+m4trace:configure.in:119: -1- AC_LIBSOURCE([memmove.c])
-+m4trace:configure.in:119: -1- AC_LIBSOURCE([strcasecmp.c])
-+m4trace:configure.in:119: -1- AC_LIBSOURCE([ftruncate.c])
-+m4trace:configure.in:119: -1- AC_LIBSOURCE([strerror.c])
-+m4trace:configure.in:119: -1- AC_CHECK_FUNCS([memmove strcasecmp ftruncate strerror], [], [_AC_LIBOBJ($ac_func)])
-+m4trace:configure.in:119: -1- AH_OUTPUT([HAVE_MEMMOVE], [/* Define to 1 if you have the `memmove\' function. */
-+#undef HAVE_MEMMOVE])
-+m4trace:configure.in:119: -1- AH_OUTPUT([HAVE_STRCASECMP], [/* Define to 1 if you have the `strcasecmp\' function. */
-+#undef HAVE_STRCASECMP])
-+m4trace:configure.in:119: -1- AH_OUTPUT([HAVE_FTRUNCATE], [/* Define to 1 if you have the `ftruncate\' function. */
-+#undef HAVE_FTRUNCATE])
-+m4trace:configure.in:119: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define to 1 if you have the `strerror\' function. */
-+#undef HAVE_STRERROR])
-+m4trace:configure.in:119: -1- AC_SUBST([LIB@&t at OBJS], ["$LIB@&t at OBJS $ac_func.$ac_objext"])
-+m4trace:configure.in:119: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
-+m4trace:configure.in:119: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-+m4trace:configure.in:120: -1- AC_CHECK_FUNCS([strlcat strlcpy])
-+m4trace:configure.in:120: -1- AH_OUTPUT([HAVE_STRLCAT], [/* Define to 1 if you have the `strlcat\' function. */
-+#undef HAVE_STRLCAT])
-+m4trace:configure.in:120: -1- AH_OUTPUT([HAVE_STRLCPY], [/* Define to 1 if you have the `strlcpy\' function. */
-+#undef HAVE_STRLCPY])
-+m4trace:configure.in:121: -1- AC_HEADER_DIRENT
-+m4trace:configure.in:121: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
-+   */
-+#undef HAVE_DIRENT_H])
-+m4trace:configure.in:121: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
-+   */
-+#undef HAVE_SYS_NDIR_H])
-+m4trace:configure.in:121: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
-+   */
-+#undef HAVE_SYS_DIR_H])
-+m4trace:configure.in:121: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
-+#undef HAVE_NDIR_H])
-+m4trace:configure.in:124: -2- AC_CHECK_LIB([nsl], [gethostbyname], [LIB_SOCKET="-lnsl $LIB_SOCKET"])
-+m4trace:configure.in:124: -2- AC_CHECK_LIB([socket], [connect], [LIB_SOCKET="-lsocket $LIB_SOCKET"])
-+m4trace:configure.in:124: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2429: AC_TRY_LINK is expanded from...
-+cmulocal/bsd_sockets.m4:39: CMU_SOCKETS is expanded from...
-+configure.in:124: the top level])
-+m4trace:configure.in:124: -1- AC_CHECK_FUNCS([dn_expand dns_lookup])
-+m4trace:configure.in:124: -1- AH_OUTPUT([HAVE_DN_EXPAND], [/* Define to 1 if you have the `dn_expand\' function. */
-+#undef HAVE_DN_EXPAND])
-+m4trace:configure.in:124: -1- AH_OUTPUT([HAVE_DNS_LOOKUP], [/* Define to 1 if you have the `dns_lookup\' function. */
-+#undef HAVE_DNS_LOOKUP])
-+m4trace:configure.in:124: -1- AC_SUBST([LIB_SOCKET])
-+m4trace:configure.in:124: -1- AC_SUBST_TRACE([LIB_SOCKET])
-+m4trace:configure.in:124: -1- m4_pattern_allow([^LIB_SOCKET$])
-+m4trace:configure.in:131: -1- AC_CHECK_LIB([socket], [getaddrinfo], [dnl
-+    LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_getaddrinfo=no
-+  ], [dnl
-+    AC_MSG_CHECKING([whether your system has IPv6 directory])
-+    AC_CACHE_VAL(ipv6_cv_dir, [dnl
-+      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done])dnl
-+    AC_MSG_RESULT($ipv6_cv_dir)
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_getaddrinfo=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      AC_CHECK_LIB(inet6, getaddrinfo, [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi],)dnl
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi])
-+m4trace:configure.in:131: -1- AC_CHECK_LIB([inet6], [getaddrinfo], [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi], [])
-+m4trace:configure.in:131: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
-+m4trace:configure.in:131: -1- m4_pattern_allow([^HAVE_GETADDRINFO$])
-+m4trace:configure.in:131: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
-+#undef HAVE_GETADDRINFO])
-+m4trace:configure.in:131: -2- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
-+m4trace:configure.in:131: -2- m4_pattern_allow([^HAVE_GETADDRINFO$])
-+m4trace:configure.in:131: -2- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
-+#undef HAVE_GETADDRINFO])
-+m4trace:configure.in:131: -1- AC_CHECK_LIB([socket], [gai_strerror], [dnl
-+    LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_gai_strerror=no
-+  ], [dnl
-+    AC_MSG_CHECKING([whether your system has IPv6 directory])
-+    AC_CACHE_VAL(ipv6_cv_dir, [dnl
-+      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done])dnl
-+    AC_MSG_RESULT($ipv6_cv_dir)
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_gai_strerror=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      AC_CHECK_LIB(inet6, gai_strerror, [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi],)dnl
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi])
-+m4trace:configure.in:131: -1- AC_CHECK_LIB([inet6], [gai_strerror], [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi], [])
-+m4trace:configure.in:131: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
-+m4trace:configure.in:131: -1- m4_pattern_allow([^HAVE_GETADDRINFO$])
-+m4trace:configure.in:131: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
-+#undef HAVE_GETADDRINFO])
-+m4trace:configure.in:139: -2- AC_DEFINE_TRACE_LITERAL([HAVE_GETNAMEINFO])
-+m4trace:configure.in:139: -2- m4_pattern_allow([^HAVE_GETNAMEINFO$])
-+m4trace:configure.in:139: -2- AH_OUTPUT([HAVE_GETNAMEINFO], [/* Do we have a getnameinfo? */
-+#undef HAVE_GETNAMEINFO])
-+m4trace:configure.in:140: -1- AC_CHECK_LIB([socket], [getnameinfo], [dnl
-+    LIBS="$LIBS -lsocket"
-+    ac_cv_lib_inet6_getnameinfo=no
-+  ], [dnl
-+    AC_MSG_CHECKING([whether your system has IPv6 directory])
-+    AC_CACHE_VAL(ipv6_cv_dir, [dnl
-+      for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
-+	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
-+	  break
-+	fi
-+      done])dnl
-+    AC_MSG_RESULT($ipv6_cv_dir)
-+    if test $ipv6_cv_dir = no; then
-+      ac_cv_lib_inet6_getnameinfo=no
-+    else
-+      if test x$ipv6_libinet6 = x; then
-+	ipv6_libinet6=no
-+	SAVELDFLAGS="$LDFLAGS"
-+	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
-+      fi
-+      AC_CHECK_LIB(inet6, getnameinfo, [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi],)dnl
-+      if test $ipv6_libinet6 = no; then
-+	LDFLAGS="$SAVELDFLAGS"
-+      fi
-+    fi])
-+m4trace:configure.in:140: -1- AC_CHECK_LIB([inet6], [getnameinfo], [dnl
-+	if test $ipv6_libinet6 = no; then
-+	  ipv6_libinet6=yes
-+	  LIBS="$LIBS -linet6"
-+	fi], [])
-+m4trace:configure.in:140: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
-+m4trace:configure.in:140: -1- m4_pattern_allow([^HAVE_GETADDRINFO$])
-+m4trace:configure.in:140: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
-+#undef HAVE_GETADDRINFO])
-+m4trace:configure.in:146: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
-+cmulocal/ipv6.m4:78: IPv6_CHECK_SS_FAMILY is expanded from...
-+configure.in:146: the top level])
-+m4trace:configure.in:146: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SS_FAMILY])
-+m4trace:configure.in:146: -2- m4_pattern_allow([^HAVE_SS_FAMILY$])
-+m4trace:configure.in:146: -2- AH_OUTPUT([HAVE_SS_FAMILY], [/* Is there an ss_family in sockaddr_storage? */
-+#undef HAVE_SS_FAMILY])
-+m4trace:configure.in:147: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
-+cmulocal/ipv6.m4:94: IPv6_CHECK_SA_LEN is expanded from...
-+configure.in:147: the top level])
-+m4trace:configure.in:147: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_SA_LEN])
-+m4trace:configure.in:147: -2- m4_pattern_allow([^HAVE_SOCKADDR_SA_LEN$])
-+m4trace:configure.in:147: -2- AH_OUTPUT([HAVE_SOCKADDR_SA_LEN], [/* Does sockaddr have an sa_len? */
-+#undef HAVE_SOCKADDR_SA_LEN])
-+m4trace:configure.in:149: -1- AC_SUBST([IPV6_OBJS])
-+m4trace:configure.in:149: -1- AC_SUBST_TRACE([IPV6_OBJS])
-+m4trace:configure.in:149: -1- m4_pattern_allow([^IPV6_OBJS$])
-+m4trace:configure.in:152: -1- AC_CHECK_HEADERS([sys/time.h])
-+m4trace:configure.in:152: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H])
-+m4trace:configure.in:153: -1- AC_HEADER_TIME
-+m4trace:configure.in:153: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
-+m4trace:configure.in:153: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-+m4trace:configure.in:153: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#undef TIME_WITH_SYS_TIME])
-+m4trace:configure.in:154: -1- AC_STRUCT_TM
-+m4trace:configure.in:154: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
-+m4trace:configure.in:154: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
-+m4trace:configure.in:154: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
-+#undef TM_IN_SYS_TIME])
-+m4trace:configure.in:155: -1- AC_STRUCT_TIMEZONE
-+m4trace:configure.in:155: -1- AC_CHECK_MEMBERS([struct tm.tm_zone], [], [], [#include <sys/types.h>
-+#include <$ac_cv_struct_tm>
-+])
-+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_TM_TM_ZONE])
-+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_STRUCT_TM_TM_ZONE$])
-+m4trace:configure.in:155: -1- AH_OUTPUT([HAVE_STRUCT_TM_TM_ZONE], [/* Define to 1 if `tm_zone\' is member of `struct tm\'. */
-+#undef HAVE_STRUCT_TM_TM_ZONE])
-+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TM_ZONE])
-+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_TM_ZONE$])
-+m4trace:configure.in:155: -1- AH_OUTPUT([HAVE_TM_ZONE], [/* Define to 1 if your `struct tm\' has `tm_zone\'. Deprecated, use
-+   `HAVE_STRUCT_TM_TM_ZONE\' instead. */
-+#undef HAVE_TM_ZONE])
-+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_TZNAME])
-+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_DECL_TZNAME$])
-+m4trace:configure.in:155: -1- AH_OUTPUT([HAVE_DECL_TZNAME], [/* Define to 1 if you have the declaration of `tzname\', and to 0 if you don\'t.
-+   */
-+#undef HAVE_DECL_TZNAME])
-+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DECL_TZNAME])
-+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_DECL_TZNAME$])
-+m4trace:configure.in:155: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TZNAME])
-+m4trace:configure.in:155: -1- m4_pattern_allow([^HAVE_TZNAME$])
-+m4trace:configure.in:155: -1- AH_OUTPUT([HAVE_TZNAME], [/* Define to 1 if you don\'t have `tm_zone\' but do have the external array
-+   `tzname\'. */
-+#undef HAVE_TZNAME])
-+m4trace:configure.in:157: -1- AC_SUBST([CPPFLAGS])
-+m4trace:configure.in:157: -1- AC_SUBST_TRACE([CPPFLAGS])
-+m4trace:configure.in:157: -1- m4_pattern_allow([^CPPFLAGS$])
-+m4trace:configure.in:158: -1- AC_SUBST([PRE_SUBDIRS])
-+m4trace:configure.in:158: -1- AC_SUBST_TRACE([PRE_SUBDIRS])
-+m4trace:configure.in:158: -1- m4_pattern_allow([^PRE_SUBDIRS$])
-+m4trace:configure.in:159: -1- AC_SUBST([EXTRA_SUBDIRS])
-+m4trace:configure.in:159: -1- AC_SUBST_TRACE([EXTRA_SUBDIRS])
-+m4trace:configure.in:159: -1- m4_pattern_allow([^EXTRA_SUBDIRS$])
-+m4trace:configure.in:160: -1- AC_SUBST([DEPLIBS])
-+m4trace:configure.in:160: -1- AC_SUBST_TRACE([DEPLIBS])
-+m4trace:configure.in:160: -1- m4_pattern_allow([^DEPLIBS$])
-+m4trace:configure.in:161: -1- AC_SUBST([LOCALDEFS])
-+m4trace:configure.in:161: -1- AC_SUBST_TRACE([LOCALDEFS])
-+m4trace:configure.in:161: -1- m4_pattern_allow([^LOCALDEFS$])
-+m4trace:configure.in:162: -1- AC_FUNC_VPRINTF
-+m4trace:configure.in:162: -1- AC_CHECK_FUNCS([vprintf], [
-+AC_CHECK_FUNC(_doprnt,
-+	       [AC_DEFINE(HAVE_DOPRNT, 1,
-+			  [Define to 1 if you don't have `vprintf' but do have
-+			  `_doprnt.'])])])
-+m4trace:configure.in:162: -1- AH_OUTPUT([HAVE_VPRINTF], [/* Define to 1 if you have the `vprintf\' function. */
-+#undef HAVE_VPRINTF])
-+m4trace:configure.in:162: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DOPRNT])
-+m4trace:configure.in:162: -1- m4_pattern_allow([^HAVE_DOPRNT$])
-+m4trace:configure.in:162: -1- AH_OUTPUT([HAVE_DOPRNT], [/* Define to 1 if you don\'t have `vprintf\' but do have `_doprnt.\' */
-+#undef HAVE_DOPRNT])
-+m4trace:configure.in:195: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2429: AC_TRY_LINK is expanded from...
-+cmulocal/berkdb.m4:235: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+cmulocal/berkdb.m4:269: CYRUS_BERKELEY_DB_CHK is expanded from...
-+configure.in:195: the top level])
-+m4trace:configure.in:195: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2429: AC_TRY_LINK is expanded from...
-+cmulocal/berkdb.m4:235: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+cmulocal/berkdb.m4:269: CYRUS_BERKELEY_DB_CHK is expanded from...
-+configure.in:195: the top level])
-+m4trace:configure.in:199: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+configure.in:199: the top level])
-+m4trace:configure.in:208: -1- AC_SUBST([BDB_INC])
-+m4trace:configure.in:208: -1- AC_SUBST_TRACE([BDB_INC])
-+m4trace:configure.in:208: -1- m4_pattern_allow([^BDB_INC$])
-+m4trace:configure.in:209: -1- AC_SUBST([BDB_LIB])
-+m4trace:configure.in:209: -1- AC_SUBST_TRACE([BDB_LIB])
-+m4trace:configure.in:209: -1- m4_pattern_allow([^BDB_LIB$])
-+m4trace:configure.in:215: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BDB])
-+m4trace:configure.in:215: -1- m4_pattern_allow([^HAVE_BDB$])
-+m4trace:configure.in:215: -1- AH_OUTPUT([HAVE_BDB], [/* Build in Berkeley DB support? */
-+#undef HAVE_BDB])
-+m4trace:configure.in:220: -1- AC_SUBST([CYRUSDB_OBJS])
-+m4trace:configure.in:220: -1- AC_SUBST_TRACE([CYRUSDB_OBJS])
-+m4trace:configure.in:220: -1- m4_pattern_allow([^CYRUSDB_OBJS$])
-+m4trace:configure.in:232: -1- AC_SUBST([SIEVE_OBJS])
-+m4trace:configure.in:232: -1- AC_SUBST_TRACE([SIEVE_OBJS])
-+m4trace:configure.in:232: -1- m4_pattern_allow([^SIEVE_OBJS$])
-+m4trace:configure.in:234: -1- AC_SUBST([SIEVE_LIBS])
-+m4trace:configure.in:234: -1- AC_SUBST_TRACE([SIEVE_LIBS])
-+m4trace:configure.in:234: -1- m4_pattern_allow([^SIEVE_LIBS$])
-+m4trace:configure.in:236: -1- AC_SUBST([SIEVE_CPPFLAGS])
-+m4trace:configure.in:236: -1- AC_SUBST_TRACE([SIEVE_CPPFLAGS])
-+m4trace:configure.in:236: -1- m4_pattern_allow([^SIEVE_CPPFLAGS$])
-+m4trace:configure.in:237: -1- AC_DEFINE_TRACE_LITERAL([USE_SIEVE])
-+m4trace:configure.in:237: -1- m4_pattern_allow([^USE_SIEVE$])
-+m4trace:configure.in:237: -1- AH_OUTPUT([USE_SIEVE], [/* Build in Sieve support? */
-+#undef USE_SIEVE])
-+m4trace:configure.in:240: -1- AC_PROG_YACC
-+m4trace:configure.in:240: -1- AC_SUBST([YACC])
-+m4trace:configure.in:240: -1- AC_SUBST_TRACE([YACC])
-+m4trace:configure.in:240: -1- m4_pattern_allow([^YACC$])
-+m4trace:configure.in:240: -1- AC_SUBST([YACC])
-+m4trace:configure.in:240: -1- AC_SUBST_TRACE([YACC])
-+m4trace:configure.in:240: -1- m4_pattern_allow([^YACC$])
-+m4trace:configure.in:240: -1- AC_SUBST([YFLAGS])
-+m4trace:configure.in:240: -1- AC_SUBST_TRACE([YFLAGS])
-+m4trace:configure.in:240: -1- m4_pattern_allow([^YFLAGS$])
-+m4trace:configure.in:241: -1- AC_PROG_LEX
-+m4trace:configure.in:241: -1- AC_SUBST([LEX])
-+m4trace:configure.in:241: -1- AC_SUBST_TRACE([LEX])
-+m4trace:configure.in:241: -1- m4_pattern_allow([^LEX$])
-+m4trace:configure.in:241: -1- AC_SUBST([LEX_OUTPUT_ROOT], [$ac_cv_prog_lex_root])
-+m4trace:configure.in:241: -1- AC_SUBST_TRACE([LEX_OUTPUT_ROOT])
-+m4trace:configure.in:241: -1- m4_pattern_allow([^LEX_OUTPUT_ROOT$])
-+m4trace:configure.in:241: -1- AC_SUBST([LEXLIB])
-+m4trace:configure.in:241: -1- AC_SUBST_TRACE([LEXLIB])
-+m4trace:configure.in:241: -1- m4_pattern_allow([^LEXLIB$])
-+m4trace:configure.in:241: -1- AC_DEFINE_TRACE_LITERAL([YYTEXT_POINTER])
-+m4trace:configure.in:241: -1- m4_pattern_allow([^YYTEXT_POINTER$])
-+m4trace:configure.in:241: -1- AH_OUTPUT([YYTEXT_POINTER], [/* Define to 1 if `lex\' declares `yytext\' as a `char *\' by default, not a
-+   `char[]\'. */
-+#undef YYTEXT_POINTER])
-+m4trace:configure.in:242: -1- AC_CHECK_LIB([fl], [main])
-+m4trace:configure.in:242: -1- AH_OUTPUT([HAVE_LIBFL], [/* Define to 1 if you have the `fl\' library (-lfl). */
-+#undef HAVE_LIBFL])
-+m4trace:configure.in:242: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBFL])
-+m4trace:configure.in:242: -1- m4_pattern_allow([^HAVE_LIBFL$])
-+m4trace:configure.in:246: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_REGEX])
-+m4trace:configure.in:246: -1- m4_pattern_allow([^ENABLE_REGEX$])
-+m4trace:configure.in:246: -1- AH_OUTPUT([ENABLE_REGEX], [/* Do we have a decent regex library? */
-+#undef ENABLE_REGEX])
-+m4trace:configure.in:246: -2- AC_DEFINE_TRACE_LITERAL([HAVE_RX])
-+m4trace:configure.in:246: -2- m4_pattern_allow([^HAVE_RX$])
-+m4trace:configure.in:246: -2- AH_OUTPUT([HAVE_RX], [/* Do we have rxposix.h? */
-+#undef HAVE_RX])
-+m4trace:configure.in:253: -1- AC_SUBST([SIEVE_SUBDIRS])
-+m4trace:configure.in:253: -1- AC_SUBST_TRACE([SIEVE_SUBDIRS])
-+m4trace:configure.in:253: -1- m4_pattern_allow([^SIEVE_SUBDIRS$])
-+m4trace:configure.in:256: -2- AC_DEFINE_TRACE_LITERAL([HAS_STRERROR])
-+m4trace:configure.in:256: -2- m4_pattern_allow([^HAS_STRERROR$])
-+m4trace:configure.in:256: -2- AH_OUTPUT([HAS_STRERROR], [/* Do we have strerror()? */
-+#undef HAS_STRERROR])
-+m4trace:configure.in:257: -2- AC_DEFINE_TRACE_LITERAL([NEED_SYS_ERRLIST])
-+m4trace:configure.in:257: -2- m4_pattern_allow([^NEED_SYS_ERRLIST$])
-+m4trace:configure.in:257: -2- AH_OUTPUT([NEED_SYS_ERRLIST], [/* Do we have a sys_errlist? */
-+#undef NEED_SYS_ERRLIST])
-+m4trace:configure.in:257: -1- _m4_warn([obsolete], [The macro `AC_FUNC_CHECK' is obsolete.
-+You should run autoupdate.], [autoconf/functions.m4:138: AC_FUNC_CHECK is expanded from...
-+configure.in:257: the top level])
-+m4trace:configure.in:260: -1- AC_CHECK_HEADERS([sys/resource.h])
-+m4trace:configure.in:260: -1- AH_OUTPUT([HAVE_SYS_RESOURCE_H], [/* Define to 1 if you have the <sys/resource.h> header file. */
-+#undef HAVE_SYS_RESOURCE_H])
-+m4trace:configure.in:261: -1- AC_CHECK_FUNCS([setrlimit])
-+m4trace:configure.in:261: -1- AH_OUTPUT([HAVE_SETRLIMIT], [/* Define to 1 if you have the `setrlimit\' function. */
-+#undef HAVE_SETRLIMIT])
-+m4trace:configure.in:262: -1- AC_CHECK_FUNCS([getrlimit])
-+m4trace:configure.in:262: -1- AH_OUTPUT([HAVE_GETRLIMIT], [/* Define to 1 if you have the `getrlimit\' function. */
-+#undef HAVE_GETRLIMIT])
-+m4trace:configure.in:265: -1- AC_CHECK_FUNCS([daemon setsid])
-+m4trace:configure.in:265: -1- AH_OUTPUT([HAVE_DAEMON], [/* Define to 1 if you have the `daemon\' function. */
-+#undef HAVE_DAEMON])
-+m4trace:configure.in:265: -1- AH_OUTPUT([HAVE_SETSID], [/* Define to 1 if you have the `setsid\' function. */
-+#undef HAVE_SETSID])
-+m4trace:configure.in:268: -1- AC_CHECK_FUNCS([shutdown])
-+m4trace:configure.in:268: -1- AH_OUTPUT([HAVE_SHUTDOWN], [/* Define to 1 if you have the `shutdown\' function. */
-+#undef HAVE_SHUTDOWN])
-+m4trace:configure.in:270: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKLEN_T])
-+m4trace:configure.in:270: -2- m4_pattern_allow([^HAVE_SOCKLEN_T$])
-+m4trace:configure.in:270: -2- AH_OUTPUT([HAVE_SOCKLEN_T], [/* Do we have a socklen_t? */
-+#undef HAVE_SOCKLEN_T])
-+m4trace:configure.in:272: -2- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR_STORAGE])
-+m4trace:configure.in:272: -2- m4_pattern_allow([^HAVE_STRUCT_SOCKADDR_STORAGE$])
-+m4trace:configure.in:272: -2- AH_OUTPUT([HAVE_STRUCT_SOCKADDR_STORAGE], [/* Do we have a sockaddr_storage? */
-+#undef HAVE_STRUCT_SOCKADDR_STORAGE])
-+m4trace:configure.in:273: -2- AC_DEFINE_TRACE_LITERAL([HAVE_RLIM_T])
-+m4trace:configure.in:273: -2- m4_pattern_allow([^HAVE_RLIM_T$])
-+m4trace:configure.in:273: -2- AH_OUTPUT([HAVE_RLIM_T], [/* Do we have an rlim_t? */
-+#undef HAVE_RLIM_T])
-+m4trace:configure.in:281: -1- AC_CHECK_LIB([util], [setproctitle], [spt_type=SPT_BUILTIN
-+			LIBS="${LIBS} -lutil"])
-+m4trace:configure.in:296: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+configure.in:296: the top level])
-+m4trace:configure.in:307: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+configure.in:307: the top level])
-+m4trace:configure.in:318: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+configure.in:318: the top level])
-+m4trace:configure.in:325: -1- AC_DEFINE_TRACE_LITERAL([SPT_TYPE])
-+m4trace:configure.in:325: -1- m4_pattern_allow([^SPT_TYPE$])
-+m4trace:configure.in:325: -1- AH_OUTPUT([SPT_TYPE], [/* Do we already have setproctitle? */
-+#undef SPT_TYPE])
-+m4trace:configure.in:335: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2429: AC_TRY_LINK is expanded from...
-+configure.in:335: the top level])
-+m4trace:configure.in:337: -1- AC_SUBST([WITH_NONBLOCK])
-+m4trace:configure.in:337: -1- AC_SUBST_TRACE([WITH_NONBLOCK])
-+m4trace:configure.in:337: -1- m4_pattern_allow([^WITH_NONBLOCK$])
-+m4trace:configure.in:344: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2384: AC_TRY_COMPILE is expanded from...
-+configure.in:344: the top level])
-+m4trace:configure.in:346: -1- AC_SUBST([WITH_GMTOFF])
-+m4trace:configure.in:346: -1- AC_SUBST_TRACE([WITH_GMTOFF])
-+m4trace:configure.in:346: -1- m4_pattern_allow([^WITH_GMTOFF$])
-+m4trace:configure.in:374: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2493: AC_TRY_RUN is expanded from...
-+configure.in:374: the top level])
-+m4trace:configure.in:406: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2493: AC_TRY_RUN is expanded from...
-+configure.in:406: the top level])
-+m4trace:configure.in:417: -1- AC_SUBST([WITH_MAP])
-+m4trace:configure.in:417: -1- AC_SUBST_TRACE([WITH_MAP])
-+m4trace:configure.in:417: -1- m4_pattern_allow([^WITH_MAP$])
-+m4trace:configure.in:426: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/functions.m4:75: AC_CHECK_FUNC is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/functions.m4:75: AC_CHECK_FUNC is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1400: AC_ARG_WITH is expanded from...
-+configure.in:426: the top level])
-+m4trace:configure.in:428: -1- AC_SUBST([WITH_LOCK])
-+m4trace:configure.in:428: -1- AC_SUBST_TRACE([WITH_LOCK])
-+m4trace:configure.in:428: -1- m4_pattern_allow([^WITH_LOCK$])
-+m4trace:configure.in:432: -2- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
-+m4trace:configure.in:432: -2- m4_pattern_allow([^HAVE_FDATASYNC$])
-+m4trace:configure.in:432: -2- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
-+#undef HAVE_FDATASYNC])
-+m4trace:configure.in:437: -1- AC_CHECK_LIB([rt], [fdatasync], [
-+	LIB_RT="-lrt"
-+	AC_DEFINE(HAVE_FDATASYNC,[],[Do we have fdatasync()?])
-+  ])
-+m4trace:configure.in:437: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
-+m4trace:configure.in:437: -1- m4_pattern_allow([^HAVE_FDATASYNC$])
-+m4trace:configure.in:437: -1- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
-+#undef HAVE_FDATASYNC])
-+m4trace:configure.in:458: -1- AC_CHECK_LIB([BSD], [sigvec], [cyrus_sigveclib="-lBSD"], [
-+    dnl not hp flavor
-+    SAVE_LDFLAGS="$LDFLAGS"
-+    dnl solaris flavor
-+    LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
-+    AC_CHECK_LIB(ucb, sigvec, [
-+      dnl more solaris flavor
-+      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"],
-+      [ cant_find_sigvec=yes ])
-+    LDFLAGS="$SAVE_LDFLAGS"])
-+m4trace:configure.in:458: -1- AC_CHECK_LIB([ucb], [sigvec], [
-+      dnl more solaris flavor
-+      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"], [ cant_find_sigvec=yes ])
-+m4trace:configure.in:459: -1- AC_SUBST([cyrus_sigveclib])
-+m4trace:configure.in:459: -1- AC_SUBST_TRACE([cyrus_sigveclib])
-+m4trace:configure.in:459: -1- m4_pattern_allow([^cyrus_sigveclib$])
-+m4trace:configure.in:473: -1- AC_DEFINE_TRACE_LITERAL([AFSPTS_USE_KRB5])
-+m4trace:configure.in:473: -1- m4_pattern_allow([^AFSPTS_USE_KRB5$])
-+m4trace:configure.in:473: -1- AH_OUTPUT([AFSPTS_USE_KRB5], [/* Should the AFS PTS plugin use krb5? */
-+#undef AFSPTS_USE_KRB5])
-+m4trace:configure.in:506: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2429: AC_TRY_LINK is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:1922: AC_CACHE_VAL is expanded from...
-+configure.in:506: the top level])
-+m4trace:configure.in:512: -1- AC_SUBST([AFS_LIBS])
-+m4trace:configure.in:512: -1- AC_SUBST_TRACE([AFS_LIBS])
-+m4trace:configure.in:512: -1- m4_pattern_allow([^AFS_LIBS$])
-+m4trace:configure.in:513: -1- AC_SUBST([AFS_LDFLAGS])
-+m4trace:configure.in:513: -1- AC_SUBST_TRACE([AFS_LDFLAGS])
-+m4trace:configure.in:513: -1- m4_pattern_allow([^AFS_LDFLAGS$])
-+m4trace:configure.in:514: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
-+m4trace:configure.in:514: -1- m4_pattern_allow([^HAVE_AFSKRB$])
-+m4trace:configure.in:514: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
-+#undef HAVE_AFSKRB])
-+m4trace:configure.in:518: -1- AC_SUBST([AFS_LIBS])
-+m4trace:configure.in:518: -1- AC_SUBST_TRACE([AFS_LIBS])
-+m4trace:configure.in:518: -1- m4_pattern_allow([^AFS_LIBS$])
-+m4trace:configure.in:519: -1- AC_SUBST([AFS_LDFLAGS])
-+m4trace:configure.in:519: -1- AC_SUBST_TRACE([AFS_LDFLAGS])
-+m4trace:configure.in:519: -1- m4_pattern_allow([^AFS_LDFLAGS$])
-+m4trace:configure.in:520: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
-+m4trace:configure.in:520: -1- m4_pattern_allow([^HAVE_AFSKRB$])
-+m4trace:configure.in:520: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
-+#undef HAVE_AFSKRB])
-+m4trace:configure.in:548: -1- AC_CHECK_LIB([ldap], [ldap_initialize], [ AC_DEFINE(HAVE_LDAP,[],[Should we build ldap pts module?])
-+          AC_SUBST(LDAP_CPPFLAGS)
-+          AC_SUBST(LDAP_LDFLAGS)
-+          AC_SUBST(LDAP_LIBS)	
-+          LDAP_LIBS="-lldap -llber" ], [], [-llber])
-+m4trace:configure.in:548: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDAP])
-+m4trace:configure.in:548: -1- m4_pattern_allow([^HAVE_LDAP$])
-+m4trace:configure.in:548: -1- AH_OUTPUT([HAVE_LDAP], [/* Should we build ldap pts module? */
-+#undef HAVE_LDAP])
-+m4trace:configure.in:548: -1- AC_SUBST([LDAP_CPPFLAGS])
-+m4trace:configure.in:548: -1- AC_SUBST_TRACE([LDAP_CPPFLAGS])
-+m4trace:configure.in:548: -1- m4_pattern_allow([^LDAP_CPPFLAGS$])
-+m4trace:configure.in:548: -1- AC_SUBST([LDAP_LDFLAGS])
-+m4trace:configure.in:548: -1- AC_SUBST_TRACE([LDAP_LDFLAGS])
-+m4trace:configure.in:548: -1- m4_pattern_allow([^LDAP_LDFLAGS$])
-+m4trace:configure.in:548: -1- AC_SUBST([LDAP_LIBS])
-+m4trace:configure.in:548: -1- AC_SUBST_TRACE([LDAP_LIBS])
-+m4trace:configure.in:548: -1- m4_pattern_allow([^LDAP_LIBS$])
-+m4trace:configure.in:557: -1- AC_DEFINE_TRACE_LITERAL([WITH_PTS])
-+m4trace:configure.in:557: -1- m4_pattern_allow([^WITH_PTS$])
-+m4trace:configure.in:557: -1- AH_OUTPUT([WITH_PTS], [/* Build in PTS support? */
-+#undef WITH_PTS])
-+m4trace:configure.in:566: -1- AC_SUBST([SERVER_SUBDIRS])
-+m4trace:configure.in:566: -1- AC_SUBST_TRACE([SERVER_SUBDIRS])
-+m4trace:configure.in:566: -1- m4_pattern_allow([^SERVER_SUBDIRS$])
-+m4trace:configure.in:584: -1- AC_CHECK_LIB([resolv], [res_search])
-+m4trace:configure.in:584: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
-+#undef HAVE_LIBRESOLV])
-+m4trace:configure.in:584: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
-+m4trace:configure.in:584: -1- m4_pattern_allow([^HAVE_LIBRESOLV$])
-+m4trace:configure.in:601: -1- AC_CHECK_LIB([des], [des_ecb_encrypt], [if test "$with_statickrb" = "yes"; then
-+          KRB_LIBS="$with_krb/lib/libdes.a"
-+      else
-+          KRB_LIBS="-ldes"
-+      fi], [{ { echo "$as_me:$LINENO: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&5
-+echo "$as_me: error: The Kerberos DES library is required for Kerberos support.  You might want --with-auth=unix." >&2;}
-+   { (exit 1); exit 1; }; }])
-+m4trace:configure.in:638: -3- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+configure.in:638: the top level])
-+m4trace:configure.in:639: -2- AC_CHECK_LIB([${KRBLIB}], [krb_mk_priv], [if test "$with_statickrb" = "yes"; then
-+          KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
-+      else
-+          KRB_LIBS="$KRB_LIBS -l${KRBLIB}"
-+      fi], [{ echo "$as_me:$LINENO: WARNING: No Kerberos V4 found" >&5
-+echo "$as_me: WARNING: No Kerberos V4 found" >&2;}; krb4=no], [$KRB_LIBS])
-+m4trace:configure.in:640: -2- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+configure.in:640: the top level])
-+m4trace:configure.in:642: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+configure.in:642: the top level])
-+m4trace:configure.in:647: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB])
-+m4trace:configure.in:647: -1- m4_pattern_allow([^HAVE_KRB$])
-+m4trace:configure.in:647: -1- AH_OUTPUT([HAVE_KRB], [/* Support for Kerberos? */
-+#undef HAVE_KRB])
-+m4trace:configure.in:671: -1- AC_CHECK_LIB([rsaref], [RSAPublicEncrypt], [LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes], [cmu_have_rsaref=no])
-+m4trace:configure.in:676: -1- AC_CHECK_LIB([crypto], [BIO_accept], [LIBS="-lcrypto $LIB_RSAREF ${LIBS}"], [with_openssl="no"], [$LIB_RSAREF])
-+m4trace:configure.in:678: -1- AC_CHECK_LIB([ssl], [SSL_CTX_new], [LIBS="-lssl ${LIBS}"], [with_openssl="no"], [-lcrypto $LIB_RSAREF])
-+m4trace:configure.in:694: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSL])
-+m4trace:configure.in:694: -1- m4_pattern_allow([^HAVE_SSL$])
-+m4trace:configure.in:694: -1- AH_OUTPUT([HAVE_SSL], [/* Build with SSL support? */
-+#undef HAVE_SSL])
-+m4trace:configure.in:697: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_ENABLE_OLD_DES_SUPPORT])
-+m4trace:configure.in:697: -1- m4_pattern_allow([^OPENSSL_ENABLE_OLD_DES_SUPPORT$])
-+m4trace:configure.in:697: -1- AH_OUTPUT([OPENSSL_ENABLE_OLD_DES_SUPPORT], [/* Configure OpenSSL to provide legacy des apis */
-+#undef OPENSSL_ENABLE_OLD_DES_SUPPORT])
-+m4trace:configure.in:698: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_DES_LIBDES_COMPATIBILITY])
-+m4trace:configure.in:698: -1- m4_pattern_allow([^OPENSSL_DES_LIBDES_COMPATIBILITY$])
-+m4trace:configure.in:698: -1- AH_OUTPUT([OPENSSL_DES_LIBDES_COMPATIBILITY], [/* Configure OpenSSL to provide krb4-compatible legacy des apis */
-+#undef OPENSSL_DES_LIBDES_COMPATIBILITY])
-+m4trace:configure.in:701: -1- AC_SUBST([OPENSSL_INC])
-+m4trace:configure.in:701: -1- AC_SUBST_TRACE([OPENSSL_INC])
-+m4trace:configure.in:701: -1- m4_pattern_allow([^OPENSSL_INC$])
-+m4trace:configure.in:702: -1- AC_SUBST([OPENSSL_LIB])
-+m4trace:configure.in:702: -1- AC_SUBST_TRACE([OPENSSL_LIB])
-+m4trace:configure.in:702: -1- m4_pattern_allow([^OPENSSL_LIB$])
-+m4trace:configure.in:713: -1- AC_DEFINE_TRACE_LITERAL([EGD_SOCKET])
-+m4trace:configure.in:713: -1- m4_pattern_allow([^EGD_SOCKET$])
-+m4trace:configure.in:713: -1- AH_OUTPUT([EGD_SOCKET], [/* Alternative to /dev/urandom? */
-+#undef EGD_SOCKET])
-+m4trace:configure.in:733: -1- AC_CHECK_LIB([zephyr], [ZInitialize], [ZEPHYR_LIBS="-lzephyr"], [with_zephyr="no"], [])
-+m4trace:configure.in:741: -1- AC_SUBST([ZEPHYR_LIBS])
-+m4trace:configure.in:741: -1- AC_SUBST_TRACE([ZEPHYR_LIBS])
-+m4trace:configure.in:741: -1- m4_pattern_allow([^ZEPHYR_LIBS$])
-+m4trace:configure.in:742: -1- AC_SUBST([ZEPHYR_CPPFLAGS])
-+m4trace:configure.in:742: -1- AC_SUBST_TRACE([ZEPHYR_CPPFLAGS])
-+m4trace:configure.in:742: -1- m4_pattern_allow([^ZEPHYR_CPPFLAGS$])
-+m4trace:configure.in:744: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ZEPHYR])
-+m4trace:configure.in:744: -1- m4_pattern_allow([^HAVE_ZEPHYR$])
-+m4trace:configure.in:744: -1- AH_OUTPUT([HAVE_ZEPHYR], [/* Build with Zephyr support? */
-+#undef HAVE_ZEPHYR])
-+m4trace:configure.in:754: -1- AC_DEFINE_TRACE_LITERAL([MASTER_PIDFILE])
-+m4trace:configure.in:754: -1- m4_pattern_allow([^MASTER_PIDFILE$])
-+m4trace:configure.in:754: -1- AH_OUTPUT([MASTER_PIDFILE], [/* Name of the pidfile for master */
-+#undef MASTER_PIDFILE])
-+m4trace:configure.in:762: -1- AC_SUBST([WITH_IDLE])
-+m4trace:configure.in:762: -1- AC_SUBST_TRACE([WITH_IDLE])
-+m4trace:configure.in:762: -1- m4_pattern_allow([^WITH_IDLE$])
-+m4trace:configure.in:784: -1- AC_SUBST([IMAP_PROGS])
-+m4trace:configure.in:784: -1- AC_SUBST_TRACE([IMAP_PROGS])
-+m4trace:configure.in:784: -1- m4_pattern_allow([^IMAP_PROGS$])
-+m4trace:configure.in:816: -1- AC_CHECK_LIB([com_err], [com_err], [
-+		# com_err is already in library path
-+		# guess we're okay
-+		# can use system com_err
-+		with_com_err=""
-+		AC_CHECK_HEADER(et/com_err.h,
-+		  [AC_DEFINE(HAVE_ET_COM_ERR_H,[],[We need et/com_err.h])],
-+		  [AC_CHECK_HEADER(com_err.h,[],[AC_ERROR([cannot locate com_err.h])])])
-+		AC_PATH_PROG(COMPILE_ET, compile_et, [no compile et])
-+	], [
-+	if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
-+		with_com_err="/usr/local"
-+		AC_PATH_PROG(COMPILE_ET, /usr/local/bin/compile_et, [no compile et])
-+	elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
-+		with_com_err="/usr"
-+		AC_PATH_PROG(COMPILE_ET, /usr/bin/compile_et, [no compile et])
-+	else
-+		# use ours
-+		with_com_err=yes
-+	fi
-+	])
-+m4trace:configure.in:816: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ET_COM_ERR_H])
-+m4trace:configure.in:816: -1- m4_pattern_allow([^HAVE_ET_COM_ERR_H$])
-+m4trace:configure.in:816: -1- AH_OUTPUT([HAVE_ET_COM_ERR_H], [/* We need et/com_err.h */
-+#undef HAVE_ET_COM_ERR_H])
-+m4trace:configure.in:816: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/libs.m4:139: AC_CHECK_LIB is expanded from...
-+configure.in:816: the top level])
-+m4trace:configure.in:816: -1- AC_SUBST([COMPILE_ET])
-+m4trace:configure.in:816: -1- AC_SUBST_TRACE([COMPILE_ET])
-+m4trace:configure.in:816: -1- m4_pattern_allow([^COMPILE_ET$])
-+m4trace:configure.in:816: -1- AC_SUBST([COMPILE_ET])
-+m4trace:configure.in:816: -1- AC_SUBST_TRACE([COMPILE_ET])
-+m4trace:configure.in:816: -1- m4_pattern_allow([^COMPILE_ET$])
-+m4trace:configure.in:816: -1- AC_SUBST([COMPILE_ET])
-+m4trace:configure.in:816: -1- AC_SUBST_TRACE([COMPILE_ET])
-+m4trace:configure.in:816: -1- m4_pattern_allow([^COMPILE_ET$])
-+m4trace:configure.in:857: -1- AC_SUBST([COMPILE_ET])
-+m4trace:configure.in:857: -1- AC_SUBST_TRACE([COMPILE_ET])
-+m4trace:configure.in:857: -1- m4_pattern_allow([^COMPILE_ET$])
-+m4trace:configure.in:858: -1- AC_SUBST([COM_ERR_LIBS])
-+m4trace:configure.in:858: -1- AC_SUBST_TRACE([COM_ERR_LIBS])
-+m4trace:configure.in:858: -1- m4_pattern_allow([^COM_ERR_LIBS$])
-+m4trace:configure.in:859: -1- AC_SUBST([COM_ERR_LDFLAGS])
-+m4trace:configure.in:859: -1- AC_SUBST_TRACE([COM_ERR_LDFLAGS])
-+m4trace:configure.in:859: -1- m4_pattern_allow([^COM_ERR_LDFLAGS$])
-+m4trace:configure.in:860: -1- AC_SUBST([COM_ERR_CPPFLAGS])
-+m4trace:configure.in:860: -1- AC_SUBST_TRACE([COM_ERR_CPPFLAGS])
-+m4trace:configure.in:860: -1- m4_pattern_allow([^COM_ERR_CPPFLAGS$])
-+m4trace:configure.in:866: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+configure.in:866: the top level])
-+m4trace:configure.in:881: -1- AC_DEFINE_TRACE_LITERAL([SYSLOG_FACILITY])
-+m4trace:configure.in:881: -1- m4_pattern_allow([^SYSLOG_FACILITY$])
-+m4trace:configure.in:881: -1- AH_OUTPUT([SYSLOG_FACILITY], [/* Syslog facility to use. */
-+#undef SYSLOG_FACILITY])
-+m4trace:configure.in:885: -1- AC_LIBSOURCE([getdtablesize.c])
-+m4trace:configure.in:885: -1- AC_CHECK_FUNCS([getdtablesize], [], [_AC_LIBOBJ($ac_func)])
-+m4trace:configure.in:885: -1- AH_OUTPUT([HAVE_GETDTABLESIZE], [/* Define to 1 if you have the `getdtablesize\' function. */
-+#undef HAVE_GETDTABLESIZE])
-+m4trace:configure.in:885: -1- AC_SUBST([LIB@&t at OBJS], ["$LIB@&t at OBJS $ac_func.$ac_objext"])
-+m4trace:configure.in:885: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
-+m4trace:configure.in:885: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-+m4trace:configure.in:898: -2- AC_DEFINE_TRACE_LITERAL([OLD_SIEVE_SERVICE_NAME])
-+m4trace:configure.in:898: -2- m4_pattern_allow([^OLD_SIEVE_SERVICE_NAME$])
-+m4trace:configure.in:898: -2- AH_OUTPUT([OLD_SIEVE_SERVICE_NAME], [/* Use "imap" as sieve service name? */
-+#undef OLD_SIEVE_SERVICE_NAME])
-+m4trace:configure.in:907: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_LISTEXT])
-+m4trace:configure.in:907: -2- m4_pattern_allow([^ENABLE_LISTEXT$])
-+m4trace:configure.in:907: -2- AH_OUTPUT([ENABLE_LISTEXT], [/* Enable the LISTEXT extension? */
-+#undef ENABLE_LISTEXT])
-+m4trace:configure.in:914: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_X_NETSCAPE_HACK])
-+m4trace:configure.in:914: -2- m4_pattern_allow([^ENABLE_X_NETSCAPE_HACK$])
-+m4trace:configure.in:914: -2- AH_OUTPUT([ENABLE_X_NETSCAPE_HACK], [/* Enable Netscape Menu Option Hack? */
-+#undef ENABLE_X_NETSCAPE_HACK])
-+m4trace:configure.in:917: -1- AC_CHECK_LIB([dl], [dlopen])
-+m4trace:configure.in:917: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
-+#undef HAVE_LIBDL])
-+m4trace:configure.in:917: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
-+m4trace:configure.in:917: -1- m4_pattern_allow([^HAVE_LIBDL$])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([crypt], [crypt], [LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes], [cmu_have_crypt=no])
-+m4trace:configure.in:918: -1- AC_SUBST([LIB_CRYPT])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([LIB_CRYPT])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^LIB_CRYPT$])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+autoconf/general.m4:1382: AC_ARG_ENABLE is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+autoconf/general.m4:1400: AC_ARG_WITH is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSSAPI_H])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSSAPI_H$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSSAPI_H], [/* Define if you have the gssapi.h header file */
-+#undef HAVE_GSSAPI_H])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([resolv], [res_search])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
-+#undef HAVE_LIBRESOLV])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_LIBRESOLV$])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([gssapi], [gss_unwrap], [gss_impl="heimdal"], [gss_failed=1], [${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET}])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([krb5support], [krb5int_getspecific], [K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a], [], [${LIB_SOCKET}])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([gssapi_krb5], [gss_unwrap], [gss_impl="mit"], [gss_failed=1], [${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe03"], [unset ac_cv_lib_gss_csf_gss_acq_user;
-+                  AC_CHECK_LIB(gss,csf_gss_acq_user,gss_impl="cybersafe",
-+                               gss_failed=1,$GSSAPIBASE_LIBS -lgss)], [${GSSAPIBASE_LIBS} -lgss -lcstbk5])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe"], [gss_failed=1], [$GSSAPIBASE_LIBS -lgss])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([gss], [gss_unwrap], [gss_impl="seam"], [gss_failed=1], [-lgss])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_HOSTBASED_SERVICE$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-+#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:2334: AC_EGREP_CPP is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_HOSTBASED_SERVICE$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-+#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_HOSTBASED_SERVICE$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-+#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_USER_NAME$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-+#undef HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:2334: AC_EGREP_CPP is expanded from...
-+cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_USER_NAME$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-+#undef HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^HAVE_GSS_C_NT_USER_NAME$])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-+#undef HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([resolv], [res_search], [GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"])
-+m4trace:configure.in:918: -1- AC_CHECK_FUNCS([gsskrb5_register_acceptor_identity])
-+m4trace:configure.in:918: -1- AH_OUTPUT([HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY], [/* Define to 1 if you have the `gsskrb5_register_acceptor_identity\' function.
-+   */
-+#undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY])
-+m4trace:configure.in:918: -1- AC_SUBST([GSSAPI_LIBS])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([GSSAPI_LIBS])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^GSSAPI_LIBS$])
-+m4trace:configure.in:918: -1- AC_SUBST([GSSAPIBASE_LIBS])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([GSSAPIBASE_LIBS])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^GSSAPIBASE_LIBS$])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+autoconf/general.m4:1400: AC_ARG_WITH is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+autoconf/general.m4:1400: AC_ARG_WITH is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/headers.m4:92: AC_CHECK_HEADER is expanded from...
-+cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- AC_CHECK_LIB([sasl2], [prop_get], [ac_cv_found_sasl=yes], [ac_cv_found_sasl=no])
-+m4trace:configure.in:918: -1- AC_SUBST([LIB_DYN_SASL])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([LIB_DYN_SASL])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^LIB_DYN_SASL$])
-+m4trace:configure.in:918: -1- AC_SUBST([DYNSASLFLAGS])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([DYNSASLFLAGS])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^DYNSASLFLAGS$])
-+m4trace:configure.in:918: -1- AC_SUBST([LIB_SASL])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([LIB_SASL])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^LIB_SASL$])
-+m4trace:configure.in:918: -1- AC_SUBST([SASLFLAGS])
-+m4trace:configure.in:918: -1- AC_SUBST_TRACE([SASLFLAGS])
-+m4trace:configure.in:918: -1- m4_pattern_allow([^SASLFLAGS$])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:918: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
-+You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
-+../../lib/m4sugar/m4sh.m4:519: AS_IF is expanded from...
-+autoconf/general.m4:2294: _AC_PREPROC_IFELSE is expanded from...
-+autoconf/general.m4:2304: AC_PREPROC_IFELSE is expanded from...
-+autoconf/general.m4:2314: AC_TRY_CPP is expanded from...
-+cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:918: the top level])
-+m4trace:configure.in:919: -1- AC_CHECK_LIB([sasl2], [sasl_checkapop], [AC_DEFINE(HAVE_APOP,[],[Does SASL support APOP?])], [AC_MSG_ERROR([libsasl2 without working sasl_checkapop.  Cannot continue.])])
-+m4trace:configure.in:919: -1- AC_DEFINE_TRACE_LITERAL([HAVE_APOP])
-+m4trace:configure.in:919: -1- m4_pattern_allow([^HAVE_APOP$])
-+m4trace:configure.in:919: -1- AH_OUTPUT([HAVE_APOP], [/* Does SASL support APOP? */
-+#undef HAVE_APOP])
-+m4trace:configure.in:932: -1- AC_SUBST([PERL])
-+m4trace:configure.in:932: -1- AC_SUBST_TRACE([PERL])
-+m4trace:configure.in:932: -1- m4_pattern_allow([^PERL$])
-+m4trace:configure.in:948: -1- AC_SUBST([PERL_CCCDLFLAGS])
-+m4trace:configure.in:948: -1- AC_SUBST_TRACE([PERL_CCCDLFLAGS])
-+m4trace:configure.in:948: -1- m4_pattern_allow([^PERL_CCCDLFLAGS$])
-+m4trace:configure.in:966: -2- AC_CHECK_LIB([md], [MD5Init], [LIBS="${LIBS} -lmd"], [MD5OBJ="md5.o"])
-+m4trace:configure.in:966: -1- _m4_warn([obsolete], [The macro `AC_FUNC_CHECK' is obsolete.
-+You should run autoupdate.], [autoconf/functions.m4:138: AC_FUNC_CHECK is expanded from...
-+configure.in:966: the top level])
-+m4trace:configure.in:967: -1- AC_SUBST([MD5OBJ])
-+m4trace:configure.in:967: -1- AC_SUBST_TRACE([MD5OBJ])
-+m4trace:configure.in:967: -1- m4_pattern_allow([^MD5OBJ$])
-+m4trace:configure.in:972: -1- AC_SUBST([SNMP_SUBDIRS])
-+m4trace:configure.in:972: -1- AC_SUBST_TRACE([SNMP_SUBDIRS])
-+m4trace:configure.in:972: -1- m4_pattern_allow([^SNMP_SUBDIRS$])
-+m4trace:configure.in:974: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:209: AC_HELP_STRING is expanded from...
-+cmulocal/common.m4:61: CMU_FIND_LIB_SUBDIR is expanded from...
-+cmulocal/libwrap.m4:30: CMU_LIBWRAP is expanded from...
-+configure.in:974: the top level])
-+m4trace:configure.in:974: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
-+m4trace:configure.in:974: -1- m4_pattern_allow([^SIZEOF_LONG$])
-+m4trace:configure.in:974: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of `long\', as computed by sizeof. */
-+#undef SIZEOF_LONG])
-+m4trace:configure.in:974: -1- AC_SUBST([CMU_LIB_SUBDIR], [$ac_cv_cmu_lib_subdir])
-+m4trace:configure.in:974: -1- AC_SUBST_TRACE([CMU_LIB_SUBDIR])
-+m4trace:configure.in:974: -1- m4_pattern_allow([^CMU_LIB_SUBDIR$])
-+m4trace:configure.in:974: -1- AC_CHECK_LIB([wrap], [request_init], [
-+		 AC_CHECK_HEADER(tcpd.h,, with_libwrap=no)], [with_libwrap=no], [${LIB_SOCKET}])
-+m4trace:configure.in:974: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWRAP])
-+m4trace:configure.in:974: -1- m4_pattern_allow([^HAVE_LIBWRAP$])
-+m4trace:configure.in:974: -1- AH_OUTPUT([HAVE_LIBWRAP], [/* Do we have TCP wrappers? */
-+#undef HAVE_LIBWRAP])
-+m4trace:configure.in:974: -1- AC_CHECK_LIB([nsl], [yp_get_default_domain], [LIB_WRAP="${LIB_WRAP} -lnsl"])
-+m4trace:configure.in:974: -1- AC_SUBST([LIB_WRAP])
-+m4trace:configure.in:974: -1- AC_SUBST_TRACE([LIB_WRAP])
-+m4trace:configure.in:974: -1- m4_pattern_allow([^LIB_WRAP$])
-+m4trace:configure.in:975: -1- AC_SUBST([SNMP_CONFIG])
-+m4trace:configure.in:975: -1- AC_SUBST_TRACE([SNMP_CONFIG])
-+m4trace:configure.in:975: -1- m4_pattern_allow([^SNMP_CONFIG$])
-+m4trace:configure.in:975: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NETSNMP])
-+m4trace:configure.in:975: -1- m4_pattern_allow([^HAVE_NETSNMP$])
-+m4trace:configure.in:975: -1- AH_OUTPUT([HAVE_NETSNMP], [/* Do we have Net-SNMP support? */
-+#undef HAVE_NETSNMP])
-+m4trace:configure.in:975: -1- AC_SUBST([LIB_UCDSNMP])
-+m4trace:configure.in:975: -1- AC_SUBST_TRACE([LIB_UCDSNMP])
-+m4trace:configure.in:975: -1- m4_pattern_allow([^LIB_UCDSNMP$])
-+m4trace:configure.in:975: -1- AC_CHECK_LIB([snmp], [sprint_objid], [
-+  		 AC_CHECK_HEADER(ucd-snmp/version.h,, with_snmp=no)], [with_snmp=no], [${LIB_SOCKET}])
-+m4trace:configure.in:975: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UCDSNMP])
-+m4trace:configure.in:975: -1- m4_pattern_allow([^HAVE_UCDSNMP$])
-+m4trace:configure.in:975: -1- AH_OUTPUT([HAVE_UCDSNMP], [/* Do we have UCD-SNMP support? */
-+#undef HAVE_UCDSNMP])
-+m4trace:configure.in:975: -1- AC_CHECK_LIB([rpm], [rpmdbOpen], [LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"], [], [-lpopt])
-+m4trace:configure.in:975: -1- AC_SUBST([LIB_UCDSNMP])
-+m4trace:configure.in:975: -1- AC_SUBST_TRACE([LIB_UCDSNMP])
-+m4trace:configure.in:975: -1- m4_pattern_allow([^LIB_UCDSNMP$])
-+m4trace:configure.in:1010: -1- AC_SUBST([LIB_RT])
-+m4trace:configure.in:1010: -1- AC_SUBST_TRACE([LIB_RT])
-+m4trace:configure.in:1010: -1- m4_pattern_allow([^LIB_RT$])
-+m4trace:configure.in:1011: -1- AC_SUBST([IMAP_COM_ERR_LIBS])
-+m4trace:configure.in:1011: -1- AC_SUBST_TRACE([IMAP_COM_ERR_LIBS])
-+m4trace:configure.in:1011: -1- m4_pattern_allow([^IMAP_COM_ERR_LIBS$])
-+m4trace:configure.in:1012: -1- AC_SUBST([IMAP_LIBS])
-+m4trace:configure.in:1012: -1- AC_SUBST_TRACE([IMAP_LIBS])
-+m4trace:configure.in:1012: -1- m4_pattern_allow([^IMAP_LIBS$])
-+m4trace:configure.in:1020: -1- AC_SUBST([PERL_SUBDIRS])
-+m4trace:configure.in:1020: -1- AC_SUBST_TRACE([PERL_SUBDIRS])
-+m4trace:configure.in:1020: -1- m4_pattern_allow([^PERL_SUBDIRS$])
-+m4trace:configure.in:1021: -1- AC_SUBST([PERL_DEPSUBDIRS])
-+m4trace:configure.in:1021: -1- AC_SUBST_TRACE([PERL_DEPSUBDIRS])
-+m4trace:configure.in:1021: -1- m4_pattern_allow([^PERL_DEPSUBDIRS$])
-+m4trace:configure.in:1022: -1- AC_SUBST([PERL])
-+m4trace:configure.in:1022: -1- AC_SUBST_TRACE([PERL])
-+m4trace:configure.in:1022: -1- m4_pattern_allow([^PERL$])
-+m4trace:configure.in:1068: -1- AH_OUTPUT([00001], [
-+/* $Id: configure.in,v 1.296 2005/10/13 19:56:14 jeaton Exp $ */
-+/* 
-+ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer. 
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * 3. The name "Carnegie Mellon University" must not be used to
-+ *    endorse or promote products derived from this software without
-+ *    prior written permission. For permission or any other legal
-+ *    details, please contact  
-+ *      Office of Technology Transfer
-+ *      Carnegie Mellon University
-+ *      5000 Forbes Avenue
-+ *      Pittsburgh, PA  15213-3890
-+ *      (412) 268-4387, fax: (412) 268-7395
-+ *      tech-transfer at andrew.cmu.edu
-+ *
-+ * 4. Redistributions of any form whatsoever must retain the following
-+ *    acknowledgment:
-+ *    "This product includes software developed by Computing Services
-+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-+ *
-+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _CYRUS_IMAPD_CONFIG_H_
-+#define _CYRUS_IMAPD_CONFIG_H_
-+])
-+m4trace:configure.in:1217: -1- AH_OUTPUT([zzzz2], [
-+/* time.h */
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+#  include <sys/time.h>
-+# else
-+#  include <time.h>
-+# endif
-+#endif
-+
-+/* com_err.h, as needed */
-+#ifndef IN_COM_ERR
-+#ifdef HAVE_ET_COM_ERR_H
-+#include <et/com_err.h>
-+#else
-+#include <com_err.h>
-+#endif /* HAVE_ET_COM_ERR_H */
-+#endif /* IN_COM_ERR */
-+
-+/* This allows us to work even when we don\'t have an fdatasync */
-+#ifndef HAVE_FDATASYNC
-+#define fdatasync(fd) fsync(fd)
-+#endif
-+
-+/* A similar setup for not having O_DSYNC */
-+#include <fcntl.h>
-+
-+#ifndef O_DSYNC
-+#  ifdef O_SYNC
-+#    define O_DSYNC     O_SYNC          /* POSIX */
-+#  else
-+#    define O_DSYNC     O_FSYNC         /* BSD */
-+#  endif
-+#endif
-+
-+#ifndef HAVE___ATTRIBUTE__
-+/* Can\'t use attributes... */
-+#define __attribute__(foo)
-+#endif
-+
-+#ifndef HAVE_SOCKLEN_T
-+typedef unsigned int socklen_t;
-+#endif
-+
-+#ifndef HAVE_RLIM_T
-+typedef int rlim_t;
-+#endif
-+
-+/* some potentially memory saving tradeoffs, 
-+   preconfigured in memory-saving mode */
-+
-+/* save the cmdlines for the ID command */
-+#undef ID_SAVE_CMDLINE
-+
-+/* IPv6 things */
-+#include <netdb.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
-+#define	_SS_MAXSIZE	128	/* Implementation specific max size */
-+#define	_SS_PADSIZE	(_SS_MAXSIZE - sizeof (struct sockaddr))
-+
-+struct sockaddr_storage {
-+	struct	sockaddr ss_sa;
-+	char		__ss_pad2[_SS_PADSIZE];
-+};
-+# define ss_family ss_sa.sa_family
-+# define HAVE_SS_FAMILY
-+#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
-+
-+#ifndef HAVE_SS_FAMILY
-+#define ss_family	__ss_family
-+#endif
-+
-+#ifndef AF_INET6
-+/* Define it to something that should never appear */
-+#define	AF_INET6	AF_MAX
-+#endif
-+
-+#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
-+#include "gai.h"
-+#endif
-+
-+/* End IPv6 things */
-+
-+#ifdef OLD_SIEVE_SERVICE_NAME
-+#define SIEVE_SERVICE_NAME "imap"
-+#else
-+#define SIEVE_SERVICE_NAME "sieve"
-+#endif
-+
-+/* filenames */
-+#define FNAME_DBDIR "/db"
-+#define FNAME_USERDIR "/user/"
-+#define FNAME_DOMAINDIR "/domain/"
-+#define FNAME_LOGDIR "/log/"
-+#define FNAME_PTSDB "/ptclient/ptscache.db"
-+#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
-+#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
-+
-+#ifndef HAVE_SHUTDOWN
-+#define shutdown(fd, mode) 0
-+#endif
-+
-+/* compile time options; think carefully before modifying */
-+enum {
-+    /* should we send an UNAVAILABLE message to master when
-+     * a service is exiting (master is already going to be 
-+     * informed of the exit by the SIGCHLD signal anyway) ? */
-+    MESSAGE_MASTER_ON_EXIT = 0,
-+
-+    /* should a hierarchical rename stop on error? */
-+    RENAME_STOP_ON_ERROR = 1,
-+
-+    /* should we call fsync() to maybe help with softupdates? (it should) */
-+    APPEND_ULTRA_PARANOID = 1,
-+
-+    /* should we log extra information at the DEBUG level for DB stuff? 
-+     * 0 -> nothing; 1 -> some; higher -> even more */
-+    CONFIG_DB_VERBOSE = 1,
-+
-+    /* log timing information to LOG_DEBUG */
-+    CONFIG_TIMING_VERBOSE = 0,
-+
-+    /* should we be pedantic about namespace or sleezy? */
-+    SLEEZY_NAMESPACE = 1,
-+
-+    /* should we do a fast TLS session shutdown? */
-+    TLS_FAST_SHUTDOWN = 1,
-+
-+    /* should we use the SQUAT engine to accelerate SEARCH? */
-+    SQUAT_ENGINE = 1,
-+
-+    /* should we have long LMTP error messages? */
-+    LMTP_LONG_ERROR_MSGS = 1,
-+
-+    /* default time to wait, in seconds, before giving up
-+     * trying to lock something */
-+    LOCK_GIVEUP_TIMER_DEFAULT = 100
-+};
-+
-+#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-+])
-+m4trace:configure.in:1220: -1- AC_CONFIG_FILES([man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile])
-+m4trace:configure.in:1220: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
-+You should run autoupdate.], [])
-+m4trace:configure.in:1220: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([LIB@&t at OBJS])
-+m4trace:configure.in:1220: -1- m4_pattern_allow([^LIB@&t at OBJS$])
-+m4trace:configure.in:1220: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([LTLIBOBJS])
-+m4trace:configure.in:1220: -1- m4_pattern_allow([^LTLIBOBJS$])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([top_builddir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([srcdir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([abs_srcdir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([top_srcdir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([abs_top_srcdir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([builddir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([abs_builddir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([abs_top_builddir])
-+m4trace:configure.in:1220: -1- AC_SUBST_TRACE([INSTALL])
 diff -urNad cyrus-imapd-2.2.13~/config.guess cyrus-imapd-2.2.13/config.guess
 --- cyrus-imapd-2.2.13~/config.guess	1970-01-01 00:00:00.000000000 +0000
-+++ cyrus-imapd-2.2.13/config.guess	2006-10-10 13:08:28.000000000 +0000
++++ cyrus-imapd-2.2.13/config.guess	2006-10-10 13:25:07.000000000 +0000
 @@ -0,0 +1,1500 @@
 +#! /bin/sh
 +# Attempt to guess a canonical system name.
@@ -46700,7 +1512,7 @@
 +# End:
 diff -urNad cyrus-imapd-2.2.13~/config.h.in cyrus-imapd-2.2.13/config.h.in
 --- cyrus-imapd-2.2.13~/config.h.in	2006-10-10 13:02:52.000000000 +0000
-+++ cyrus-imapd-2.2.13/config.h.in	2006-10-10 13:08:25.000000000 +0000
++++ cyrus-imapd-2.2.13/config.h.in	2006-10-10 13:25:04.000000000 +0000
 @@ -85,6 +85,10 @@
  /* Define to 1 if you have the `daemon' function. */
  #undef HAVE_DAEMON
@@ -46712,17 +1524,18 @@
  /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
     */
  #undef HAVE_DIRENT_H
-@@ -153,9 +157,6 @@
+@@ -153,8 +157,8 @@
  /* Do we have TCP wrappers? */
  #undef HAVE_LIBWRAP
  
 -/* Define to 1 if you support file names longer than 14 characters. */
 -#undef HAVE_LONG_FILE_NAMES
--
++/* Does the compiler support long long int? */
++#undef HAVE_LONG_LONG_INT
+ 
  /* Define to 1 if you have the `memmove' function. */
  #undef HAVE_MEMMOVE
- 
-@@ -310,7 +311,7 @@
+@@ -310,9 +314,15 @@
  /* Directiory to use for service binaries */
  #undef SERVICE_PATH
  
@@ -46730,8 +1543,27 @@
 +/* The size of `long', as computed by sizeof. */
  #undef SIZEOF_LONG
  
++/* The size of `long long int', as computed by sizeof. */
++#undef SIZEOF_LONG_LONG_INT
++
++/* The size of `unsigned long long int', as computed by sizeof. */
++#undef SIZEOF_UNSIGNED_LONG_LONG_INT
++
  /* Do we already have setproctitle? */
-@@ -496,7 +497,11 @@
+ #undef SPT_TYPE
+ 
+@@ -337,6 +347,10 @@
+ /* Build in PTS support? */
+ #undef WITH_PTS
+ 
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN
++
+ /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+    `char[]'. */
+ #undef YYTEXT_POINTER
+@@ -496,7 +510,11 @@
      SQUAT_ENGINE = 1,
  
      /* should we have long LMTP error messages? */
@@ -46744,534 +1576,9 @@
  };
  
  #endif /* _CYRUS_IMAPD_CONFIG_H_ */
-diff -urNad cyrus-imapd-2.2.13~/config.h.in~ cyrus-imapd-2.2.13/config.h.in~
---- cyrus-imapd-2.2.13~/config.h.in~	1970-01-01 00:00:00.000000000 +0000
-+++ cyrus-imapd-2.2.13/config.h.in~	2006-10-10 13:08:04.000000000 +0000
-@@ -0,0 +1,521 @@
-+/* config.h.in.  Generated from configure.in by autoheader.  */
-+
-+
-+/* $Id: configure.in,v 1.296 2005/10/13 19:56:14 jeaton Exp $ */
-+/* 
-+ * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer. 
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * 3. The name "Carnegie Mellon University" must not be used to
-+ *    endorse or promote products derived from this software without
-+ *    prior written permission. For permission or any other legal
-+ *    details, please contact  
-+ *      Office of Technology Transfer
-+ *      Carnegie Mellon University
-+ *      5000 Forbes Avenue
-+ *      Pittsburgh, PA  15213-3890
-+ *      (412) 268-4387, fax: (412) 268-7395
-+ *      tech-transfer at andrew.cmu.edu
-+ *
-+ * 4. Redistributions of any form whatsoever must retain the following
-+ *    acknowledgment:
-+ *    "This product includes software developed by Computing Services
-+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-+ *
-+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _CYRUS_IMAPD_CONFIG_H_
-+#define _CYRUS_IMAPD_CONFIG_H_
-+
-+
-+/* Should the AFS PTS plugin use krb5? */
-+#undef AFSPTS_USE_KRB5
-+
-+/* Where will we be installed? */
-+#undef CYRUS_PATH
-+
-+/* What user will we run as? */
-+#undef CYRUS_USER
-+
-+/* Alternative to /dev/urandom? */
-+#undef EGD_SOCKET
-+
-+/* Enable the LISTEXT extension? */
-+#undef ENABLE_LISTEXT
-+
-+/* Do we have a decent regex library? */
-+#undef ENABLE_REGEX
-+
-+/* Enable Netscape Menu Option Hack? */
-+#undef ENABLE_X_NETSCAPE_HACK
-+
-+/* Extra version information for imap/version.h */
-+#undef EXTRA_IDENT
-+
-+/* Do we have strerror()? */
-+#undef HAS_STRERROR
-+
-+/* Should we build afskrb pts module? */
-+#undef HAVE_AFSKRB
-+
-+/* Does SASL support APOP? */
-+#undef HAVE_APOP
-+
-+/* Build in Berkeley DB support? */
-+#undef HAVE_BDB
-+
-+/* Define to 1 if you have the `daemon' function. */
-+#undef HAVE_DAEMON
-+
-+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-+   */
-+#undef HAVE_DECL_TZNAME
-+
-+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-+   */
-+#undef HAVE_DIRENT_H
-+
-+/* Define to 1 if you have the `dns_lookup' function. */
-+#undef HAVE_DNS_LOOKUP
-+
-+/* Define to 1 if you have the `dn_expand' function. */
-+#undef HAVE_DN_EXPAND
-+
-+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-+#undef HAVE_DOPRNT
-+
-+/* We need et/com_err.h */
-+#undef HAVE_ET_COM_ERR_H
-+
-+/* Do we have fdatasync()? */
-+#undef HAVE_FDATASYNC
-+
-+/* Define to 1 if you have the `ftruncate' function. */
-+#undef HAVE_FTRUNCATE
-+
-+/* Do we have a getaddrinfo? */
-+#undef HAVE_GETADDRINFO
-+
-+/* Define to 1 if you have the `getdtablesize' function. */
-+#undef HAVE_GETDTABLESIZE
-+
-+/* Do we have a getnameinfo? */
-+#undef HAVE_GETNAMEINFO
-+
-+/* Define to 1 if you have the `getrlimit' function. */
-+#undef HAVE_GETRLIMIT
-+
-+/* Define if you have the gssapi.h header file */
-+#undef HAVE_GSSAPI_H
-+
-+/* Define to 1 if you have the `gsskrb5_register_acceptor_identity' function.
-+   */
-+#undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
-+
-+/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
-+#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE
-+
-+/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
-+#undef HAVE_GSS_C_NT_USER_NAME
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Support for Kerberos? */
-+#undef HAVE_KRB
-+
-+/* Should we build ldap pts module? */
-+#undef HAVE_LDAP
-+
-+/* Define to 1 if you have the `dl' library (-ldl). */
-+#undef HAVE_LIBDL
-+
-+/* Define to 1 if you have the `fl' library (-lfl). */
-+#undef HAVE_LIBFL
-+
-+/* Define to 1 if you have the `resolv' library (-lresolv). */
-+#undef HAVE_LIBRESOLV
-+
-+/* Do we have TCP wrappers? */
-+#undef HAVE_LIBWRAP
-+
-+/* Does the compiler support long long int? */
-+#undef HAVE_LONG_LONG_INT
-+
-+/* Define to 1 if you have the `memmove' function. */
-+#undef HAVE_MEMMOVE
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-+#undef HAVE_NDIR_H
-+
-+/* Do we have Net-SNMP support? */
-+#undef HAVE_NETSNMP
-+
-+/* Do we have an rlim_t? */
-+#undef HAVE_RLIM_T
-+
-+/* Do we have rxposix.h? */
-+#undef HAVE_RX
-+
-+/* Define to 1 if you have the `setrlimit' function. */
-+#undef HAVE_SETRLIMIT
-+
-+/* Define to 1 if you have the `setsid' function. */
-+#undef HAVE_SETSID
-+
-+/* Define to 1 if you have the `shutdown' function. */
-+#undef HAVE_SHUTDOWN
-+
-+/* Does sockaddr have an sa_len? */
-+#undef HAVE_SOCKADDR_SA_LEN
-+
-+/* Do we have a socklen_t? */
-+#undef HAVE_SOCKLEN_T
-+
-+/* Build with SSL support? */
-+#undef HAVE_SSL
-+
-+/* Is there an ss_family in sockaddr_storage? */
-+#undef HAVE_SS_FAMILY
-+
-+/* Define to 1 if you have the <stdarg.h> header file. */
-+#undef HAVE_STDARG_H
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the `strcasecmp' function. */
-+#undef HAVE_STRCASECMP
-+
-+/* Define to 1 if you have the `strerror' function. */
-+#undef HAVE_STRERROR
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the `strlcat' function. */
-+#undef HAVE_STRLCAT
-+
-+/* Define to 1 if you have the `strlcpy' function. */
-+#undef HAVE_STRLCPY
-+
-+/* Do we have a sockaddr_storage? */
-+#undef HAVE_STRUCT_SOCKADDR_STORAGE
-+
-+/* Define to 1 if `tm_zone' is member of `struct tm'. */
-+#undef HAVE_STRUCT_TM_TM_ZONE
-+
-+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-+   */
-+#undef HAVE_SYS_DIR_H
-+
-+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-+   */
-+#undef HAVE_SYS_NDIR_H
-+
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+#undef HAVE_SYS_PARAM_H
-+
-+/* Define to 1 if you have the <sys/resource.h> header file. */
-+#undef HAVE_SYS_RESOURCE_H
-+
-+/* Define to 1 if you have the <sys/select.h> header file. */
-+#undef HAVE_SYS_SELECT_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
-+   `HAVE_STRUCT_TM_TM_ZONE' instead. */
-+#undef HAVE_TM_ZONE
-+
-+/* Define to 1 if you don't have `tm_zone' but do have the external array
-+   `tzname'. */
-+#undef HAVE_TZNAME
-+
-+/* Do we have UCD-SNMP support? */
-+#undef HAVE_UCDSNMP
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to 1 if you have the `vprintf' function. */
-+#undef HAVE_VPRINTF
-+
-+/* Build with Zephyr support? */
-+#undef HAVE_ZEPHYR
-+
-+/* define if your compiler has __attribute__ */
-+#undef HAVE___ATTRIBUTE__
-+
-+/* Name of the pidfile for master */
-+#undef MASTER_PIDFILE
-+
-+/* Do we have a sys_errlist? */
-+#undef NEED_SYS_ERRLIST
-+
-+/* Use "imap" as sieve service name? */
-+#undef OLD_SIEVE_SERVICE_NAME
-+
-+/* Configure OpenSSL to provide krb4-compatible legacy des apis */
-+#undef OPENSSL_DES_LIBDES_COMPATIBILITY
-+
-+/* Configure OpenSSL to provide legacy des apis */
-+#undef OPENSSL_ENABLE_OLD_DES_SUPPORT
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Directiory to use for service binaries */
-+#undef SERVICE_PATH
-+
-+/* The size of `long', as computed by sizeof. */
-+#undef SIZEOF_LONG
-+
-+/* The size of `long long int', as computed by sizeof. */
-+#undef SIZEOF_LONG_LONG_INT
-+
-+/* The size of `unsigned long long int', as computed by sizeof. */
-+#undef SIZEOF_UNSIGNED_LONG_LONG_INT
-+
-+/* Do we already have setproctitle? */
-+#undef SPT_TYPE
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Config File Location */
-+#undef SYSCONFDIR
-+
-+/* Syslog facility to use. */
-+#undef SYSLOG_FACILITY
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#undef TIME_WITH_SYS_TIME
-+
-+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-+#undef TM_IN_SYS_TIME
-+
-+/* Build in Sieve support? */
-+#undef USE_SIEVE
-+
-+/* Build in PTS support? */
-+#undef WITH_PTS
-+
-+/* Define to 1 if your processor stores words with the most significant byte
-+   first (like Motorola and SPARC, unlike Intel and VAX). */
-+#undef WORDS_BIGENDIAN
-+
-+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-+   `char[]'. */
-+#undef YYTEXT_POINTER
-+
-+/* Define to 1 if on AIX 3.
-+   System headers sometimes define this.
-+   We just want to avoid a redefinition error message.  */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif
-+
-+
-+/* time.h */
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+#  include <sys/time.h>
-+# else
-+#  include <time.h>
-+# endif
-+#endif
-+
-+/* com_err.h, as needed */
-+#ifndef IN_COM_ERR
-+#ifdef HAVE_ET_COM_ERR_H
-+#include <et/com_err.h>
-+#else
-+#include <com_err.h>
-+#endif /* HAVE_ET_COM_ERR_H */
-+#endif /* IN_COM_ERR */
-+
-+/* This allows us to work even when we don't have an fdatasync */
-+#ifndef HAVE_FDATASYNC
-+#define fdatasync(fd) fsync(fd)
-+#endif
-+
-+/* A similar setup for not having O_DSYNC */
-+#include <fcntl.h>
-+
-+#ifndef O_DSYNC
-+#  ifdef O_SYNC
-+#    define O_DSYNC     O_SYNC          /* POSIX */
-+#  else
-+#    define O_DSYNC     O_FSYNC         /* BSD */
-+#  endif
-+#endif
-+
-+#ifndef HAVE___ATTRIBUTE__
-+/* Can't use attributes... */
-+#define __attribute__(foo)
-+#endif
-+
-+#ifndef HAVE_SOCKLEN_T
-+typedef unsigned int socklen_t;
-+#endif
-+
-+#ifndef HAVE_RLIM_T
-+typedef int rlim_t;
-+#endif
-+
-+/* some potentially memory saving tradeoffs, 
-+   preconfigured in memory-saving mode */
-+
-+/* save the cmdlines for the ID command */
-+#undef ID_SAVE_CMDLINE
-+
-+/* IPv6 things */
-+#include <netdb.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+
-+#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
-+#define	_SS_MAXSIZE	128	/* Implementation specific max size */
-+#define	_SS_PADSIZE	(_SS_MAXSIZE - sizeof (struct sockaddr))
-+
-+struct sockaddr_storage {
-+	struct	sockaddr ss_sa;
-+	char		__ss_pad2[_SS_PADSIZE];
-+};
-+# define ss_family ss_sa.sa_family
-+# define HAVE_SS_FAMILY
-+#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
-+
-+#ifndef HAVE_SS_FAMILY
-+#define ss_family	__ss_family
-+#endif
-+
-+#ifndef AF_INET6
-+/* Define it to something that should never appear */
-+#define	AF_INET6	AF_MAX
-+#endif
-+
-+#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
-+#include "gai.h"
-+#endif
-+
-+/* End IPv6 things */
-+
-+#ifdef OLD_SIEVE_SERVICE_NAME
-+#define SIEVE_SERVICE_NAME "imap"
-+#else
-+#define SIEVE_SERVICE_NAME "sieve"
-+#endif
-+
-+/* filenames */
-+#define FNAME_DBDIR "/db"
-+#define FNAME_USERDIR "/user/"
-+#define FNAME_DOMAINDIR "/domain/"
-+#define FNAME_LOGDIR "/log/"
-+#define FNAME_PTSDB "/ptclient/ptscache.db"
-+#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
-+#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
-+
-+#ifndef HAVE_SHUTDOWN
-+#define shutdown(fd, mode) 0
-+#endif
-+
-+/* compile time options; think carefully before modifying */
-+enum {
-+    /* should we send an UNAVAILABLE message to master when
-+     * a service is exiting (master is already going to be 
-+     * informed of the exit by the SIGCHLD signal anyway) ? */
-+    MESSAGE_MASTER_ON_EXIT = 0,
-+
-+    /* should a hierarchical rename stop on error? */
-+    RENAME_STOP_ON_ERROR = 1,
-+
-+    /* should we call fsync() to maybe help with softupdates? (it should) */
-+    APPEND_ULTRA_PARANOID = 1,
-+
-+    /* should we log extra information at the DEBUG level for DB stuff? 
-+     * 0 -> nothing; 1 -> some; higher -> even more */
-+    CONFIG_DB_VERBOSE = 1,
-+
-+    /* log timing information to LOG_DEBUG */
-+    CONFIG_TIMING_VERBOSE = 0,
-+
-+    /* should we be pedantic about namespace or sleezy? */
-+    SLEEZY_NAMESPACE = 1,
-+
-+    /* should we do a fast TLS session shutdown? */
-+    TLS_FAST_SHUTDOWN = 1,
-+
-+    /* should we use the SQUAT engine to accelerate SEARCH? */
-+    SQUAT_ENGINE = 1,
-+
-+    /* should we have long LMTP error messages? */
-+    LMTP_LONG_ERROR_MSGS = 1,
-+
-+    /* default time to wait, in seconds, before giving up
-+     * trying to lock something */
-+    LOCK_GIVEUP_TIMER_DEFAULT = 100
-+};
-+
-+#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-+
 diff -urNad cyrus-imapd-2.2.13~/config.sub cyrus-imapd-2.2.13/config.sub
 --- cyrus-imapd-2.2.13~/config.sub	1970-01-01 00:00:00.000000000 +0000
-+++ cyrus-imapd-2.2.13/config.sub	2006-10-10 13:08:28.000000000 +0000
++++ cyrus-imapd-2.2.13/config.sub	2006-10-10 13:25:07.000000000 +0000
 @@ -0,0 +1,1608 @@
 +#! /bin/sh
 +# Configuration validation subroutine script.
@@ -48883,7 +3190,7 @@
 +# End:
 diff -urNad cyrus-imapd-2.2.13~/configure cyrus-imapd-2.2.13/configure
 --- cyrus-imapd-2.2.13~/configure	2006-10-10 13:02:52.000000000 +0000
-+++ cyrus-imapd-2.2.13/configure	2006-10-10 13:08:28.000000000 +0000
++++ cyrus-imapd-2.2.13/configure	2006-10-10 13:25:07.000000000 +0000
 @@ -1,8 +1,9 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -50740,7 +5047,7 @@
 +host_os=$*
 +IFS=$ac_save_IFS
 +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- 
++
  
  
 +WARNERROR=-W
@@ -50749,7 +5056,7 @@
 +  enableval=$enable_warnings_are_errors;  if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi
 +fi
 +
-+
+ 
  
 -# Check whether --with-extraident or --without-extraident was given.
 -if test "${with_extraident+set}" = set; then
@@ -52005,7 +6312,7 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -continue
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -52050,7 +6357,7 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
@@ -52473,14 +6780,14 @@
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
- 
++
 +else
 +  ac_cv_path_GREP=$GREP
 +fi
  
+ 
 -echo "$as_me:$LINENO: checking for AIX" >&5
 -echo $ECHO_N "checking for AIX... $ECHO_C" >&6
-+
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
@@ -53066,18 +7373,167 @@
  
  
  case $ac_cv_c_inline in
-@@ -3346,8 +4061,8 @@
- 
- 
- 
+@@ -3345,157 +4060,8 @@
+ esac
+ 
+ 
+-
 -echo "$as_me:$LINENO: checking for __attribute__" >&5
 -echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for __attribute__" >&5
-+echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6; }
- if test "${ac_cv___attribute__+set}" = set; then
+-if test "${ac_cv___attribute__+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdlib.h>
+-
+-int
+-main ()
+-{
+-
+-static void foo(void) __attribute__ ((noreturn));
+-
+-static void
+-foo(void)
+-{
+-  exit(1);
+-}
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv___attribute__=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv___attribute__=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-if test "$ac_cv___attribute__" = "yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE___ATTRIBUTE__ 1
+-_ACEOF
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
+-echo "${ECHO_T}$ac_cv___attribute__" >&6
+-
+-
+-echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
+-echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6
+-if test "${ac_cv_fpic+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-save_CFLAGS=$CFLAGS
+-CFLAGS="${CFLAGS} -fPIC"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#include <stdlib.h>
+-
+-int
+-main ()
+-{
+-
+-static void
+-foo(void)
+-{
+-  exit(1);
+-}
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_fpic=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_fpic=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-CFLAGS=$save_CFLAGS
+-
+-fi
+-
+-if test "$ac_cv_fpic" = "yes"; then
+-    FPIC_CFLAGS="-fPIC"
+-else
+-    FPIC_CFLAGS=""
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
+-echo "${ECHO_T}$ac_cv_fpic" >&6
+-
+-
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3378,24 +4093,36 @@
+@@ -3519,24 +4085,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -53122,160 +7578,10 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3404,9 +4131,10 @@
+@@ -3545,9 +4123,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_cv___attribute__=no
-+	ac_cv___attribute__=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
- if test "$ac_cv___attribute__" = "yes"; then
-@@ -3416,12 +4144,12 @@
- _ACEOF
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
--echo "${ECHO_T}$ac_cv___attribute__" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
-+echo "${ECHO_T}$ac_cv___attribute__" >&6; }
- 
- 
--echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
--echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
-+echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6; }
- if test "${ac_cv_fpic+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3452,24 +4180,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3478,9 +4218,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_fpic=no
-+	ac_cv_fpic=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$save_CFLAGS
- 
- fi
-@@ -3490,12 +4231,12 @@
- else
-     FPIC_CFLAGS=""
- fi
--echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
--echo "${ECHO_T}$ac_cv_fpic" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
-+echo "${ECHO_T}$ac_cv_fpic" >&6; }
- 
- 
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3519,24 +4260,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_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); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3545,9 +4298,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
 -ac_cv_header_stdc=no
 +	ac_cv_header_stdc=no
  fi
@@ -53285,7 +7591,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -3603,6 +4357,7 @@
+@@ -3603,6 +4182,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -53293,7 +7599,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3622,18 +4377,27 @@
+@@ -3622,18 +4202,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -53327,7 +7633,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3646,12 +4410,14 @@
+@@ -3646,12 +4235,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -53345,7 +7651,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -3674,9 +4440,9 @@
+@@ -3674,9 +4265,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -53358,7 +7664,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -3690,24 +4456,36 @@
+@@ -3690,24 +4281,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -53403,7 +7709,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3716,12 +4494,14 @@
+@@ -3716,12 +4319,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -53422,22 +7728,24 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -3732,8 +4512,8 @@
+@@ -3732,9 +4337,9 @@
  done
  
  
 -echo "$as_me:$LINENO: checking for long" >&5
 -echo $ECHO_N "checking for long... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long+set}" = set; then
+-if test "${ac_cv_type_long+set}" = set; then
++{ echo "$as_me:$LINENO: checking for long long int" >&5
++echo $ECHO_N "checking for long long int... $ECHO_C" >&6; }
++if test "${ac_cv_type_long_long_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3744,36 +4524,49 @@
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -3744,61 +4349,74 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+typedef long ac__type_new_;
++typedef long long int ac__type_new_;
  int
  main ()
  {
@@ -53493,12 +7801,14 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3782,23 +4575,23 @@
+-  ac_cv_type_long=yes
++  ac_cv_type_long_long_int=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_type_long=no
-+	ac_cv_type_long=no
++	ac_cv_type_long_long_int=no
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
@@ -53506,18 +7816,19 @@
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
 -echo "${ECHO_T}$ac_cv_type_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_long_long_int" >&6; }
  
 -echo "$as_me:$LINENO: checking size of long" >&5
 -echo $ECHO_N "checking size of long... $ECHO_C" >&6
+-if test "${ac_cv_sizeof_long+set}" = set; then
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 +# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
- if test "${ac_cv_sizeof_long+set}" = set; then
++{ echo "$as_me:$LINENO: checking size of long long int" >&5
++echo $ECHO_N "checking size of long long int... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_long_long_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  if test "$ac_cv_type_long" = yes; then
@@ -53528,11 +7839,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -3808,10 +4601,12 @@
+@@ -3808,10 +4426,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
++	        typedef long long int ac__type_sizeof_;
 +
  int
  main ()
@@ -53542,7 +7853,7 @@
  test_array [0] = 0
  
    ;
-@@ -3819,24 +4614,36 @@
+@@ -3819,24 +4439,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -53587,11 +7898,11 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3849,10 +4656,12 @@
+@@ -3849,10 +4481,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
++	        typedef long long int ac__type_sizeof_;
 +
  int
  main ()
@@ -53601,7 +7912,7 @@
  test_array [0] = 0
  
    ;
-@@ -3860,24 +4669,36 @@
+@@ -3860,24 +4494,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -53646,7 +7957,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3886,30 +4707,33 @@
+@@ -3886,30 +4532,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -53679,7 +7990,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
++	        typedef long long int ac__type_sizeof_;
 +
  int
  main ()
@@ -53689,7 +8000,7 @@
  test_array [0] = 0
  
    ;
-@@ -3917,24 +4741,36 @@
+@@ -3917,24 +4566,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -53734,11 +8045,11 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3947,10 +4783,12 @@
+@@ -3947,10 +4608,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
++	        typedef long long int ac__type_sizeof_;
 +
  int
  main ()
@@ -53748,7 +8059,7 @@
  test_array [0] = 0
  
    ;
-@@ -3958,24 +4796,36 @@
+@@ -3958,24 +4621,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -53793,7 +8104,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3984,24 +4834,27 @@
+@@ -3984,24 +4659,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -53831,11 +8142,11 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -4012,10 +4865,12 @@
+@@ -4012,10 +4690,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
++	        typedef long long int ac__type_sizeof_;
 +
  int
  main ()
@@ -53845,7 +8156,7 @@
  test_array [0] = 0
  
    ;
-@@ -4023,24 +4878,36 @@
+@@ -4023,24 +4703,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -53890,7 +8201,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4049,26 +4916,24 @@
+@@ -4049,25 +4741,536 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -53902,45 +8213,554 @@
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
+-?*) ac_cv_sizeof_long=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++?*) ac_cv_sizeof_long_long_int=$ac_lo;;
++'') if test "$ac_cv_type_long_long_int" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
++echo "$as_me: error: cannot compute sizeof (long long int)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
 +	       else
-+	         ac_cv_sizeof_long=0
++	         ac_cv_sizeof_long_long_int=0
 +	       fi ;;
++esac
++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 long long int ac__type_sizeof_;
++
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
++    {
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
++      fprintf (f, "%lu\n", i);
++    }
++  return ferror (f) || fclose (f) != 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_sizeof_long_long_int=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++if test "$ac_cv_type_long_long_int" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long long int)
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_long_long_int=0
++	       fi
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.val
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6; }
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
++_ACEOF
++
++
++{ echo "$as_me:$LINENO: checking for unsigned long long int" >&5
++echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6; }
++if test "${ac_cv_type_unsigned_long_long_int+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 unsigned long long int 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
  esac
- else
--  if test "$cross_compiling" = yes; then
++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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_type_unsigned_long_long_int=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_unsigned_long_long_int=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6; }
++
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ echo "$as_me:$LINENO: checking size of unsigned long long int" >&5
++echo $ECHO_N "checking size of unsigned long long int... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_unsigned_long_long_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
++  # Depending upon the size, compute the lo and hi bounds.
++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 unsigned long long int ac__type_sizeof_;
++
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
++test_array [0] = 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_lo=0 ac_mid=0
++  while :; do
++    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 unsigned long long int ac__type_sizeof_;
++
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++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
++	        typedef unsigned long long int ac__type_sizeof_;
++
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
++test_array [0] = 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_hi=-1 ac_mid=-1
++  while :; do
++    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 unsigned long long int ac__type_sizeof_;
++
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
++test_array [0] = 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_lo= ac_hi=
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  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 unsigned long long int ac__type_sizeof_;
++
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_unsigned_long_long_int=$ac_lo;;
++'') if test "$ac_cv_type_unsigned_long_long_int" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int)
+ See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (unsigned long long int)
+ See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
--else
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_unsigned_long_long_int=0
++	       fi ;;
++esac
+ else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
- _ACEOF
-@@ -4076,8 +4941,10 @@
+@@ -4076,8 +5279,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (long)); }
 -unsigned long ulongval () { return (long) (sizeof (long)); }
-+	        typedef long ac__type_sizeof_;
++	        typedef unsigned long long int ac__type_sizeof_;
 +
 +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
 +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -4086,35 +4953,44 @@
+@@ -4086,177 +5291,1067 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -53998,160 +8818,1079 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4125,138 +5001,35 @@
+-  ac_cv_sizeof_long=`cat conftest.val`
++  ac_cv_sizeof_unsigned_long_long_int=`cat conftest.val`
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++if test "$ac_cv_type_unsigned_long_long_int" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
++echo "$as_me: error: cannot compute sizeof (unsigned long long int)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
 +	       else
-+	         ac_cv_sizeof_long=0
++	         ac_cv_sizeof_unsigned_long_long_int=0
 +	       fi
  fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
--else
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long_int" >&6; }
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
++_ACEOF
++
++
++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
++        "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LONG_LONG_INT
++_ACEOF
++
++  { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
++if test "${ac_cv_c_bigendian+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
 -  ac_cv_sizeof_long=0
- fi
--fi
++  # See if sys/param.h defines the BYTE_ORDER macro.
++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/param.h>
++
++int
++main ()
++{
++#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
++ bogus endian macros
++#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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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
++  # It does; now see whether it defined to BIG_ENDIAN or not.
++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/param.h>
++
++int
++main ()
++{
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_c_bigendian=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_c_bigendian=no
+ fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	# It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++  # try to guess the endianness by grepping values into an object file
++  ac_cv_c_bigendian=unknown
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++int
++main ()
++{
++ _ascii (); _ebcdic ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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 grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  ac_cv_c_bigendian=yes
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_LONG $ac_cv_sizeof_long
--_ACEOF
--
--
--
--
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++  if test "$ac_cv_c_bigendian" = unknown; then
++    ac_cv_c_bigendian=no
++  else
++    # finding both strings is unlikely to happen, but who knows?
++    ac_cv_c_bigendian=unknown
++  fi
++fi
++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
++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 ()
++{
+ 
++  /* Are we little or big endian?  From Harbison&Steele.  */
++  union
++  {
++    long int l;
++    char c[sizeof (long int)];
++  } u;
++  u.l = 1;
++  return u.c[sizeof (long int) - 1] == 1;
+ 
++  ;
++  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_c_bigendian=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 )
++ac_cv_c_bigendian=yes
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
+ 
 -   # CMU GUESS RUNPATH SWITCH
 -  echo "$as_me:$LINENO: checking for runpath switch" >&5
 -echo $ECHO_N "checking for runpath switch... $ECHO_C" >&6
 -if test "${andrew_runpath_switch+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
++case $ac_cv_c_bigendian in
++  yes)
++
++cat >>confdefs.h <<\_ACEOF
++#define WORDS_BIGENDIAN 1
++_ACEOF
++ ;;
++  no)
++     ;;
++  *)
++    { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++
++fi
++
++
++{ echo "$as_me:$LINENO: checking for __attribute__" >&5
++echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6; }
++if test "${ac_cv___attribute__+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
 -    # first, try -R
 -    SAVE_LDFLAGS="${LDFLAGS}"
 -    LDFLAGS="-R /usr/lib"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
- 
--  ;
--  return 0;
--}
--_ACEOF
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void foo(void) __attribute__ ((noreturn));
++
++static void
++foo(void)
++{
++  exit(1);
++}
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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___attribute__=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv___attribute__=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++if test "$ac_cv___attribute__" = "yes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE___ATTRIBUTE__ 1
++_ACEOF
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
++echo "${ECHO_T}$ac_cv___attribute__" >&6; }
++
++
++{ echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
++echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6; }
++if test "${ac_cv_fpic+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++save_CFLAGS=$CFLAGS
++CFLAGS="${CFLAGS} -fPIC"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void
++foo(void)
++{
++  exit(1);
++}
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_fpic=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_fpic=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS=$save_CFLAGS
++
++fi
++
++if test "$ac_cv_fpic" = "yes"; then
++    FPIC_CFLAGS="-fPIC"
++else
++    FPIC_CFLAGS=""
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
++echo "${ECHO_T}$ac_cv_fpic" >&6; }
++
++
++{ echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
++if test "${ac_cv_type_long+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 long 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_type_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_long=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
++
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
++if test "${ac_cv_sizeof_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++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 long ac__type_sizeof_;
++
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
++test_array [0] = 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_lo=0 ac_mid=0
++  while :; do
+     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 long ac__type_sizeof_;
+ 
+ int
+ main ()
+ {
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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
 -  andrew_runpath_switch="-R"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
++  ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
  
 -  	LDFLAGS="-Wl,-rpath,/usr/lib"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG $ac_cv_sizeof_long
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++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
++	        typedef long ac__type_sizeof_;
++
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
++test_array [0] = 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_hi=-1 ac_mid=-1
++  while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
  _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--int
--main ()
--{
- 
--  ;
--  return 0;
--}
--_ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++$ac_includes_default
++	        typedef long ac__type_sizeof_;
+ 
+ int
+ main ()
+ {
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
++test_array [0] = 0
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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
 -  andrew_runpath_switch="-Wl,-rpath,"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++  ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
 -andrew_runpath_switch="none"
--fi
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
  
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_lo= ac_hi=
+ fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  LDFLAGS="${SAVE_LDFLAGS}"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
+-echo "${ECHO_T}$andrew_runpath_switch" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  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 long ac__type_sizeof_;
++
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_long=$ac_lo;;
++'') if test "$ac_cv_type_long" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long)
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_long=0
++	       fi ;;
++esac
++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 long ac__type_sizeof_;
++
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
++#include <stdio.h>
++#include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
++    {
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
++      fprintf (f, "%lu\n", i);
++    }
++  return ferror (f) || fclose (f) != 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_sizeof_long=`cat conftest.val`
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++if test "$ac_cv_type_long" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (long)
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_long=0
++	       fi
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.val
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG $ac_cv_sizeof_long
++_ACEOF
++
++
++
++
 +   # CMU GUESS RUNPATH SWITCH
 +    andrew_runpath_switch="none"
- 
--fi
--echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
--echo "${ECHO_T}$andrew_runpath_switch" >&6
- 
- 
- 
-@@ -4265,18 +5038,19 @@
++
+ 
+ 
+ 
+@@ -4265,18 +6360,19 @@
  for ac_header in unistd.h sys/select.h sys/param.h stdarg.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -54179,7 +9918,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4287,24 +5061,36 @@
+@@ -4287,24 +6383,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -54224,7 +9963,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4313,15 +5099,16 @@
+@@ -4313,15 +6421,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -54247,7 +9986,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4330,8 +5117,13 @@
+@@ -4330,8 +6439,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -54263,7 +10002,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4355,9 +5147,10 @@
+@@ -4355,9 +6469,10 @@
  
    ac_header_preproc=no
  fi
@@ -54276,7 +10015,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4381,25 +5174,19 @@
+@@ -4381,25 +6496,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -54309,7 +10048,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -4418,9 +5205,9 @@
+@@ -4418,9 +6527,9 @@
  for ac_func in memmove strcasecmp ftruncate strerror
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54322,7 +10061,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4446,53 +5233,59 @@
+@@ -4446,53 +6555,59 @@
  
  #undef $ac_func
  
@@ -54401,7 +10140,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4501,25 +5294,25 @@
+@@ -4501,25 +6616,25 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -54436,7 +10175,7 @@
  esac
  
  fi
-@@ -4531,9 +5324,9 @@
+@@ -4531,9 +6646,9 @@
  for ac_func in strlcat strlcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54449,7 +10188,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4559,53 +5352,59 @@
+@@ -4559,53 +6674,59 @@
  
  #undef $ac_func
  
@@ -54528,7 +10267,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4614,13 +5413,15 @@
+@@ -4614,13 +6735,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -54548,7 +10287,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -4637,9 +5438,9 @@
+@@ -4637,9 +6760,9 @@
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -54561,7 +10300,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4661,24 +5462,36 @@
+@@ -4661,24 +6784,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -54606,7 +10345,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4687,12 +5500,14 @@
+@@ -4687,12 +6822,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -54625,7 +10364,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -4704,13 +5519,12 @@
+@@ -4704,13 +6841,12 @@
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
@@ -54641,7 +10380,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4718,126 +5532,99 @@
+@@ -4718,126 +6854,99 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -54819,7 +10558,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4845,115 +5632,89 @@
+@@ -4845,115 +6954,89 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -54984,7 +10723,7 @@
  
  fi
  
-@@ -4963,8 +5724,8 @@
+@@ -4963,8 +7046,8 @@
  
  	save_LIBS="$LIBS"
  	LIB_SOCKET=""
@@ -54995,7 +10734,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4991,53 +5752,59 @@
+@@ -4991,53 +7074,59 @@
  
  #undef connect
  
@@ -55074,7 +10813,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5046,18 +5813,19 @@
+@@ -5046,18 +7135,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -55100,7 +10839,7 @@
  if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5070,40 +5838,52 @@
+@@ -5070,40 +7160,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -55165,7 +10904,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5112,20 +5892,21 @@
+@@ -5112,20 +7214,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -55193,7 +10932,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5138,40 +5919,52 @@
+@@ -5138,40 +7241,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -55258,7 +10997,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5180,14 +5973,15 @@
+@@ -5180,14 +7295,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -55278,7 +11017,7 @@
  if test $ac_cv_lib_socket_connect = yes; then
    LIB_SOCKET="-lsocket $LIB_SOCKET"
  fi
-@@ -5196,8 +5990,8 @@
+@@ -5196,8 +7312,8 @@
  fi
  
  	LIBS="$LIB_SOCKET $save_LIBS"
@@ -55289,7 +11028,7 @@
  if test "${ac_cv_func_res_search+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5224,53 +6018,59 @@
+@@ -5224,53 +7340,59 @@
  
  #undef res_search
  
@@ -55368,7 +11107,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5279,13 +6079,14 @@
+@@ -5279,13 +7401,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -55387,7 +11126,7 @@
  if test $ac_cv_func_res_search = yes; then
    :
  else
-@@ -5318,24 +6119,36 @@
+@@ -5318,24 +7441,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -55432,7 +11171,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5344,8 +6157,10 @@
+@@ -5344,8 +7479,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -55444,7 +11183,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
  fi
-@@ -5356,9 +6171,9 @@
+@@ -5356,9 +7493,9 @@
  for ac_func in dn_expand dns_lookup
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -55457,7 +11196,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -5384,53 +6199,59 @@
+@@ -5384,53 +7521,59 @@
  
  #undef $ac_func
  
@@ -55536,7 +11275,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5439,13 +6260,15 @@
+@@ -5439,13 +7582,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -55556,7 +11295,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -5461,8 +6284,8 @@
+@@ -5461,8 +7606,8 @@
  
  cyrus_cv_getaddrinfo=yes
  
@@ -55567,7 +11306,7 @@
  if test "${ac_cv_func_getaddrinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5489,53 +6312,59 @@
+@@ -5489,53 +7634,59 @@
  
  #undef getaddrinfo
  
@@ -55646,7 +11385,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5544,20 +6373,21 @@
+@@ -5544,20 +7695,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -55674,7 +11413,7 @@
  if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5570,40 +6400,52 @@
+@@ -5570,40 +7722,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -55739,7 +11478,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5612,21 +6454,22 @@
+@@ -5612,21 +7776,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -55768,7 +11507,7 @@
      if test "${ipv6_cv_dir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5636,8 +6479,8 @@
+@@ -5636,8 +7801,8 @@
  	fi
        done
  fi
@@ -55779,7 +11518,7 @@
      if test $ipv6_cv_dir = no; then
        ac_cv_lib_inet6_getaddrinfo=no
      else
-@@ -5646,8 +6489,8 @@
+@@ -5646,8 +7811,8 @@
  	SAVELDFLAGS="$LDFLAGS"
  	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
        fi
@@ -55790,7 +11529,7 @@
  if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5660,40 +6503,52 @@
+@@ -5660,40 +7825,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -55855,7 +11594,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5702,14 +6557,15 @@
+@@ -5702,14 +7879,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -55875,7 +11614,7 @@
  if test $ac_cv_lib_inet6_getaddrinfo = yes; then
    	if test $ipv6_libinet6 = no; then
  	  ipv6_libinet6=yes
-@@ -5744,9 +6600,9 @@
+@@ -5744,9 +7922,9 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then
    as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
@@ -55888,7 +11627,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -5772,53 +6628,59 @@
+@@ -5772,53 +7950,59 @@
  
  #undef ${ipv6_cv_pfx}getaddrinfo
  
@@ -55967,7 +11706,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5827,13 +6689,15 @@
+@@ -5827,13 +8011,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -55987,7 +11726,7 @@
  
  fi
  rm -f conftest*
-@@ -5852,8 +6716,8 @@
+@@ -5852,8 +8038,8 @@
  fi
  if test $ipv6_cv_getaddrinfo = yes; then
  
@@ -55998,7 +11737,7 @@
  if test "${ac_cv_func_gai_strerror+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5880,53 +6744,59 @@
+@@ -5880,53 +8066,59 @@
  
  #undef gai_strerror
  
@@ -56077,7 +11816,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5935,20 +6805,21 @@
+@@ -5935,20 +8127,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -56105,7 +11844,7 @@
  if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5961,40 +6832,52 @@
+@@ -5961,40 +8154,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -56170,7 +11909,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6003,21 +6886,22 @@
+@@ -6003,21 +8208,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -56199,7 +11938,7 @@
      if test "${ipv6_cv_dir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6027,8 +6911,8 @@
+@@ -6027,8 +8233,8 @@
  	fi
        done
  fi
@@ -56210,7 +11949,7 @@
      if test $ipv6_cv_dir = no; then
        ac_cv_lib_inet6_gai_strerror=no
      else
-@@ -6037,8 +6921,8 @@
+@@ -6037,8 +8243,8 @@
  	SAVELDFLAGS="$LDFLAGS"
  	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
        fi
@@ -56221,7 +11960,7 @@
  if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6051,40 +6935,52 @@
+@@ -6051,40 +8257,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -56286,7 +12025,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6093,14 +6989,15 @@
+@@ -6093,14 +8311,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -56306,7 +12045,7 @@
  if test $ac_cv_lib_inet6_gai_strerror = yes; then
    	if test $ipv6_libinet6 = no; then
  	  ipv6_libinet6=yes
-@@ -6135,9 +7032,9 @@
+@@ -6135,9 +8354,9 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then
    as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
@@ -56319,7 +12058,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6163,53 +7060,59 @@
+@@ -6163,53 +8382,59 @@
  
  #undef ${ipv6_cv_pfx}gai_strerror
  
@@ -56398,7 +12137,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6218,13 +7121,15 @@
+@@ -6218,13 +8443,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -56418,7 +12157,7 @@
  
  fi
  rm -f conftest*
-@@ -6260,8 +7165,8 @@
+@@ -6260,8 +8487,8 @@
  
  cyrus_cv_getnameinfo=yes
  
@@ -56429,7 +12168,7 @@
  if test "${ac_cv_func_getnameinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6288,53 +7193,59 @@
+@@ -6288,53 +8515,59 @@
  
  #undef getnameinfo
  
@@ -56508,7 +12247,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6343,20 +7254,21 @@
+@@ -6343,20 +8576,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -56536,7 +12275,7 @@
  if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6369,40 +7281,52 @@
+@@ -6369,40 +8603,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -56601,7 +12340,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6411,21 +7335,22 @@
+@@ -6411,21 +8657,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -56630,7 +12369,7 @@
      if test "${ipv6_cv_dir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6435,8 +7360,8 @@
+@@ -6435,8 +8682,8 @@
  	fi
        done
  fi
@@ -56641,7 +12380,7 @@
      if test $ipv6_cv_dir = no; then
        ac_cv_lib_inet6_getnameinfo=no
      else
-@@ -6445,8 +7370,8 @@
+@@ -6445,8 +8692,8 @@
  	SAVELDFLAGS="$LDFLAGS"
  	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
        fi
@@ -56652,7 +12391,7 @@
  if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6459,40 +7384,52 @@
+@@ -6459,40 +8706,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -56717,7 +12456,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6501,14 +7438,15 @@
+@@ -6501,14 +8760,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -56737,7 +12476,7 @@
  if test $ac_cv_lib_inet6_getnameinfo = yes; then
    	if test $ipv6_libinet6 = no; then
  	  ipv6_libinet6=yes
-@@ -6543,9 +7481,9 @@
+@@ -6543,9 +8803,9 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then
    as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
@@ -56750,7 +12489,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6571,53 +7509,59 @@
+@@ -6571,53 +8831,59 @@
  
  #undef ${ipv6_cv_pfx}getnameinfo
  
@@ -56829,7 +12568,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6626,13 +7570,15 @@
+@@ -6626,13 +8892,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -56849,7 +12588,7 @@
  
  fi
  rm -f conftest*
-@@ -6664,8 +7610,8 @@
+@@ -6664,8 +8932,8 @@
  fi
  
  
@@ -56860,7 +12599,7 @@
  if test "${ipv6_cv_ss_family+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6686,24 +7632,36 @@
+@@ -6686,24 +8954,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -56905,7 +12644,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6712,9 +7670,10 @@
+@@ -6712,9 +8992,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -56918,7 +12657,7 @@
  fi
  if test $ipv6_cv_ss_family = yes; then
  
-@@ -6725,11 +7684,11 @@
+@@ -6725,11 +9006,11 @@
  else
    :
  fi
@@ -56934,7 +12673,7 @@
  if test "${ipv6_cv_sa_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6750,24 +7709,36 @@
+@@ -6750,24 +9031,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -56979,7 +12718,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6776,9 +7747,10 @@
+@@ -6776,9 +9069,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -56992,7 +12731,7 @@
  fi
  if test $ipv6_cv_sa_len = yes; then
  
-@@ -6789,8 +7761,8 @@
+@@ -6789,8 +9083,8 @@
  else
    :
  fi
@@ -57003,7 +12742,7 @@
  
  
  
-@@ -6798,18 +7770,19 @@
+@@ -6798,18 +9092,19 @@
  for ac_header in sys/time.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -57031,7 +12770,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6820,24 +7793,36 @@
+@@ -6820,24 +9115,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -57076,7 +12815,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6846,15 +7831,16 @@
+@@ -6846,15 +9153,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -57099,7 +12838,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6863,8 +7849,13 @@
+@@ -6863,8 +9171,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -57115,7 +12854,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6888,9 +7879,10 @@
+@@ -6888,9 +9201,10 @@
  
    ac_header_preproc=no
  fi
@@ -57128,7 +12867,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6914,25 +7906,19 @@
+@@ -6914,25 +9228,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -57161,7 +12900,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6944,8 +7930,8 @@
+@@ -6944,8 +9252,8 @@
  
  done
  
@@ -57172,7 +12911,7 @@
  if test "${ac_cv_header_time+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6969,24 +7955,36 @@
+@@ -6969,24 +9277,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -57217,7 +12956,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6995,12 +7993,13 @@
+@@ -6995,12 +9315,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -57235,7 +12974,7 @@
  if test $ac_cv_header_time = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7009,8 +8008,8 @@
+@@ -7009,8 +9330,8 @@
  
  fi
  
@@ -57246,7 +12985,7 @@
  if test "${ac_cv_struct_tm+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7032,24 +8031,36 @@
+@@ -7032,24 +9353,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -57291,7 +13030,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7058,12 +8069,13 @@
+@@ -7058,12 +9391,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -57309,7 +13048,7 @@
  if test $ac_cv_struct_tm = sys/time.h; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7072,8 +8084,8 @@
+@@ -7072,8 +9406,8 @@
  
  fi
  
@@ -57320,7 +13059,7 @@
  if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7098,24 +8110,36 @@
+@@ -7098,24 +9432,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -57365,7 +13104,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7124,7 +8148,7 @@
+@@ -7124,7 +9470,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -57374,7 +13113,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7145,24 +8169,36 @@
+@@ -7145,24 +9491,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -57419,7 +13158,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7171,14 +8207,16 @@
+@@ -7171,14 +9529,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -57441,7 +13180,7 @@
  if test $ac_cv_member_struct_tm_tm_zone = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -7195,8 +8233,95 @@
+@@ -7195,8 +9555,95 @@
  _ACEOF
  
  else
@@ -57539,7 +13278,7 @@
  if test "${ac_cv_var_tzname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7207,37 +8332,49 @@
+@@ -7207,37 +9654,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <time.h>
@@ -57600,7 +13339,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7246,13 +8383,14 @@
+@@ -7246,13 +9705,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -57619,7 +13358,7 @@
    if test $ac_cv_var_tzname = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7272,9 +8410,9 @@
+@@ -7272,9 +9732,9 @@
  for ac_func in vprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -57632,7 +13371,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -7300,53 +8438,59 @@
+@@ -7300,53 +9760,59 @@
  
  #undef $ac_func
  
@@ -57711,7 +13450,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7355,20 +8499,22 @@
+@@ -7355,20 +9821,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -57740,7 +13479,7 @@
  if test "${ac_cv_func__doprnt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7395,53 +8541,59 @@
+@@ -7395,53 +9863,59 @@
  
  #undef _doprnt
  
@@ -57819,7 +13558,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7450,13 +8602,14 @@
+@@ -7450,13 +9924,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -57838,7 +13577,7 @@
  if test $ac_cv_func__doprnt = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7475,20 +8628,20 @@
+@@ -7475,20 +9950,20 @@
  
  
  
@@ -57867,7 +13606,7 @@
  
  case "$with_bdb" in
    no)
-@@ -7510,21 +8663,21 @@
+@@ -7510,21 +9985,21 @@
  if test "$use_berkeley" != "no"; then
  
  
@@ -57897,7 +13636,7 @@
  
  
  
-@@ -7539,17 +8692,17 @@
+@@ -7539,17 +10014,17 @@
  	fi
  
  	                if test "${ac_cv_header_db_h+set}" = set; then
@@ -57921,7 +13660,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7560,24 +8713,36 @@
+@@ -7560,24 +10035,36 @@
  #include <db.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -57966,7 +13705,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7586,15 +8751,16 @@
+@@ -7586,15 +10073,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -57989,7 +13728,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7603,8 +8769,13 @@
+@@ -7603,8 +10091,13 @@
  /* end confdefs.h.  */
  #include <db.h>
  _ACEOF
@@ -58005,7 +13744,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -7628,9 +8799,10 @@
+@@ -7628,9 +10121,10 @@
  
    ac_header_preproc=no
  fi
@@ -58018,7 +13757,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7654,25 +8826,18 @@
+@@ -7654,25 +10148,18 @@
  echo "$as_me: WARNING: db.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: db.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: db.h: in the future, the compiler will take precedence" >&2;}
@@ -58049,7 +13788,7 @@
  
  fi
  if test $ac_cv_header_db_h = yes; then
-@@ -7720,24 +8885,36 @@
+@@ -7720,24 +10207,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -58094,7 +13833,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7746,9 +8923,10 @@
+@@ -7746,9 +10245,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -58107,7 +13846,7 @@
        conftest$ac_exeext conftest.$ac_ext
  	    if test "$dblib" = "berkeley"; then break; fi
            done
-@@ -7770,24 +8948,36 @@
+@@ -7770,24 +10270,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -58152,7 +13891,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7796,9 +8986,10 @@
+@@ -7796,9 +10308,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -58165,7 +13904,7 @@
        conftest$ac_exeext conftest.$ac_ext
          fi
  	LIBS=$saved_LIBS
-@@ -7854,13 +9045,13 @@
+@@ -7854,13 +10367,13 @@
  
  SIEVE_SUBDIRS=""
  sievedir="sieve"
@@ -58183,7 +13922,7 @@
  
  if test "$sievedir" != "no"; then
  	SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-@@ -7879,8 +9070,8 @@
+@@ -7879,8 +10392,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -58194,7 +13933,7 @@
  if test "${ac_cv_prog_YACC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7893,25 +9084,27 @@
+@@ -7893,25 +10406,27 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -58227,7 +13966,7 @@
    test -n "$YACC" && break
  done
  test -n "$YACC" || YACC="yacc"
-@@ -7920,8 +9113,8 @@
+@@ -7920,8 +10435,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -58238,7 +13977,7 @@
  if test "${ac_cv_prog_LEX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7934,236 +9127,196 @@
+@@ -7934,236 +10449,196 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -58586,7 +14325,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8172,15 +9325,16 @@
+@@ -8172,15 +10647,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -58607,7 +14346,7 @@
  if test $ac_cv_prog_lex_yytext_pointer = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8188,11 +9342,12 @@
+@@ -8188,11 +10664,12 @@
  _ACEOF
  
  fi
@@ -58622,7 +14361,7 @@
  if test "${ac_cv_lib_fl_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8209,30 +9364,42 @@
+@@ -8209,30 +10686,42 @@
  int
  main ()
  {
@@ -58674,7 +14413,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8241,14 +9408,15 @@
+@@ -8241,14 +10730,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -58694,7 +14433,7 @@
  if test $ac_cv_lib_fl_main = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBFL 1
-@@ -8259,13 +9427,12 @@
+@@ -8259,13 +10749,12 @@
  fi
  
  
@@ -58710,7 +14449,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8273,115 +9440,89 @@
+@@ -8273,115 +10762,89 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -58875,7 +14614,7 @@
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8389,17 +9530,17 @@
+@@ -8389,17 +10852,17 @@
  _ACEOF
  
  		 	if test "${ac_cv_header_rxposix_h+set}" = set; then
@@ -58899,7 +14638,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8410,24 +9551,36 @@
+@@ -8410,24 +10873,36 @@
  #include <rxposix.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -58944,7 +14683,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8436,15 +9589,16 @@
+@@ -8436,15 +10911,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -58967,7 +14706,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8453,8 +9607,13 @@
+@@ -8453,8 +10929,13 @@
  /* end confdefs.h.  */
  #include <rxposix.h>
  _ACEOF
@@ -58983,7 +14722,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -8478,9 +9637,10 @@
+@@ -8478,9 +10959,10 @@
  
    ac_header_preproc=no
  fi
@@ -58996,7 +14735,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8504,25 +9664,18 @@
+@@ -8504,25 +10986,18 @@
  echo "$as_me: WARNING: rxposix.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: rxposix.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: rxposix.h: in the future, the compiler will take precedence" >&2;}
@@ -59027,7 +14766,7 @@
  
  fi
  if test $ac_cv_header_rxposix_h = yes; then
-@@ -8544,8 +9697,8 @@
+@@ -8544,8 +11019,8 @@
  
  
  
@@ -59038,7 +14777,7 @@
  if test "${ac_cv_func_strerror+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8572,53 +9725,59 @@
+@@ -8572,53 +11047,59 @@
  
  #undef strerror
  
@@ -59117,7 +14856,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8627,13 +9786,14 @@
+@@ -8627,13 +11108,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -59136,7 +14875,7 @@
  if test $ac_cv_func_strerror = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8653,18 +9813,19 @@
+@@ -8653,18 +11135,19 @@
  for ac_header in sys/resource.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -59164,7 +14903,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8675,24 +9836,36 @@
+@@ -8675,24 +11158,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -59209,7 +14948,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8701,15 +9874,16 @@
+@@ -8701,15 +11196,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -59232,7 +14971,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8718,8 +9892,13 @@
+@@ -8718,8 +11214,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -59248,7 +14987,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -8743,9 +9922,10 @@
+@@ -8743,9 +11244,10 @@
  
    ac_header_preproc=no
  fi
@@ -59261,7 +15000,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8769,25 +9949,19 @@
+@@ -8769,25 +11271,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -59294,7 +15033,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8803,9 +9977,9 @@
+@@ -8803,9 +11299,9 @@
  for ac_func in setrlimit
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -59307,7 +15046,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8831,53 +10005,59 @@
+@@ -8831,53 +11327,59 @@
  
  #undef $ac_func
  
@@ -59386,7 +15125,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8886,13 +10066,15 @@
+@@ -8886,13 +11388,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -59406,7 +15145,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -8905,9 +10087,9 @@
+@@ -8905,9 +11409,9 @@
  for ac_func in getrlimit
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -59419,7 +15158,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8933,53 +10115,59 @@
+@@ -8933,53 +11437,59 @@
  
  #undef $ac_func
  
@@ -59498,7 +15237,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8988,13 +10176,15 @@
+@@ -8988,13 +11498,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -59518,7 +15257,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9009,9 +10199,9 @@
+@@ -9009,9 +11521,9 @@
  for ac_func in daemon setsid
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -59531,7 +15270,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -9037,53 +10227,59 @@
+@@ -9037,53 +11549,59 @@
  
  #undef $ac_func
  
@@ -59610,7 +15349,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9092,13 +10288,15 @@
+@@ -9092,13 +11610,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -59630,7 +15369,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9112,9 +10310,9 @@
+@@ -9112,9 +11632,9 @@
  for ac_func in shutdown
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -59643,7 +15382,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -9140,53 +10338,59 @@
+@@ -9140,53 +11660,59 @@
  
  #undef $ac_func
  
@@ -59722,7 +15461,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9195,13 +10399,15 @@
+@@ -9195,13 +11721,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -59742,7 +15481,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9270,8 +10476,8 @@
+@@ -9270,8 +11798,8 @@
  
  
  spt_type=""
@@ -59753,7 +15492,7 @@
  if test "${ac_cv_func_setproctitle+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9298,53 +10504,59 @@
+@@ -9298,53 +11826,59 @@
  
  #undef setproctitle
  
@@ -59832,7 +15571,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9353,20 +10565,21 @@
+@@ -9353,20 +11887,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -59860,7 +15599,7 @@
  if test "${ac_cv_lib_util_setproctitle+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9379,40 +10592,52 @@
+@@ -9379,40 +11914,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -59925,7 +15664,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9421,14 +10646,15 @@
+@@ -9421,14 +11968,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -59945,7 +15684,7 @@
  if test $ac_cv_lib_util_setproctitle = yes; then
    spt_type=SPT_BUILTIN
  			LIBS="${LIBS} -lutil"
-@@ -9437,17 +10663,17 @@
+@@ -9437,17 +11985,17 @@
  fi
  if test "$spt_type" = ""; then
  	if test "${ac_cv_header_sys_pstat_h+set}" = set; then
@@ -59969,7 +15708,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9458,24 +10684,36 @@
+@@ -9458,24 +12006,36 @@
  #include <sys/pstat.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -60014,7 +15753,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9484,15 +10722,16 @@
+@@ -9484,15 +12044,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -60037,7 +15776,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9501,8 +10740,13 @@
+@@ -9501,8 +12062,13 @@
  /* end confdefs.h.  */
  #include <sys/pstat.h>
  _ACEOF
@@ -60053,7 +15792,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -9526,9 +10770,10 @@
+@@ -9526,9 +12092,10 @@
  
    ac_header_preproc=no
  fi
@@ -60066,7 +15805,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9552,25 +10797,18 @@
+@@ -9552,25 +12119,18 @@
  echo "$as_me: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&2;}
@@ -60097,7 +15836,7 @@
  
  fi
  if test $ac_cv_header_sys_pstat_h = yes; then
-@@ -9581,17 +10819,17 @@
+@@ -9581,17 +12141,17 @@
  fi
  if test "$spt_type" = ""; then
  	if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
@@ -60121,7 +15860,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9602,24 +10840,36 @@
+@@ -9602,24 +12162,36 @@
  #include <sys/sysnews.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -60166,7 +15905,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9628,15 +10878,16 @@
+@@ -9628,15 +12200,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -60189,7 +15928,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9645,8 +10896,13 @@
+@@ -9645,8 +12218,13 @@
  /* end confdefs.h.  */
  #include <sys/sysnews.h>
  _ACEOF
@@ -60205,7 +15944,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -9670,9 +10926,10 @@
+@@ -9670,9 +12248,10 @@
  
    ac_header_preproc=no
  fi
@@ -60218,7 +15957,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9696,25 +10953,18 @@
+@@ -9696,25 +12275,18 @@
  echo "$as_me: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&2;}
@@ -60249,18 +15988,113 @@
  
  fi
  if test $ac_cv_header_sys_sysnews_h = yes; then
-@@ -9724,8 +10974,8 @@
+@@ -9724,61 +12296,72 @@
  
  fi
  if test "$spt_type" = ""; then
 -	echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
 -echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6
+-	if test "${cyrus_cv_sys_psstrings+set}" = set; then
 +	{ echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
 +echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6; }
- 	if test "${cyrus_cv_sys_psstrings+set}" = set; then
++if test "${cyrus_cv_sys_psstrings+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9742,8 +10992,13 @@
+   cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+ #include <machine/vmparam.h>
+ #include <sys/exec.h>
+-#ifndef PS_STRINGS
+-#include </nonexistent>
+-#endif
++void *p = PS_STRINGS;
++
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_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); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_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
+   cyrus_cv_sys_psstrings=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-  cyrus_cv_sys_psstrings=no
++	cyrus_cv_sys_psstrings=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-	if test $cyrus_cv_sys_psstrings = yes; then
+-		spt_type=SPT_PSSTRINGS
+-	fi
+-	echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
+-echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6
++         if test $cyrus_cv_sys_psstrings = yes; then
++                 spt_type=SPT_PSSTRINGS
++         fi
++         { echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
++echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6; }
+ fi
+ if test "$spt_type" = ""; then
+-	echo "$as_me:$LINENO: checking for SCO" >&5
+-echo $ECHO_N "checking for SCO... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking for SCO" >&5
++echo $ECHO_N "checking for SCO... $ECHO_C" >&6; }
+ 	if test "${cyrus_cv_sys_sco+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9793,8 +12376,13 @@
  #include </nonexistent>
  #endif
  _ACEOF
@@ -60276,31 +16110,31 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -9767,18 +11022,19 @@
- 
-   cyrus_cv_sys_psstrings=no
+@@ -9818,18 +12406,19 @@
+ 
+   cyrus_cv_sys_sco=no
  fi
 +
  rm -f conftest.err conftest.$ac_ext
  fi
  
- 	if test $cyrus_cv_sys_psstrings = yes; then
- 		spt_type=SPT_PSSTRINGS
+ 	if test $cyrus_cv_sys_sco = yes; then
+ 		spt_type=SPT_SCO
  	fi
--	echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
--echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6
-+	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6; }
+-	echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
+-echo "${ECHO_T}$cyrus_cv_sys_sco" >&6
++	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
++echo "${ECHO_T}$cyrus_cv_sys_sco" >&6; }
  fi
  if test "$spt_type" = ""; then
--	echo "$as_me:$LINENO: checking for SCO" >&5
--echo $ECHO_N "checking for SCO... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: checking for SCO" >&5
-+echo $ECHO_N "checking for SCO... $ECHO_C" >&6; }
- 	if test "${cyrus_cv_sys_sco+set}" = set; then
+-	echo "$as_me:$LINENO: checking for setproctitle usability" >&5
+-echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking for setproctitle usability" >&5
++echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6; }
+ 	if test "${cyrus_cv_sys_setproctitle+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9793,8 +11049,13 @@
+@@ -9844,8 +12433,13 @@
  #include </nonexistent>
  #endif
  _ACEOF
@@ -60316,47 +16150,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -9818,18 +11079,19 @@
- 
-   cyrus_cv_sys_sco=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi
- 
- 	if test $cyrus_cv_sys_sco = yes; then
- 		spt_type=SPT_SCO
- 	fi
--	echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
--echo "${ECHO_T}$cyrus_cv_sys_sco" >&6
-+	{ echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_sco" >&6; }
- fi
- if test "$spt_type" = ""; then
--	echo "$as_me:$LINENO: checking for setproctitle usability" >&5
--echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6
-+	{ echo "$as_me:$LINENO: checking for setproctitle usability" >&5
-+echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6; }
- 	if test "${cyrus_cv_sys_setproctitle+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9844,8 +11106,13 @@
- #include </nonexistent>
- #endif
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -9869,14 +11136,15 @@
+@@ -9869,14 +12463,15 @@
  
    cyrus_cv_sys_setproctitle=no
  fi
@@ -60374,7 +16168,7 @@
  fi
  if test "$spt_type" != ""; then
  
-@@ -9886,8 +11154,8 @@
+@@ -9886,8 +12481,8 @@
  
  fi
  
@@ -60385,7 +16179,7 @@
  if test "${cyrus_cv_sys_nonblock+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9912,24 +11180,36 @@
+@@ -9912,24 +12507,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -60430,7 +16224,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9938,19 +11218,20 @@
+@@ -9938,19 +12545,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -60457,7 +16251,7 @@
  if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9973,24 +11254,36 @@
+@@ -9973,24 +12581,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -60502,7 +16296,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9999,17 +11292,18 @@
+@@ -9999,17 +12619,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -60527,7 +16321,7 @@
  if test "${cyrus_cv_func_mmap_shared+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10049,13 +11343,22 @@
+@@ -10049,13 +12670,22 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
@@ -60554,7 +16348,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10068,17 +11371,19 @@
+@@ -10068,17 +12698,19 @@
  ( exit $ac_status )
  cyrus_cv_func_mmap_shared=no
  fi
@@ -60579,7 +16373,7 @@
  if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10119,13 +11424,22 @@
+@@ -10119,13 +12751,22 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
@@ -60606,7 +16400,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10138,12 +11452,14 @@
+@@ -10138,12 +12779,14 @@
  ( exit $ac_status )
  cyrus_cv_func_mmap_stupidshared=no
  fi
@@ -60624,7 +16418,7 @@
  if test $cyrus_cv_func_mmap_stupidshared = yes; then
  	WITH_MAP="stupidshared"
  else
-@@ -10157,14 +11473,13 @@
+@@ -10157,14 +12800,13 @@
  
  
  
@@ -60643,7 +16437,7 @@
  if test "${ac_cv_func_fcntl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10191,53 +11506,59 @@
+@@ -10191,53 +12833,59 @@
  
  #undef fcntl
  
@@ -60722,7 +16516,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10246,19 +11567,20 @@
+@@ -10246,19 +12894,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -60749,7 +16543,7 @@
  if test "${ac_cv_func_flock+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10285,53 +11607,59 @@
+@@ -10285,53 +12934,59 @@
  
  #undef flock
  
@@ -60828,7 +16622,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10340,13 +11668,14 @@
+@@ -10340,13 +12995,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -60847,7 +16641,7 @@
  if test $ac_cv_func_flock = yes; then
    WITH_LOCK="flock"
  else
-@@ -10361,13 +11690,14 @@
+@@ -10361,13 +13017,14 @@
  fi
  
  
@@ -60865,7 +16659,7 @@
  if test "${ac_cv_func_fdatasync+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10394,53 +11724,59 @@
+@@ -10394,53 +13051,59 @@
  
  #undef fdatasync
  
@@ -60944,7 +16738,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10449,13 +11785,14 @@
+@@ -10449,13 +13112,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -60963,7 +16757,7 @@
  if test $ac_cv_func_fdatasync = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -10464,8 +11801,8 @@
+@@ -10464,8 +13128,8 @@
  
  else
  
@@ -60974,7 +16768,7 @@
  if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10478,40 +11815,52 @@
+@@ -10478,40 +13142,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -61039,7 +16833,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10520,14 +11869,15 @@
+@@ -10520,14 +13196,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -61059,7 +16853,7 @@
  if test $ac_cv_lib_rt_fdatasync = yes; then
  
  	LIB_RT="-lrt"
-@@ -10548,8 +11898,8 @@
+@@ -10548,8 +13225,8 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -61070,7 +16864,7 @@
  if test "${ac_cv_func_sigvec+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10576,53 +11926,59 @@
+@@ -10576,53 +13253,59 @@
  
  #undef sigvec
  
@@ -61149,7 +16943,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10631,21 +11987,22 @@
+@@ -10631,21 +13314,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -61178,7 +16972,7 @@
  if test "${ac_cv_lib_BSD_sigvec+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10658,40 +12015,52 @@
+@@ -10658,40 +13342,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -61243,7 +17037,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10700,22 +12069,23 @@
+@@ -10700,22 +13396,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -61273,7 +17067,7 @@
  if test "${ac_cv_lib_ucb_sigvec+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10728,40 +12098,52 @@
+@@ -10728,40 +13425,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -61338,7 +17132,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10770,14 +12152,15 @@
+@@ -10770,14 +13479,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -61358,7 +17152,7 @@
  if test $ac_cv_lib_ucb_sigvec = yes; then
  
              cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
-@@ -10800,34 +12183,34 @@
+@@ -10800,34 +13510,34 @@
  # all authentication goes through SASL
  
  
@@ -61405,7 +17199,7 @@
  
  if test "x$with_afs" != "xno"; then
      if test ! -d $with_afs; then
-@@ -10856,8 +12239,8 @@
+@@ -10856,8 +13566,8 @@
  
          SAVE_LIBS="$LIBS"
          LIBS="${with_afs}/lib/liblwp.a"
@@ -61416,7 +17210,7 @@
                          cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10874,30 +12257,42 @@
+@@ -10874,30 +13584,42 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -61469,7 +17263,7 @@
                          cyrus_afs_sigvec="no"
  
  else
-@@ -10905,12 +12300,13 @@
+@@ -10905,12 +13627,13 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
@@ -61486,7 +17280,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
  fi
-@@ -10960,8 +12356,8 @@
+@@ -10960,8 +13683,8 @@
      CPPFLAGS=$LDAP_CPPFLAGS
      LDFLAGS=$LDAP_LDFLAGS
  
@@ -61497,7 +17291,7 @@
  if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10974,40 +12370,52 @@
+@@ -10974,40 +13697,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -61562,7 +17356,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11016,14 +12424,15 @@
+@@ -11016,14 +13751,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -61582,7 +17376,7 @@
  if test $ac_cv_lib_ldap_ldap_initialize = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -11052,46 +12461,46 @@
+@@ -11052,46 +13788,46 @@
  fi
  
  SERVER_SUBDIRS="master imap"
@@ -61647,7 +17441,7 @@
  if test "${ac_cv_lib_resolv_res_search+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11104,40 +12513,52 @@
+@@ -11104,40 +13840,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -61712,7 +17506,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11146,14 +12567,15 @@
+@@ -11146,14 +13894,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -61732,7 +17526,7 @@
  if test $ac_cv_lib_resolv_res_search = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBRESOLV 1
-@@ -11172,16 +12594,16 @@
+@@ -11172,16 +13921,16 @@
  
  if test "$with_krb" != "no"; then
  
@@ -61755,7 +17549,7 @@
  if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11194,40 +12616,52 @@
+@@ -11194,40 +13943,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -61820,7 +17614,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11236,14 +12670,15 @@
+@@ -11236,14 +13997,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -61840,7 +17634,7 @@
  if test $ac_cv_lib_des_des_ecb_encrypt = yes; then
    if test "$with_statickrb" = "yes"; then
            KRB_LIBS="$with_krb/lib/libdes.a"
-@@ -11260,8 +12695,8 @@
+@@ -11260,8 +14022,8 @@
  fi
  
  if test -d ${with_krb}; then
@@ -61851,7 +17645,7 @@
  if test "${cyrus_krbinclude+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11275,8 +12710,8 @@
+@@ -11275,8 +14037,8 @@
       done
  
  fi
@@ -61862,7 +17656,7 @@
  
     if test -n "${cyrus_krbinclude}"; then
       CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-@@ -11299,17 +12734,17 @@
+@@ -11299,17 +14061,17 @@
  
  if test "$with_des" != no; then
    if test "${ac_cv_header_krb_h+set}" = set; then
@@ -61886,7 +17680,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11320,24 +12755,36 @@
+@@ -11320,24 +14082,36 @@
  #include <krb.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -61931,7 +17725,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11346,15 +12793,16 @@
+@@ -11346,15 +14120,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -61954,7 +17748,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11363,8 +12811,13 @@
+@@ -11363,8 +14138,13 @@
  /* end confdefs.h.  */
  #include <krb.h>
  _ACEOF
@@ -61970,7 +17764,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -11388,9 +12841,10 @@
+@@ -11388,9 +14168,10 @@
  
    ac_header_preproc=no
  fi
@@ -61983,7 +17777,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -11414,32 +12868,25 @@
+@@ -11414,32 +14195,25 @@
  echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: krb.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: krb.h: in the future, the compiler will take precedence" >&2;}
@@ -62024,7 +17818,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -11451,40 +12898,52 @@
+@@ -11451,40 +14225,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -62089,7 +17883,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11493,14 +12952,16 @@
+@@ -11493,14 +14279,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -62110,7 +17904,7 @@
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
    if test "$with_statickrb" = "yes"; then
            KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
-@@ -11539,11 +13000,11 @@
+@@ -11539,11 +14327,11 @@
  
  IMAP_PROGS=""
  
@@ -62126,7 +17920,7 @@
  
  OPENSSL_INC=
  OPENSSL_LIB=
-@@ -11551,8 +13012,8 @@
+@@ -11551,8 +14339,8 @@
  	no) with_openssl="no";;
  	""|yes)
  	  	                  LIB_RSAREF=""
@@ -62137,7 +17931,7 @@
  if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11565,40 +13026,52 @@
+@@ -11565,40 +14353,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -62202,7 +17996,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11607,14 +13080,15 @@
+@@ -11607,14 +14407,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -62222,7 +18016,7 @@
  if test $ac_cv_lib_rsaref_RSAPublicEncrypt = yes; then
    LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
  else
-@@ -11623,8 +13097,8 @@
+@@ -11623,8 +14424,8 @@
  
  
  		with_openssl="yes"
@@ -62233,7 +18027,7 @@
  if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11637,40 +13111,52 @@
+@@ -11637,40 +14438,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -62298,7 +18092,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11679,22 +13165,23 @@
+@@ -11679,22 +14492,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -62328,7 +18122,7 @@
  if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11707,40 +13194,52 @@
+@@ -11707,40 +14521,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -62393,7 +18187,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11749,14 +13248,15 @@
+@@ -11749,14 +14575,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -62413,7 +18207,7 @@
  if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
    LIBS="-lssl ${LIBS}"
  else
-@@ -11788,10 +13288,10 @@
+@@ -11788,10 +14615,10 @@
  	    LIBS="${LIBS} -lssl -lcrypto";;
  esac
  
@@ -62428,7 +18222,7 @@
  
  if test "$with_openssl" != "no"; then
  
-@@ -11817,12 +13317,12 @@
+@@ -11817,12 +14644,12 @@
  
  
  
@@ -62445,7 +18239,7 @@
  if test -n "$EGD_SOCKET" ; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -11832,11 +13332,11 @@
+@@ -11832,11 +14659,11 @@
  fi
  
  
@@ -62461,7 +18255,7 @@
  if test -z "$with_zephyr"; then
       if test -f /usr/local/lib/libzephyr.a; then
  	with_zephyr="/usr/local"
-@@ -11848,8 +13348,8 @@
+@@ -11848,8 +14675,8 @@
  ZEPHYR_CPPFLAGS=""
  case "$with_zephyr" in
  	no) true;;
@@ -62472,7 +18266,7 @@
  if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11862,40 +13362,52 @@
+@@ -11862,40 +14689,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -62537,7 +18331,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11904,14 +13416,15 @@
+@@ -11904,14 +14743,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -62557,7 +18351,7 @@
  if test $ac_cv_lib_zephyr_ZInitialize = yes; then
    ZEPHYR_LIBS="-lzephyr"
  else
-@@ -11936,13 +13449,13 @@
+@@ -11936,13 +14776,13 @@
  fi
  
  
@@ -62575,7 +18369,7 @@
  MASTERPIDFILE="\"$MASTERPIDFILE\""
  
  cat >>confdefs.h <<_ACEOF
-@@ -11951,48 +13464,45 @@
+@@ -11951,48 +14791,45 @@
  
  
  
@@ -62641,7 +18435,7 @@
  if test "${ac_cv_lib_com_err_com_err+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12005,40 +13515,52 @@
+@@ -12005,40 +14842,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -62706,7 +18500,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12047,14 +13569,15 @@
+@@ -12047,14 +14896,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -62726,7 +18520,7 @@
  if test $ac_cv_lib_com_err_com_err = yes; then
  
  		# com_err is already in library path
-@@ -12062,17 +13585,17 @@
+@@ -12062,17 +14912,17 @@
  		# can use system com_err
  		with_com_err=""
  		if test "${ac_cv_header_et_com_err_h+set}" = set; then
@@ -62750,7 +18544,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12083,24 +13606,36 @@
+@@ -12083,24 +14933,36 @@
  #include <et/com_err.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -62795,7 +18589,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12109,15 +13644,16 @@
+@@ -12109,15 +14971,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -62818,7 +18612,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12126,8 +13662,13 @@
+@@ -12126,8 +14989,13 @@
  /* end confdefs.h.  */
  #include <et/com_err.h>
  _ACEOF
@@ -62834,7 +18628,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -12151,9 +13692,10 @@
+@@ -12151,9 +15019,10 @@
  
    ac_header_preproc=no
  fi
@@ -62847,7 +18641,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12177,25 +13719,18 @@
+@@ -12177,25 +15046,18 @@
  echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&2;}
@@ -62878,7 +18672,7 @@
  
  fi
  if test $ac_cv_header_et_com_err_h = yes; then
-@@ -12206,17 +13741,17 @@
+@@ -12206,17 +15068,17 @@
  
  else
    if test "${ac_cv_header_com_err_h+set}" = set; then
@@ -62902,7 +18696,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12227,24 +13762,36 @@
+@@ -12227,24 +15089,36 @@
  #include <com_err.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -62947,7 +18741,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12253,15 +13800,16 @@
+@@ -12253,15 +15127,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -62970,7 +18764,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -12270,8 +13818,13 @@
+@@ -12270,8 +15145,13 @@
  /* end confdefs.h.  */
  #include <com_err.h>
  _ACEOF
@@ -62986,7 +18780,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -12295,9 +13848,10 @@
+@@ -12295,9 +15175,10 @@
  
    ac_header_preproc=no
  fi
@@ -62999,7 +18793,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12321,25 +13875,18 @@
+@@ -12321,25 +15202,18 @@
  echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: com_err.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: com_err.h: in the future, the compiler will take precedence" >&2;}
@@ -63030,7 +18824,7 @@
  
  fi
  if test $ac_cv_header_com_err_h = yes; then
-@@ -12356,8 +13903,8 @@
+@@ -12356,8 +15230,8 @@
  
  		# Extract the first word of "compile_et", so it can be a program name with args.
  set dummy compile_et; ac_word=$2
@@ -63041,7 +18835,7 @@
  if test "${ac_cv_path_COMPILE_ET+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12372,37 +13919,38 @@
+@@ -12372,37 +15246,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -63088,7 +18882,7 @@
  if test "${ac_cv_path_COMPILE_ET+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12417,34 +13965,35 @@
+@@ -12417,34 +15292,35 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -63132,7 +18926,7 @@
  if test "${ac_cv_path_COMPILE_ET+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12459,28 +14008,29 @@
+@@ -12459,28 +15335,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -63168,7 +18962,7 @@
  	else
  		# use ours
  		with_com_err=yes
-@@ -12535,8 +14085,8 @@
+@@ -12535,8 +15412,8 @@
  
  
  
@@ -63179,7 +18973,7 @@
  if test "${cyrus_cv_lib_syslog+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12551,8 +14101,13 @@
+@@ -12551,8 +15428,13 @@
  #include </nonexistent>
  #endif
  _ACEOF
@@ -63195,7 +18989,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -12576,6 +14131,7 @@
+@@ -12576,6 +15458,7 @@
  
    cyrus_cv_lib_syslog=no
  fi
@@ -63203,7 +18997,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi
  
-@@ -12585,35 +14141,35 @@
+@@ -12585,35 +15468,35 @@
  	DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
  	CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
  fi
@@ -63252,7 +19046,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -12639,53 +14195,59 @@
+@@ -12639,53 +15522,59 @@
  
  #undef $ac_func
  
@@ -63331,7 +19125,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12694,88 +14256,88 @@
+@@ -12694,88 +15583,88 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -63455,7 +19249,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12802,53 +14364,59 @@
+@@ -12802,53 +15691,59 @@
  
  #undef dlopen
  
@@ -63534,7 +19328,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12857,19 +14425,20 @@
+@@ -12857,19 +15752,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -63561,7 +19355,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12882,40 +14451,52 @@
+@@ -12882,40 +15778,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -63626,7 +19420,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12924,14 +14505,15 @@
+@@ -12924,14 +15832,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -63646,7 +19440,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBDL 1
-@@ -12943,8 +14525,8 @@
+@@ -12943,8 +15852,8 @@
  
  fi
  
@@ -63657,7 +19451,7 @@
  if test "${ac_cv_func_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -12971,53 +14553,59 @@
+@@ -12971,53 +15880,59 @@
  
  #undef crypt
  
@@ -63736,7 +19530,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13026,18 +14614,19 @@
+@@ -13026,18 +15941,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -63762,7 +19556,7 @@
  if test "${ac_cv_lib_crypt_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13050,40 +14639,52 @@
+@@ -13050,40 +15966,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -63827,7 +19621,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13092,14 +14693,15 @@
+@@ -13092,14 +16020,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -63847,7 +19641,7 @@
  if test $ac_cv_lib_crypt_crypt = yes; then
    LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
  else
-@@ -13112,21 +14714,21 @@
+@@ -13112,21 +16041,21 @@
  
  
  
@@ -63877,7 +19671,7 @@
  
  if test "$gssapi" != no; then
    platform=
-@@ -13179,17 +14781,17 @@
+@@ -13179,17 +16108,17 @@
      fi
    fi
    if test "${ac_cv_header_gssapi_h+set}" = set; then
@@ -63901,7 +19695,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13200,24 +14802,36 @@
+@@ -13200,24 +16129,36 @@
  #include <gssapi.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -63946,7 +19740,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13226,15 +14840,16 @@
+@@ -13226,15 +16167,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -63969,7 +19763,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13243,8 +14858,13 @@
+@@ -13243,8 +16185,13 @@
  /* end confdefs.h.  */
  #include <gssapi.h>
  _ACEOF
@@ -63985,7 +19779,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -13268,9 +14888,10 @@
+@@ -13268,9 +16215,10 @@
  
    ac_header_preproc=no
  fi
@@ -63998,7 +19792,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -13294,25 +14915,18 @@
+@@ -13294,25 +16242,18 @@
  echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;}
@@ -64029,7 +19823,7 @@
  
  fi
  if test $ac_cv_header_gssapi_h = yes; then
-@@ -13323,17 +14937,17 @@
+@@ -13323,17 +16264,17 @@
  
  else
    if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
@@ -64053,7 +19847,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13344,24 +14958,36 @@
+@@ -13344,24 +16285,36 @@
  #include <gssapi/gssapi.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -64098,7 +19892,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13370,15 +14996,16 @@
+@@ -13370,15 +16323,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -64121,7 +19915,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13387,8 +15014,13 @@
+@@ -13387,8 +16341,13 @@
  /* end confdefs.h.  */
  #include <gssapi/gssapi.h>
  _ACEOF
@@ -64137,7 +19931,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -13412,9 +15044,10 @@
+@@ -13412,9 +16371,10 @@
  
    ac_header_preproc=no
  fi
@@ -64150,7 +19944,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -13438,25 +15071,18 @@
+@@ -13438,25 +16398,18 @@
  echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&2;}
@@ -64181,7 +19975,7 @@
  
  fi
  if test $ac_cv_header_gssapi_gssapi_h = yes; then
-@@ -13485,8 +15111,8 @@
+@@ -13485,8 +16438,8 @@
    # The choice is reflected in GSSAPIBASE_LIBS
  
  
@@ -64192,7 +19986,7 @@
  if test "${ac_cv_lib_resolv_res_search+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13499,40 +15125,52 @@
+@@ -13499,40 +16452,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -64257,7 +20051,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13541,14 +15179,15 @@
+@@ -13541,14 +16506,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -64277,7 +20071,7 @@
  if test $ac_cv_lib_resolv_res_search = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBRESOLV 1
-@@ -13575,8 +15214,8 @@
+@@ -13575,8 +16541,8 @@
  
    if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
      gss_failed=0
@@ -64288,7 +20082,7 @@
  if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13589,40 +15228,52 @@
+@@ -13589,40 +16555,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -64353,7 +20147,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13631,14 +15282,15 @@
+@@ -13631,14 +16609,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -64373,7 +20167,7 @@
  if test $ac_cv_lib_gssapi_gss_unwrap = yes; then
    gss_impl="heimdal"
  else
-@@ -13651,14 +15303,97 @@
+@@ -13651,14 +16630,97 @@
    fi
  
    if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
@@ -64474,7 +20268,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13666,40 +15401,52 @@
+@@ -13666,40 +16728,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -64539,7 +20333,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13708,14 +15455,15 @@
+@@ -13708,14 +16782,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -64559,7 +20353,7 @@
  if test $ac_cv_lib_gssapi_krb5_gss_unwrap = yes; then
    gss_impl="mit"
  else
-@@ -13747,8 +15495,8 @@
+@@ -13747,8 +16822,8 @@
  # library (older CyberSafe)
  
      unset ac_cv_lib_gss_csf_gss_acq_user
@@ -64570,7 +20364,7 @@
  if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13761,40 +15509,52 @@
+@@ -13761,40 +16836,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -64635,7 +20429,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13803,20 +15563,21 @@
+@@ -13803,20 +16890,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -64663,7 +20457,7 @@
  if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13829,40 +15590,52 @@
+@@ -13829,40 +16917,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -64728,7 +20522,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13871,14 +15644,15 @@
+@@ -13871,14 +16971,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -64748,7 +20542,7 @@
  if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
    gss_impl="cybersafe"
  else
-@@ -13901,8 +15675,8 @@
+@@ -13901,8 +17002,8 @@
  
    if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
      gss_failed=0
@@ -64759,7 +20553,7 @@
  if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13915,40 +15689,52 @@
+@@ -13915,40 +17016,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -64824,7 +20618,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13957,14 +15743,15 @@
+@@ -13957,14 +17070,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -64844,7 +20638,7 @@
  if test $ac_cv_lib_gss_gss_unwrap = yes; then
    gss_impl="seam"
  else
-@@ -13977,8 +15764,8 @@
+@@ -13977,8 +17091,8 @@
    fi
  
    if test "$gss_impl" = "mit"; then
@@ -64855,7 +20649,7 @@
    elif test "$gss_impl" = "heimdal"; then
      CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-@@ -14155,13 +15942,13 @@
+@@ -14155,13 +17269,13 @@
  fi
  
  GSSAPI_LIBS=""
@@ -64875,7 +20669,7 @@
  if test "${ac_cv_lib_resolv_res_search+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14174,40 +15961,52 @@
+@@ -14174,40 +17288,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -64940,7 +20734,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14216,14 +16015,15 @@
+@@ -14216,14 +17342,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -64960,7 +20754,7 @@
  if test $ac_cv_lib_resolv_res_search = yes; then
    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
  fi
-@@ -14238,9 +16038,9 @@
+@@ -14238,9 +17365,9 @@
  for ac_func in gsskrb5_register_acceptor_identity
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -64973,7 +20767,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -14266,53 +16066,59 @@
+@@ -14266,53 +17393,59 @@
  
  #undef $ac_func
  
@@ -65052,7 +20846,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14321,13 +16127,15 @@
+@@ -14321,13 +17454,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -65072,7 +20866,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14338,8 +16146,8 @@
+@@ -14338,8 +17473,8 @@
  
    LIBS="$cmu_save_LIBS"
  else
@@ -65083,7 +20877,7 @@
  fi
  
  
-@@ -14347,25 +16155,25 @@
+@@ -14347,25 +17482,25 @@
  
  
  
@@ -65117,7 +20911,7 @@
  
  SASLFLAGS=""
  LIB_SASL=""
-@@ -14393,17 +16201,17 @@
+@@ -14393,17 +17528,17 @@
    fi
  
    if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
@@ -65141,7 +20935,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14414,24 +16222,36 @@
+@@ -14414,24 +17549,36 @@
  #include <sasl/sasl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -65186,7 +20980,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14440,15 +16260,16 @@
+@@ -14440,15 +17587,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -65209,7 +21003,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14457,8 +16278,13 @@
+@@ -14457,8 +17605,13 @@
  /* end confdefs.h.  */
  #include <sasl/sasl.h>
  _ACEOF
@@ -65225,7 +21019,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -14482,9 +16308,10 @@
+@@ -14482,9 +17635,10 @@
  
    ac_header_preproc=no
  fi
@@ -65238,7 +21032,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14508,40 +16335,33 @@
+@@ -14508,40 +17662,33 @@
  echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
@@ -65290,7 +21084,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14552,24 +16372,36 @@
+@@ -14552,24 +17699,36 @@
  #include <sasl/saslutil.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -65335,7 +21129,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14578,15 +16410,16 @@
+@@ -14578,15 +17737,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -65358,7 +21152,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14595,8 +16428,13 @@
+@@ -14595,8 +17755,13 @@
  /* end confdefs.h.  */
  #include <sasl/saslutil.h>
  _ACEOF
@@ -65374,7 +21168,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -14620,9 +16458,10 @@
+@@ -14620,9 +17785,10 @@
  
    ac_header_preproc=no
  fi
@@ -65387,7 +21181,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14646,39 +16485,32 @@
+@@ -14646,39 +17812,32 @@
  echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
@@ -65436,7 +21230,7 @@
                                        { { echo "$as_me:$LINENO: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&5
  echo "$as_me: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&2;}
     { (exit 1); exit 1; }; }
-@@ -14690,8 +16522,8 @@
+@@ -14690,8 +17849,8 @@
  
  
  
@@ -65447,7 +21241,7 @@
  
    if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
      LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
-@@ -14723,17 +16555,17 @@
+@@ -14723,17 +17882,17 @@
  
  # be sure to check for a SASLv2 specific function
  if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
@@ -65471,7 +21265,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14744,24 +16576,36 @@
+@@ -14744,24 +17903,36 @@
  #include <sasl/sasl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -65516,7 +21310,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14770,15 +16614,16 @@
+@@ -14770,15 +17941,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -65539,7 +21333,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14787,8 +16632,13 @@
+@@ -14787,8 +17959,13 @@
  /* end confdefs.h.  */
  #include <sasl/sasl.h>
  _ACEOF
@@ -65555,7 +21349,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -14812,9 +16662,10 @@
+@@ -14812,9 +17989,10 @@
  
    ac_header_preproc=no
  fi
@@ -65568,7 +21362,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14838,40 +16689,33 @@
+@@ -14838,40 +18016,33 @@
  echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
@@ -65620,7 +21414,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14882,24 +16726,36 @@
+@@ -14882,24 +18053,36 @@
  #include <sasl/saslutil.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -65665,7 +21459,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14908,15 +16764,16 @@
+@@ -14908,15 +18091,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -65688,7 +21482,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14925,8 +16782,13 @@
+@@ -14925,8 +18109,13 @@
  /* end confdefs.h.  */
  #include <sasl/saslutil.h>
  _ACEOF
@@ -65704,7 +21498,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -14950,9 +16812,10 @@
+@@ -14950,9 +18139,10 @@
  
    ac_header_preproc=no
  fi
@@ -65717,7 +21511,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14976,30 +16839,23 @@
+@@ -14976,30 +18166,23 @@
  echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
@@ -65755,7 +21549,7 @@
  if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15012,40 +16868,52 @@
+@@ -15012,40 +18195,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -65820,7 +21614,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15054,14 +16922,15 @@
+@@ -15054,14 +18249,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -65840,7 +21634,7 @@
  if test $ac_cv_lib_sasl2_prop_get = yes; then
    ac_cv_found_sasl=yes
  else
-@@ -15152,8 +17021,13 @@
+@@ -15152,8 +18348,13 @@
  #endif
  
  _ACEOF
@@ -65856,7 +21650,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -15179,6 +17053,7 @@
+@@ -15179,6 +18380,7 @@
  echo "$as_me: error: Incorrect SASL headers found.  This package requires SASL 2.1.7 or newer." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -65864,7 +21658,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  CPPFLAGS=$cmu_saved_CPPFLAGS
-@@ -15189,8 +17064,8 @@
+@@ -15189,8 +18391,8 @@
  
  LDFLAGS="$LDFLAGS $LIB_SASL"
  
@@ -65875,7 +21669,7 @@
  if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15203,40 +17078,52 @@
+@@ -15203,40 +18405,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -65940,7 +21734,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15245,14 +17132,15 @@
+@@ -15245,14 +18459,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -65960,7 +21754,7 @@
  if test $ac_cv_lib_sasl2_sasl_checkapop = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -15270,13 +17158,13 @@
+@@ -15270,13 +18485,13 @@
  
  
  
@@ -65978,7 +21772,7 @@
  
  if test "${with_perl}" = yes; then
      with_perl="perl"
-@@ -15291,8 +17179,8 @@
+@@ -15291,8 +18506,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -65989,7 +21783,7 @@
  if test "${ac_cv_prog_PERL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15305,25 +17193,27 @@
+@@ -15305,25 +18520,27 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -66022,7 +21816,7 @@
    test -n "$PERL" && break
  done
  test -n "$PERL" || PERL="with_perl=notfound"
-@@ -15352,8 +17242,8 @@
+@@ -15352,8 +18569,8 @@
  	PERL_DEPSUBDIRS="none"
  fi
  
@@ -66033,7 +21827,7 @@
  if test "${ac_cv_func_MD5Init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15380,53 +17270,59 @@
+@@ -15380,53 +18597,59 @@
  
  #undef MD5Init
  
@@ -66112,7 +21906,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15435,18 +17331,19 @@
+@@ -15435,18 +18658,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -66138,7 +21932,7 @@
  if test "${ac_cv_lib_md_MD5Init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15459,40 +17356,52 @@
+@@ -15459,40 +18683,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -66203,7 +21997,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15501,14 +17410,15 @@
+@@ -15501,14 +18737,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -66223,7 +22017,7 @@
  if test $ac_cv_lib_md_MD5Init = yes; then
    LIBS="${LIBS} -lmd"
  else
-@@ -15523,13 +17433,13 @@
+@@ -15523,13 +18760,13 @@
  
  
  
@@ -66242,7 +22036,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15540,36 +17450,49 @@
+@@ -15540,36 +18777,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -66302,7 +22096,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15578,23 +17501,23 @@
+@@ -15578,23 +18828,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -66337,7 +22131,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -15604,10 +17527,12 @@
+@@ -15604,10 +18854,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -66351,7 +22145,7 @@
  test_array [0] = 0
  
    ;
-@@ -15615,24 +17540,36 @@
+@@ -15615,24 +18867,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -66396,7 +22190,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15645,10 +17582,12 @@
+@@ -15645,10 +18909,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -66410,7 +22204,7 @@
  test_array [0] = 0
  
    ;
-@@ -15656,24 +17595,36 @@
+@@ -15656,24 +18922,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -66455,7 +22249,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15682,30 +17633,33 @@
+@@ -15682,30 +18960,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -66498,7 +22292,7 @@
  test_array [0] = 0
  
    ;
-@@ -15713,24 +17667,36 @@
+@@ -15713,24 +18994,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -66543,7 +22337,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15743,10 +17709,12 @@
+@@ -15743,10 +19036,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -66557,7 +22351,7 @@
  test_array [0] = 0
  
    ;
-@@ -15754,24 +17722,36 @@
+@@ -15754,24 +19049,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -66602,7 +22396,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15780,24 +17760,27 @@
+@@ -15780,24 +19087,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -66640,7 +22434,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -15808,10 +17791,12 @@
+@@ -15808,10 +19118,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -66654,7 +22448,7 @@
  test_array [0] = 0
  
    ;
-@@ -15819,24 +17804,36 @@
+@@ -15819,24 +19131,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -66699,7 +22493,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15845,26 +17842,24 @@
+@@ -15845,26 +19169,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -66736,7 +22530,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -15872,8 +17867,10 @@
+@@ -15872,8 +19194,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -66749,7 +22543,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -15882,35 +17879,44 @@
+@@ -15882,35 +19206,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -66807,7 +22601,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -15921,29 +17927,32 @@
+@@ -15921,29 +19254,32 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -66831,8 +22625,8 @@
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_long=0
+ fi
 -fi
- fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
@@ -66852,7 +22646,7 @@
  if test "${ac_cv_cmu_lib_subdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15961,8 +17970,8 @@
+@@ -15961,8 +19297,8 @@
    ac_cv_cmu_lib_subdir=$with_lib_subdir
  fi
  fi
@@ -66863,7 +22657,7 @@
  CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
  
  
-@@ -15970,21 +17979,21 @@
+@@ -15970,21 +19306,21 @@
  
  
  
@@ -66891,7 +22685,7 @@
  if test "${ac_cv_lib_wrap_request_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15997,40 +18006,52 @@
+@@ -15997,40 +19333,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -66956,7 +22750,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16039,28 +18060,29 @@
+@@ -16039,28 +19387,29 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -66996,7 +22790,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16071,24 +18093,36 @@
+@@ -16071,24 +19420,36 @@
  #include <tcpd.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -67041,7 +22835,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16097,15 +18131,16 @@
+@@ -16097,15 +19458,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -67064,7 +22858,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16114,8 +18149,13 @@
+@@ -16114,8 +19476,13 @@
  /* end confdefs.h.  */
  #include <tcpd.h>
  _ACEOF
@@ -67080,7 +22874,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -16139,9 +18179,10 @@
+@@ -16139,9 +19506,10 @@
  
    ac_header_preproc=no
  fi
@@ -67093,7 +22887,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16165,25 +18206,18 @@
+@@ -16165,25 +19533,18 @@
  echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: tcpd.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: tcpd.h: in the future, the compiler will take precedence" >&2;}
@@ -67124,7 +22918,7 @@
  
  fi
  if test $ac_cv_header_tcpd_h = yes; then
-@@ -16199,10 +18233,10 @@
+@@ -16199,10 +19560,10 @@
  
      LIBS="$cmu_save_LIBS"
    fi
@@ -67139,7 +22933,7 @@
    LIB_WRAP=""
    if test "$with_libwrap" != no; then
  
-@@ -16211,8 +18245,8 @@
+@@ -16211,8 +19572,8 @@
  _ACEOF
  
      LIB_WRAP="-lwrap"
@@ -67150,7 +22944,7 @@
  if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16225,40 +18259,52 @@
+@@ -16225,40 +19586,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -67215,7 +23009,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16267,14 +18313,15 @@
+@@ -16267,14 +19640,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -67235,7 +23029,7 @@
  if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
    LIB_WRAP="${LIB_WRAP} -lnsl"
  fi
-@@ -16286,28 +18333,28 @@
+@@ -16286,28 +19660,28 @@
  
  
  
@@ -67274,7 +23068,7 @@
  if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16323,34 +18370,35 @@
+@@ -16323,34 +19697,35 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -67318,7 +23112,7 @@
  
      SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
      SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-@@ -16364,11 +18412,11 @@
+@@ -16364,11 +19739,11 @@
  _ACEOF
  
  
@@ -67334,7 +23128,7 @@
        { echo "$as_me:$LINENO: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
  echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
      fi
-@@ -16379,8 +18427,8 @@
+@@ -16379,8 +19754,8 @@
          LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
        fi
        cmu_save_LIBS="$LIBS"
@@ -67345,7 +23139,7 @@
  if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16393,40 +18441,52 @@
+@@ -16393,40 +19768,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -67410,7 +23204,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16435,28 +18495,29 @@
+@@ -16435,28 +19822,29 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -67450,7 +23244,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16467,24 +18528,36 @@
+@@ -16467,24 +19855,36 @@
  #include <ucd-snmp/version.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -67495,7 +23289,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16493,15 +18566,16 @@
+@@ -16493,15 +19893,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -67518,7 +23312,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16510,8 +18584,13 @@
+@@ -16510,8 +19911,13 @@
  /* end confdefs.h.  */
  #include <ucd-snmp/version.h>
  _ACEOF
@@ -67534,7 +23328,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -16535,9 +18614,10 @@
+@@ -16535,9 +19941,10 @@
  
    ac_header_preproc=no
  fi
@@ -67547,7 +23341,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16561,25 +18641,18 @@
+@@ -16561,25 +19968,18 @@
  echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&2;}
@@ -67578,7 +23372,7 @@
  
  fi
  if test $ac_cv_header_ucd_snmp_version_h = yes; then
-@@ -16595,10 +18668,10 @@
+@@ -16595,10 +19995,10 @@
  
        LIBS="$cmu_save_LIBS"
      fi
@@ -67593,7 +23387,7 @@
      LIB_UCDSNMP=""
      if test "$with_snmp" != no; then
  
-@@ -16607,8 +18680,8 @@
+@@ -16607,8 +20007,8 @@
  _ACEOF
  
        LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
@@ -67604,7 +23398,7 @@
  if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16621,40 +18694,52 @@
+@@ -16621,40 +20021,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -67669,7 +23463,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16663,14 +18748,15 @@
+@@ -16663,14 +20075,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -67689,7 +23483,7 @@
  if test $ac_cv_lib_rpm_rpmdbOpen = yes; then
    LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
  fi
-@@ -16729,7 +18815,8 @@
+@@ -16729,7 +20142,8 @@
  
  
  
@@ -67699,7 +23493,7 @@
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -16748,39 +18835,58 @@
+@@ -16748,39 +20162,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -67774,7 +23568,7 @@
    fi
  fi
  rm -f confcache
-@@ -16789,32 +18895,18 @@
+@@ -16789,32 +20222,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -67813,7 +23607,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -16852,11 +18944,35 @@
+@@ -16852,11 +20271,35 @@
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -67851,7 +23645,7 @@
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
-@@ -16865,8 +18981,43 @@
+@@ -16865,8 +20308,43 @@
  fi
  
  
@@ -67896,7 +23690,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -16880,18 +19031,19 @@
+@@ -16880,18 +20358,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -67919,7 +23713,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -16899,159 +19051,120 @@
+@@ -16899,159 +20378,120 @@
  
  
  # Name of the executable.
@@ -68150,7 +23944,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -17060,7 +19173,19 @@
+@@ -17060,7 +20500,19 @@
    as_mkdir_p=false
  fi
  
@@ -68171,7 +23965,7 @@
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -17069,31 +19194,14 @@
+@@ -17069,31 +20521,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -68207,7 +24001,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -17101,30 +19209,19 @@
+@@ -17101,30 +20536,19 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -68245,7 +24039,7 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -17132,7 +19229,7 @@
+@@ -17132,7 +20556,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -68254,7 +24048,7 @@
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -17148,19 +19245,21 @@
+@@ -17148,19 +20572,21 @@
  $config_headers
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -68282,7 +24076,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -17171,39 +19270,24 @@
+@@ -17171,39 +20597,24 @@
  do
    case $1 in
    --*=*)
@@ -68328,7 +24122,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -17213,18 +19297,24 @@
+@@ -17213,18 +20624,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -68358,7 +24152,7 @@
  
    esac
    shift
-@@ -17240,37 +19330,51 @@
+@@ -17240,37 +20657,51 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -68427,7 +24221,7 @@
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -17281,626 +19385,621 @@
+@@ -17281,626 +20712,621 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -68762,11 +24556,11 @@
 +  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
 +  ac_eof=`expr $ac_eof + 1`
 +fi
-+
+ 
 +cat >>$CONFIG_STATUS <<_ACEOF
 +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
+ _ACEOF
 +sed '
 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
 +s/^/s,@/; s/!/@,|#_!!_#|/
@@ -68780,7 +24574,7 @@
 +cat >>$CONFIG_STATUS <<_ACEOF
 +CEOF$ac_eof
 +_ACEOF
- 
++
 +
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
@@ -68816,7 +24610,7 @@
 +PERL_SUBDIRS!$PERL_SUBDIRS$ac_delim
 +PERL_DEPSUBDIRS!$PERL_DEPSUBDIRS$ac_delim
 +LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
++_ACEOF
 +
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
 +    break
@@ -69577,1234 +25371,9 @@
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -urNad cyrus-imapd-2.2.13~/configure.in cyrus-imapd-2.2.13/configure.in
---- cyrus-imapd-2.2.13~/configure.in	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/configure.in	2006-10-10 13:08:04.000000000 +0000
-@@ -107,15 +107,6 @@
- dnl fi
- AC_C_INLINE
- 
--dnl Check if `long long int' is available
--AC_CHECK_SIZEOF(long long int)
--AC_CHECK_SIZEOF(unsigned long long int)
--if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
--        "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
--  AC_DEFINE(HAVE_LONG_LONG_INT,[],[Does the compiler support long long int?])
--  AC_C_BIGENDIAN
--fi
--
- CMU_C___ATTRIBUTE__
- CMU_C_FPIC
- 
-@@ -297,15 +288,16 @@
- fi
- if test "$spt_type" = ""; then
- 	AC_MSG_CHECKING(for PS_STRINGS)
--AC_CACHE_VAL(cyrus_cv_sys_psstrings, AC_COMPILE_IFELSE([
-+	AC_CACHE_VAL(cyrus_cv_sys_psstrings, AC_TRY_CPP([
- #include <machine/vmparam.h>
- #include <sys/exec.h>
--void *p = PS_STRINGS;
--],cyrus_cv_sys_psstrings=yes,cyrus_cv_sys_psstrings=no))
--         if test $cyrus_cv_sys_psstrings = yes; then
--                 spt_type=SPT_PSSTRINGS
--         fi
--         AC_MSG_RESULT($cyrus_cv_sys_psstrings)
-+#ifndef PS_STRINGS
-+#include </nonexistent>
-+#endif],cyrus_cv_sys_psstrings=yes,cyrus_cv_sys_psstrings=no))
-+	if test $cyrus_cv_sys_psstrings = yes; then
-+		spt_type=SPT_PSSTRINGS
-+	fi
-+	AC_MSG_RESULT($cyrus_cv_sys_psstrings)
- fi
- if test "$spt_type" = ""; then
- 	AC_MSG_CHECKING(for SCO)
-diff -urNad cyrus-imapd-2.2.13~/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl cyrus-imapd-2.2.13/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
---- cyrus-imapd-2.2.13~/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/local/bin/perl5
- 
- #
- # Created by Alison Greenwald <alison at andrew.cmu.edu> 21 Sep 2000
-diff -urNad cyrus-imapd-2.2.13~/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl cyrus-imapd-2.2.13/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
---- cyrus-imapd-2.2.13~/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/local/bin/perl5
- 
- #
- # Created by Alison Greenwald 21 Sep 2000
-diff -urNad cyrus-imapd-2.2.13~/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl cyrus-imapd-2.2.13/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
---- cyrus-imapd-2.2.13~/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl 
-+#!/usr/local/bin/perl5 
- 
- #
- # Created by Alison Greenwald <alison at andrew.cmu.edu> 21 Sep 2000
-diff -urNad cyrus-imapd-2.2.13~/contrib/mupdate-test.pl cyrus-imapd-2.2.13/contrib/mupdate-test.pl
---- cyrus-imapd-2.2.13~/contrib/mupdate-test.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/contrib/mupdate-test.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/local/bin/perl
- 
- # Create a workload against a murder frontend
- # that will give the MUPDATE server a workout.
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/30-update_perlcalling.sh.dpatch cyrus-imapd-2.2.13/debian/patched/30-update_perlcalling.sh.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/30-update_perlcalling.sh.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/30-update_perlcalling.sh.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1,22 +0,0 @@
--patching file contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
--patching file contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
--patching file contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
--patching file contrib/mupdate-test.pl
--patching file perl/imap/examples/auditmbox.pl
--patching file perl/imap/examples/imapcollate.pl
--patching file perl/imap/examples/imapdu.pl
--patching file perl/imap/examples/test-imsp.pl
--patching file perl/sieve/scripts/installsieve.pl
--patching file perl/sieve/scripts/sieveshell.pl
--patching file snmp/snmpgen
--patching file tools/arbitronsort.pl
--patching file tools/config2header
--patching file tools/config2man
--patching file tools/dohash
--patching file tools/masssievec
--patching file tools/mkimap
--patching file tools/mknewsgroups
--patching file tools/rehash
--patching file tools/translatesieve
--patching file tools/undohash
--patching file tools/upgradesieve
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/35-masssievec_remove_unused_variable.dpatch cyrus-imapd-2.2.13/debian/patched/35-masssievec_remove_unused_variable.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/35-masssievec_remove_unused_variable.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/35-masssievec_remove_unused_variable.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--patching file tools/masssievec
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/40-rehash_fix_pathes.dpatch cyrus-imapd-2.2.13/debian/patched/40-rehash_fix_pathes.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/40-rehash_fix_pathes.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/40-rehash_fix_pathes.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--patching file tools/rehash
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/45-kolab2-annotations.dpatch cyrus-imapd-2.2.13/debian/patched/45-kolab2-annotations.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/45-kolab2-annotations.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/45-kolab2-annotations.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1,2 +0,0 @@
--patching file imap/annotate.c
--patching file perl/imap/IMAP/Admin.pm
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/61-64bit-quota.dpatch cyrus-imapd-2.2.13/debian/patched/61-64bit-quota.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/61-64bit-quota.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/61-64bit-quota.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1,28 +0,0 @@
--patching file configure.in
--patching file imap/append.c
--patching file imap/imapd.c
--Hunk #1 succeeded at 2664 (offset 5 lines).
--patching file imap/mailbox.c
--Hunk #4 succeeded at 1450 (offset 3 lines).
--Hunk #5 succeeded at 1637 (offset 3 lines).
--Hunk #6 succeeded at 1865 (offset 3 lines).
--Hunk #7 succeeded at 1903 (offset 3 lines).
--Hunk #8 succeeded at 2178 (offset 8 lines).
--Hunk #9 succeeded at 2297 (offset 9 lines).
--Hunk #10 succeeded at 2511 (offset 9 lines).
--Hunk #11 succeeded at 2664 (offset 9 lines).
--patching file imap/mailbox.h
--patching file imap/mbdump.c
--patching file imap/mbexamine.c
--patching file imap/mboxlist.c
--Hunk #1 succeeded at 2536 (offset -4 lines).
--patching file imap/quota.c
--patching file imap/quota.h
--patching file imap/quota_db.c
--patching file imap/reconstruct.c
--patching file lib/Makefile.in
--Hunk #1 succeeded at 87 (offset 2 lines).
--Hunk #2 succeeded at 95 (offset 2 lines).
--patching file lib/byteorder64.c
--patching file lib/byteorder64.h
--patching file lib/prot.c
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/65-sieveshell-enhancements.dpatch cyrus-imapd-2.2.13/debian/patched/65-sieveshell-enhancements.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/65-sieveshell-enhancements.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/65-sieveshell-enhancements.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1,3 +0,0 @@
--patching file perl/imap/IMAP/Shell.pm
--patching file perl/sieve/lib/request.c
--patching file perl/sieve/scripts/sieveshell.pl
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/70-allow-larger-buffers.dpatch cyrus-imapd-2.2.13/debian/patched/70-allow-larger-buffers.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/70-allow-larger-buffers.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/70-allow-larger-buffers.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--patching file imap/imapparse.c
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/72-faster-isdigit.dpatch cyrus-imapd-2.2.13/debian/patched/72-faster-isdigit.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/72-faster-isdigit.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/72-faster-isdigit.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1,2 +0,0 @@
--patching file imap/index.c
--patching file lib/util.h
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/75-update-imapd.conf-documentation.dpatch cyrus-imapd-2.2.13/debian/patched/75-update-imapd.conf-documentation.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/75-update-imapd.conf-documentation.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/75-update-imapd.conf-documentation.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--patching file lib/imapoptions
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/77-change-missing-sieve-notice.dpatch cyrus-imapd-2.2.13/debian/patched/77-change-missing-sieve-notice.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/77-change-missing-sieve-notice.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/77-change-missing-sieve-notice.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--patching file sieve/script.c
-diff -urNad cyrus-imapd-2.2.13~/debian/patched/80-kbsd-no-psstrings.dpatch cyrus-imapd-2.2.13/debian/patched/80-kbsd-no-psstrings.dpatch
---- cyrus-imapd-2.2.13~/debian/patched/80-kbsd-no-psstrings.dpatch	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/debian/patched/80-kbsd-no-psstrings.dpatch	1970-01-01 00:00:00.000000000 +0000
-@@ -1 +0,0 @@
--patching file configure.in
-diff -urNad cyrus-imapd-2.2.13~/imap/annotate.c cyrus-imapd-2.2.13/imap/annotate.c
---- cyrus-imapd-2.2.13~/imap/annotate.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/annotate.c	2006-10-10 13:08:04.000000000 +0000
-@@ -1673,11 +1673,6 @@
-     { NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
- };
- 
--const struct annotate_st_entry vendor_entry =
--    { NULL, ATTRIB_TYPE_STRING, BACKEND_ONLY,
--      ATTRIB_VALUE_SHARED | ATTRIB_VALUE_PRIV,
--      ACL_ADMIN, annotation_set_todb, NULL };
--
- int annotatemore_store(char *mailbox,
- 		       struct entryattlist *l,
- 		       struct namespace *namespace,
-@@ -1690,7 +1685,6 @@
-     struct attvaluelist *av;
-     struct storedata sdata;
-     const struct annotate_st_entry *entries;
--    struct annotate_st_entry * working_entry;
-     time_t now = time(0);
- 
-     memset(&sdata, 0, sizeof(struct storedata));
-@@ -1712,55 +1706,37 @@
-     while (e) {
- 	int entrycount, attribs;
- 	struct annotate_st_entry_list *nentry = NULL;
--	struct annotate_st_entry *ientry = NULL;
- 
- 	/* See if we support this entry */
--	working_entry = NULL;
- 	for (entrycount = 0;
- 	     entries[entrycount].name;
- 	     entrycount++) {
- 	    if (!strcmp(e->entry, entries[entrycount].name)) {
--	        working_entry = &(entries[entrycount]);
- 		break;
- 	    }
- 	}
--	if (working_entry==NULL) {
--	    /* test for generic vendor annotation */
--	    if ((strncmp("/vendor/", e->entry, strlen("/vendor/"))==0) &&
--	        (strlen(e->entry)>strlen("/vendor/"))) {
--	      working_entry = &(vendor_entry);
--	    }
--	    else {
--	        /* unknown annotation */
--	        return IMAP_PERMISSION_DENIED;
--	    }
-+	if (!entries[entrycount].name) {
-+	    /* unknown annotation */
-+	    return IMAP_PERMISSION_DENIED;
- 	}
- 
- 	/* Add this entry to our list only if it
- 	   applies to our particular server type */
--	if (working_entry->proxytype == PROXY_AND_BACKEND
-+	if (entries[entrycount].proxytype == PROXY_AND_BACKEND
- 	    || (proxy_store_func &&
--		working_entry->proxytype == PROXY_ONLY)
-+		entries[entrycount].proxytype == PROXY_ONLY)
- 	    || (!proxy_store_func &&
--		working_entry->proxytype == BACKEND_ONLY)) {
--            ientry = xzmalloc(sizeof(struct annotate_st_entry));
--            ientry->name = e->entry;
--            ientry->type = working_entry->type;
--            ientry->proxytype = working_entry->proxytype;
--            ientry->attribs = working_entry->attribs;
--            ientry->acl = working_entry->acl;
--            ientry->set = working_entry->set;
--            ientry->rock = working_entry->rock;	
-+		entries[entrycount].proxytype == BACKEND_ONLY)) {
- 	    nentry = xzmalloc(sizeof(struct annotate_st_entry_list));
- 	    nentry->next = sdata.entry_list;
--	    nentry->entry = ientry;
-+	    nentry->entry = &(entries[entrycount]);
- 	    nentry->shared.modifiedsince = now;
- 	    nentry->priv.modifiedsince = now;
- 	    sdata.entry_list = nentry;
- 	}
- 
- 	/* See if we are allowed to set the given attributes. */
--	attribs = working_entry->attribs;
-+	attribs = entries[entrycount].attribs;
- 	av = e->attvalues;
- 	while (av) {
- 	    const char *value;
-@@ -1770,7 +1746,7 @@
- 		    goto cleanup;
- 		}
- 		value = annotate_canon_value(av->value,
--					     working_entry->type);
-+					     entries[entrycount].type);
- 		if (!value) {
- 		    r = IMAP_ANNOTATION_BADVALUE;
- 		    goto cleanup;
-@@ -1796,7 +1772,7 @@
- 		    goto cleanup;
- 		}
- 		value = annotate_canon_value(av->value,
--					     working_entry->type);
-+					     entries[entrycount].type);
- 		if (!value) {
- 		    r = IMAP_ANNOTATION_BADVALUE;
- 		    goto cleanup;
-@@ -1898,12 +1874,6 @@
-     /* Free the entry list */
-     while (sdata.entry_list) {
- 	struct annotate_st_entry_list *freeme = sdata.entry_list;
--	if (freeme != NULL){
--	    struct annotate_st_entry *freeme2 = freeme->entry;
--	    if (freeme2 != NULL) {
--	        free( freeme2 );
--	    }
--	}
- 	sdata.entry_list = sdata.entry_list->next;
- 	free(freeme);
-     }
-diff -urNad cyrus-imapd-2.2.13~/imap/append.c cyrus-imapd-2.2.13/imap/append.c
---- cyrus-imapd-2.2.13~/imap/append.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/append.c	2006-10-10 13:08:04.000000000 +0000
-@@ -140,7 +140,7 @@
-     if (!r) {
- 	if (m.quota.limit >= 0 && quotacheck >= 0 &&
- 	    m.quota.used + quotacheck > 
--	    ((uquota_t) m.quota.limit * QUOTA_UNITS)) {
-+	    ((unsigned) m.quota.limit * QUOTA_UNITS)) {
- 	    r = IMAP_QUOTA_EXCEEDED;
- 	}
-     }
-@@ -208,7 +208,7 @@
-     if (!r) {
- 	if (as->m.quota.limit >= 0 && quotacheck >= 0 &&
- 	    as->m.quota.used + quotacheck > 
--	    ((uquota_t) as->m.quota.limit * QUOTA_UNITS)) {
-+	    ((unsigned) as->m.quota.limit * QUOTA_UNITS)) {
- 	    quota_abort(&as->tid);
- 	    mailbox_close(&as->m);
- 	    r = IMAP_QUOTA_EXCEEDED;
-diff -urNad cyrus-imapd-2.2.13~/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
---- cyrus-imapd-2.2.13~/imap/imapd.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/imapd.c	2006-10-10 13:08:04.000000000 +0000
-@@ -2664,10 +2664,10 @@
-  	     */
-  	    int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
-  	    if (warnsize <= 0 || warnsize >= imapd_mailbox->quota.limit ||
-- 	        ((uquota_t) (imapd_mailbox->quota.limit - warnsize)) * QUOTA_UNITS < 
--		imapd_mailbox->quota.used) {
-+ 	        (int)((imapd_mailbox->quota.limit * QUOTA_UNITS) -
-+		      imapd_mailbox->quota.used) < (warnsize * QUOTA_UNITS)) {
- 		usage = ((double) imapd_mailbox->quota.used * 100.0) / (double)
--		    ((uquota_t) imapd_mailbox->quota.limit * QUOTA_UNITS);
-+		    (imapd_mailbox->quota.limit * QUOTA_UNITS);
- 		if (usage >= 100.0) {
- 		    prot_printf(imapd_out, "* NO [ALERT] %s\r\n",
- 				error_message(IMAP_NO_OVERQUOTA));
-@@ -4660,7 +4660,7 @@
- 	printastring(name);
- 	prot_printf(imapd_out, " (");
- 	if (quota.limit >= 0) {
--	    prot_printf(imapd_out, "STORAGE " UQUOTA_T_FMT " %d",
-+	    prot_printf(imapd_out, "STORAGE %lu %d",
- 			quota.used/QUOTA_UNITS, quota.limit);
- 	}
- 	prot_printf(imapd_out, ")\r\n");
-@@ -4722,7 +4722,7 @@
- 		printastring(mailboxname);
- 		prot_printf(imapd_out, " (");
- 		if (mailbox.quota.limit >= 0) {
--		    prot_printf(imapd_out, "STORAGE " UQUOTA_T_FMT " %d",
-+		    prot_printf(imapd_out, "STORAGE %lu %d",
- 				mailbox.quota.used/QUOTA_UNITS,
- 				mailbox.quota.limit);
- 		}
-diff -urNad cyrus-imapd-2.2.13~/imap/imapparse.c cyrus-imapd-2.2.13/imap/imapparse.c
---- cyrus-imapd-2.2.13~/imap/imapparse.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/imapparse.c	2006-10-10 13:08:04.000000000 +0000
-@@ -52,8 +52,8 @@
- #include "exitcodes.h"
- 
- enum {
--    MAXQUOTED = 131072,
--    MAXWORD = 131072,
-+    MAXQUOTED = 32768,
-+    MAXWORD = 32768,
-     MAXLITERAL = INT_MAX / 20
- };
- 
-diff -urNad cyrus-imapd-2.2.13~/imap/index.c cyrus-imapd-2.2.13/imap/index.c
---- cyrus-imapd-2.2.13~/imap/index.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/index.c	2006-10-10 13:08:04.000000000 +0000
-@@ -490,8 +490,8 @@
-      */
-     old = seenuids;
-     new = newseenuids;
--    while (cyrus_isdigit((int) *old)) oldnext = oldnext * 10 + *old++ - '0';
--    while (cyrus_isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
-+    while (isdigit((int) *old)) oldnext = oldnext * 10 + *old++ - '0';
-+    while (isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
- 
-     for (msgno = 1; msgno <= imapd_exists; msgno++) {
- 	uid = UID(msgno);
-@@ -505,7 +505,7 @@
- 		oldnext = 0;
- 		if (!*old) oldnext = mailbox->last_uid+1;
- 		else old++;
--		while (cyrus_isdigit((int) *old)) {
-+		while (isdigit((int) *old)) {
- 		    oldnext = oldnext * 10 + *old++ - '0';
- 		}
- 		oldnext += oldseen;
-@@ -524,7 +524,7 @@
- 		    neweof++;
- 		}
- 		else new++;
--		while (cyrus_isdigit((int) *new)) {
-+		while (isdigit((int) *new)) {
- 		    newnext = newnext * 10 + *new++ - '0';
- 		}
- 		newnext += newseen;
-@@ -643,7 +643,7 @@
- 		neweof++;
- 	    }
- 	    else new++;
--	    while (cyrus_isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
-+	    while (isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
- 	    newnext += newseen;
- 	}
-     }
-@@ -661,7 +661,7 @@
- 		/* There's a ":M" after the ",N".  Parse/include that too. */
- 		new++;
- 		newnext = 0;
--		while (cyrus_isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
-+		while (isdigit((int) *new)) newnext = newnext * 10 + *new++ - '0';
- 	    }
- 	    uid = newnext;
- 	    newseen++;		/* Forget we parsed ",N" */
-@@ -1504,7 +1504,7 @@
-     }
- 
-     for (;;) {
--	if (cyrus_isdigit((int) *sequence)) {
-+	if (isdigit((int) *sequence)) {
- 	    start = start*10 + *sequence - '0';
- 	}
- 	else if (*sequence == '*') {
-@@ -1513,7 +1513,7 @@
- 	else if (*sequence == ':') {
- 	    end = 0;
- 	    sequence++;
--	    while (cyrus_isdigit((int) *sequence)) {
-+	    while (isdigit((int) *sequence)) {
- 		end = end*10 + *sequence++ - '0';
- 	    }
- 	    if (*sequence == '*') {
-@@ -1571,7 +1571,7 @@
-     unsigned i, start = 0, end;
- 
-     for (;;) {
--	if (cyrus_isdigit((int) *sequence)) {
-+	if (isdigit((int) *sequence)) {
- 	    start = start*10 + *sequence - '0';
- 	}
- 	else if (*sequence == '*') {
-@@ -1581,7 +1581,7 @@
- 	else if (*sequence == ':') {
- 	    end = 0;
- 	    sequence++;
--	    while (cyrus_isdigit((int) *sequence)) {
-+	    while (isdigit((int) *sequence)) {
- 		end = end*10 + *sequence++ - '0';
- 	    }
- 	    if (*sequence == '*') {
-@@ -1705,7 +1705,7 @@
-     while (*p != ']' && *p != 'M') {
- 	/* Generate the actual part number */
- 	skip = 0;
--	while (cyrus_isdigit((int) *p)) {
-+	while (isdigit((int) *p)) {
-             skip = skip * 10 + *p++ - '0';
-             /* xxx overflow */
-         }
-@@ -1834,7 +1834,7 @@
- 
-     while (*p != 'H') {
- 	skip = 0;
--	while (cyrus_isdigit((int) *p)) {
-+	while (isdigit((int) *p)) {
-             skip = skip * 10 + *p++ - '0';
-             /* xxx overflow */
-         }
-@@ -3378,7 +3378,7 @@
- 	case '{':			/* literal */
- 	    c++;			/* skip open brace */
- 	    len = 0;			/* determine length of literal */
--	    while (cyrus_isdigit((int) *c)) {
-+	    while (isdigit((int) *c)) {
- 		len = len*10 + *c - '0';
- 		c++;
- 	    }
-@@ -3532,7 +3532,7 @@
- 			break;
- 		    			/* if we have a digit, and we're still
- 					   counting, keep building the count */
--		    } else if (cyrus_isdigit((int) *x) && count != -1) {
-+		    } else if (isdigit((int) *x) && count != -1) {
- 			count = count * 10 + *x - '0';
-                         if (count < 0) {                /* overflow */
-                             count = -1; /* abort counting */
-diff -urNad cyrus-imapd-2.2.13~/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
---- cyrus-imapd-2.2.13~/imap/mailbox.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/mailbox.c	2006-10-10 13:08:04.000000000 +0000
-@@ -84,7 +84,6 @@
- #include "seen.h"
- #include "util.h"
- #include "xmalloc.h"
--#include "byteorder64.h"
- 
- static int mailbox_doing_reconstruct = 0;
- #define zeromailbox(m) { memset(&m, 0, sizeof(struct mailbox)); \
-@@ -789,13 +788,6 @@
-     mailbox->last_uid =
- 	ntohl(*((bit32 *)(mailbox->index_base+OFFSET_LAST_UID)));
- 
--#ifdef HAVE_LONG_LONG_INT
--    if (mailbox->minor_version > 5) {
--	/* newer versions may use 64bit quotas now */
--        mailbox->quota_mailbox_used =
--            ntohll(*((bit64 *)(mailbox->index_base+OFFSET_QUOTA_MAILBOX_USED64)));
--    } else
--#endif
-     mailbox->quota_mailbox_used =
- 	ntohl(*((bit32 *)(mailbox->index_base+OFFSET_QUOTA_MAILBOX_USED-quota_upgrade_offset)));
- 
-@@ -1191,18 +1183,9 @@
-     *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(mailbox->exists);
-     *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox->last_appenddate);
-     *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox->last_uid);
--
--    /* quotas may be 64bit now */
--#ifdef HAVE_LONG_LONG_INT
--    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
--	htonll(mailbox->quota_mailbox_used);
--#else	
--    /* zero the unused 32bits */
--    *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0)
-+    *((bit32 *)(buf+OFFSET_QUOTA_RESERVED_FIELD)) = htonl(0); /* RESERVED */
-     *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
- 	htonl(mailbox->quota_mailbox_used);
--#endif
--
-     *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox->pop3_last_login);
-     *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox->uidvalidity);
-     *((bit32 *)(buf+OFFSET_DELETED)) = htonl(mailbox->deleted);
-@@ -1450,18 +1433,9 @@
-     *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(mailbox->exists);
-     *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox->last_appenddate);
-     *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox->last_uid);
--
--    /* newer versions may use 64bit quotas */
--#ifdef HAVE_LONG_LONG_INT
--    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
--	htonll(mailbox->quota_mailbox_used);
--#else	
--    /* zero the unused 32bits */
--    *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonl(0);
-+    /* OFFSET_QUOTA_RESERVED_FIELD left as zero */
-     *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
- 	htonl(mailbox->quota_mailbox_used);
--#endif
--
-     *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox->pop3_last_login);
-     *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox->uidvalidity);
-     *((bit32 *)(buf+OFFSET_DELETED)) = htonl(mailbox->deleted);
-@@ -1637,8 +1611,7 @@
-     size_t fnamebuf_len;
-     FILE *newindex = NULL, *newcache = NULL;
-     unsigned long *deleted;
--    unsigned numdeleted = 0;
--    uquota_t quotadeleted = 0;
-+    unsigned numdeleted = 0, quotadeleted = 0;
-     unsigned numansweredflag = 0;
-     unsigned numdeletedflag = 0;
-     unsigned numflaggedflag = 0;
-@@ -1865,13 +1838,8 @@
-     *((bit32 *)(buf+OFFSET_FLAGGED)) = htonl(newflagged);
- 
-     /* Fix up quota_mailbox_used */
--#ifdef HAVE_LONG_LONG_INT
--    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) =
--	htonll(ntohll(*((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)))-quotadeleted);
--#else
-     *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) =
-       htonl(ntohl(*((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)))-quotadeleted);
--#endif
-     /* Fix up start offset if necessary */
-     if (mailbox->start_offset < INDEX_HEADER_SIZE) {
- 	*((bit32 *)(buf+OFFSET_START_OFFSET)) = htonl(INDEX_HEADER_SIZE);
-@@ -1903,7 +1871,7 @@
- 	if (!r) quota_commit(&tid);
- 	else {
- 	    syslog(LOG_ERR,
--		   "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
-+		   "LOSTQUOTA: unable to record free of %u bytes in quota %s",
- 		   quotadeleted, mailbox->quota.root);
- 	}
-     }
-@@ -2178,7 +2146,7 @@
- 	r = quota_write(&mailbox->quota, &tid);
- 	if (r) {
- 	    syslog(LOG_ERR,
--		   "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
-+		   "LOSTQUOTA: unable to record free of %lu bytes in quota %s",
- 		   mailbox->quota_mailbox_used, mailbox->quota.root);
- 	}
- 	else
-@@ -2297,7 +2265,7 @@
- 	    strcmp(oldmailbox->quota.root, newmailbox->quota.root) != 0) {
- 	    if (!r && newmailbox->quota.limit >= 0 &&
- 		newmailbox->quota.used + oldmailbox->quota_mailbox_used >
--		((uquota_t) newmailbox->quota.limit * QUOTA_UNITS)) {
-+		((unsigned) newmailbox->quota.limit * QUOTA_UNITS)) {
- 		r = IMAP_QUOTA_EXCEEDED;
- 	    }
- 	}
-@@ -2511,7 +2479,7 @@
- 	    strcmp(oldmailbox.quota.root, newmailbox.quota.root) != 0) {
- 	    if (!r && newmailbox.quota.limit >= 0 &&
- 		newmailbox.quota.used + oldmailbox.quota_mailbox_used >
--		((uquota_t) newmailbox.quota.limit * QUOTA_UNITS)) {
-+		((unsigned) newmailbox.quota.limit * QUOTA_UNITS)) {
- 		r = IMAP_QUOTA_EXCEEDED;
- 	    }
- 	}
-@@ -2664,7 +2632,7 @@
- 	else if (r2 == IMAP_QUOTAROOT_NONEXISTENT) r2 = 0;
- 	if (r2) {
- 	    syslog(LOG_ERR,
--	      "LOSTQUOTA: unable to record use of " UQUOTA_T_FMT " bytes in quota %s",
-+	      "LOSTQUOTA: unable to record use of %lu bytes in quota %s",
- 		   newmailbox.quota_mailbox_used, newmailbox.quota.root);
- 	}
-     }
-diff -urNad cyrus-imapd-2.2.13~/imap/mailbox.h cyrus-imapd-2.2.13/imap/mailbox.h
---- cyrus-imapd-2.2.13~/imap/mailbox.h	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/mailbox.h	2006-10-10 13:08:04.000000000 +0000
-@@ -45,7 +45,6 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <limits.h>
--#include <config.h>
- 
- #include "auth.h"
- #include "quota.h"
-@@ -62,10 +61,6 @@
- #error dont know what to use for bit32
- #endif
- 
--#ifdef HAVE_LONG_LONG_INT
--typedef unsigned long long int bit64;
--#endif
--
- #define MAX_MAILBOX_NAME 490
- #define MAX_MAILBOX_PATH 4096
- 
-@@ -131,7 +126,7 @@
-     unsigned long exists;
-     time_t last_appenddate;
-     unsigned long last_uid;
--    uquota_t quota_mailbox_used;
-+    unsigned long quota_mailbox_used;
-     unsigned long pop3_last_login;
-     unsigned long uidvalidity;
- 
-@@ -173,8 +168,8 @@
- #define OFFSET_EXISTS 20
- #define OFFSET_LAST_APPENDDATE 24
- #define OFFSET_LAST_UID 28
--#define OFFSET_QUOTA_MAILBOX_USED64 32  /* offset for 64bit quotas */
--#define OFFSET_QUOTA_MAILBOX_USED 36    /* offset for 32bit quotas */
-+#define OFFSET_QUOTA_RESERVED_FIELD 32  /* Reserved for 64bit quotas */
-+#define OFFSET_QUOTA_MAILBOX_USED 36
- #define OFFSET_POP3_LAST_LOGIN 40
- #define OFFSET_UIDVALIDITY 44
- #define OFFSET_DELETED 48      /* added for ACAP */
-diff -urNad cyrus-imapd-2.2.13~/imap/mbdump.c cyrus-imapd-2.2.13/imap/mbdump.c
---- cyrus-imapd-2.2.13~/imap/mbdump.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/mbdump.c	2006-10-10 13:08:04.000000000 +0000
-@@ -507,7 +507,7 @@
- {
-     struct buf file, data;
-     char c;
--    uquota_t quotaused = 0;
-+    int quotaused = 0;
-     int r = 0;
-     int curfile = -1;
-     const char *userid = NULL;
-diff -urNad cyrus-imapd-2.2.13~/imap/mbexamine.c cyrus-imapd-2.2.13/imap/mbexamine.c
---- cyrus-imapd-2.2.13~/imap/mbexamine.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/mbexamine.c	2006-10-10 13:08:04.000000000 +0000
-@@ -266,7 +266,7 @@
-     printf("  Minor Version: %d\n", mailbox.minor_version);
-     printf("  Header Size: %ld bytes  Record Size: %ld bytes\n",
- 	   mailbox.start_offset, mailbox.record_size);
--    printf("  Number of Messages: %lu  Mailbox Size: " UQUOTA_T_FMT " bytes\n",
-+    printf("  Number of Messages: %lu  Mailbox Size: %lu bytes\n",
- 	   mailbox.exists, mailbox.quota_mailbox_used);
-     printf("  Last Append Date: (%ld) %s", mailbox.last_appenddate,
- 	   ctime(&mailbox.last_appenddate));
-diff -urNad cyrus-imapd-2.2.13~/imap/mboxlist.c cyrus-imapd-2.2.13/imap/mboxlist.c
---- cyrus-imapd-2.2.13~/imap/mboxlist.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/mboxlist.c	2006-10-10 13:08:04.000000000 +0000
-@@ -2536,7 +2536,7 @@
- 	r = quota_write(&mailbox.quota, tid);
- 	if (r) {
- 	    syslog(LOG_ERR,
--		   "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
-+		   "LOSTQUOTA: unable to record free of %lu bytes in quota %s",
- 		   mailbox.quota_mailbox_used, mailbox.quota.root);
- 	}
- 	free(mailbox.quota.root);
-diff -urNad cyrus-imapd-2.2.13~/imap/quota.c cyrus-imapd-2.2.13/imap/quota.c
---- cyrus-imapd-2.2.13~/imap/quota.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/quota.c	2006-10-10 13:08:04.000000000 +0000
-@@ -107,7 +107,7 @@
-     struct quota quota;
-     int refcount;
-     int deleted;
--    uquota_t newused;
-+    unsigned long newused;
- };
- 
- /* forward declarations */
-@@ -473,7 +473,7 @@
- 	(*count)++;
-     }
-     if (quota[thisquota].quota.used != quota[thisquota].newused) {
--	printf("%s: usage was " UQUOTA_T_FMT ", now " UQUOTA_T_FMT "\n", quota[thisquota].quota.root,
-+	printf("%s: usage was %lu, now %lu\n", quota[thisquota].quota.root,
- 	       quota[thisquota].quota.used, quota[thisquota].newused);
- 	quota[thisquota].quota.used = quota[thisquota].newused;
- 	r = quota_write(&quota[thisquota].quota, tid);
-@@ -539,12 +539,12 @@
-     int i;
-     char buf[MAX_MAILBOX_PATH+1];
- 
--    printf("   Quota   %% Used     Used Root\n");
-+    printf("   Quota  %% Used    Used Root\n");
- 
-     for (i = 0; i < quota_num; i++) {
- 	if (quota[i].deleted) continue;
- 	if (quota[i].quota.limit > 0) {
--	    printf(" %7d " QUOTA_REPORT_FMT , quota[i].quota.limit,
-+	    printf(" %7d %7ld", quota[i].quota.limit,
- 		   ((quota[i].quota.used / QUOTA_UNITS) * 100) / quota[i].quota.limit);
- 	}
- 	else if (quota[i].quota.limit == 0) {
-@@ -557,6 +557,6 @@
- 	(*quota_namespace.mboxname_toexternal)(&quota_namespace,
- 					       quota[i].quota.root,
- 					       "cyrus", buf);
--	printf(" " QUOTA_REPORT_FMT " %s\n", quota[i].quota.used / QUOTA_UNITS, buf);
-+	printf(" %7ld %s\n", quota[i].quota.used / QUOTA_UNITS, buf);
-     }
- }
-diff -urNad cyrus-imapd-2.2.13~/imap/quota.h cyrus-imapd-2.2.13/imap/quota.h
---- cyrus-imapd-2.2.13~/imap/quota.h	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/quota.h	2006-10-10 13:08:04.000000000 +0000
-@@ -45,37 +45,18 @@
- #define INCLUDED_QUOTA_H
- 
- #include "cyrusdb.h"
--#include <config.h>
- 
- #define FNAME_QUOTADB "/quotas.db"
- 
- #define QUOTA_UNITS (1024)
- 
--/* Define the proper quota type, it should either be a
-- * long or a long long int depending upon what the
-- * the compiler supports.
-- */
--#ifdef HAVE_LONG_LONG_INT
--typedef unsigned long long int uquota_t;
--typedef long long int quota_t;
--#define UQUOTA_T_FMT     "%llu"
--#define QUOTA_T_FMT      "%lld"
--#define QUOTA_REPORT_FMT "%8llu"
--#else
--typedef unsigned long uquota_t;
--typedef long quota_t;
--#define UQUOTA_T_FMT     "%lu"
--#define QUOTA_T_FMT      "%ld"
--#define QUOTA_REPORT_FMT "%8lu"
--#endif
--
- extern struct db *qdb;
- 
- struct quota {
-     char *root;
- 
-     /* Information in quota entry */
--    uquota_t used;
-+    unsigned long used;
-     int limit;			/* in QUOTA_UNITS */
- };
- 
-diff -urNad cyrus-imapd-2.2.13~/imap/quota_db.c cyrus-imapd-2.2.13/imap/quota_db.c
---- cyrus-imapd-2.2.13~/imap/quota_db.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/quota_db.c	2006-10-10 13:08:04.000000000 +0000
-@@ -89,7 +89,7 @@
- 
-     switch (r) {
-     case CYRUSDB_OK:
--	sscanf(data, UQUOTA_T_FMT " %d", &quota->used, &quota->limit);
-+	sscanf(data, "%lu %d", &quota->used, &quota->limit);
- 	break;
- 
-     case CYRUSDB_AGAIN:
-@@ -151,7 +151,7 @@
-     if (!qrlen) return IMAP_QUOTAROOT_NONEXISTENT;
- 
-     len = snprintf(buf, sizeof(buf) - 1,
--		   UQUOTA_T_FMT " %d", quota->used, quota->limit);
-+		   "%lu %d", quota->used, quota->limit);
-     r = QDB->store(qdb, quota->root, qrlen, buf, len, tid);
-     
-     switch (r) {
-diff -urNad cyrus-imapd-2.2.13~/imap/reconstruct.c cyrus-imapd-2.2.13/imap/reconstruct.c
---- cyrus-imapd-2.2.13~/imap/reconstruct.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/imap/reconstruct.c	2006-10-10 13:08:04.000000000 +0000
-@@ -93,7 +93,6 @@
- #include "retry.h"
- #include "convert_code.h"
- #include "util.h"
--#include "byteorder64.h"
- 
- extern int optind;
- extern char *optarg;
-@@ -435,7 +434,7 @@
-     char *list_acl, *list_part;
-     int list_type;
- 
--    uquota_t new_quota = 0;
-+    unsigned long new_quota = 0;
- 
-     struct index_record message_index, old_index;
-     static struct index_record zero_index;
-@@ -691,14 +690,7 @@
-     *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(new_exists);
-     *((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(mailbox.last_appenddate);
-     *((bit32 *)(buf+OFFSET_LAST_UID)) = htonl(mailbox.last_uid);
--
--    /* quotas may be 64bit now */
--#ifdef HAVE_LONG_LONG_INT
--    *((bit64 *)(buf+OFFSET_QUOTA_MAILBOX_USED64)) = htonll(new_quota);
--#else
--    *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED32)) = htonl(new_quota);
--#endif
--
-+    *((bit32 *)(buf+OFFSET_QUOTA_MAILBOX_USED)) = htonl(new_quota);
-     *((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox.pop3_last_login);
-     *((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox.uidvalidity);
-     *((bit32 *)(buf+OFFSET_DELETED)) = htonl(new_deleted);
-diff -urNad cyrus-imapd-2.2.13~/install-sh cyrus-imapd-2.2.13/install-sh
---- cyrus-imapd-2.2.13~/install-sh	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/install-sh	2006-10-10 13:08:10.000000000 +0000
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
- 
--scriptversion=2005-02-02.21
-+scriptversion=2005-05-14.22
- 
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-diff -urNad cyrus-imapd-2.2.13~/install-sh.rej cyrus-imapd-2.2.13/install-sh.rej
---- cyrus-imapd-2.2.13~/install-sh.rej	1970-01-01 00:00:00.000000000 +0000
-+++ cyrus-imapd-2.2.13/install-sh.rej	2006-10-10 13:08:04.000000000 +0000
-@@ -0,0 +1,78 @@
-+***************
-+*** 1,52 ****
-+  #!/bin/sh
-+  # install - install a program, script, or datafile
-+- 
-+- scriptversion=2005-02-02.21
-+- 
-+- # This originates from X11R5 (mit/util/scripts/install.sh), which was
-+- # later released in X11R6 (xc/config/util/install.sh) with the
-+- # following copyright and license.
-+- #
-+- # Copyright (C) 1994 X Consortium
-+- #
-+- # Permission is hereby granted, free of charge, to any person obtaining a copy
-+- # of this software and associated documentation files (the "Software"), to
-+- # deal in the Software without restriction, including without limitation the
-+- # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+- # sell copies of the Software, and to permit persons to whom the Software is
-+- # furnished to do so, subject to the following conditions:
-+- #
-+- # The above copyright notice and this permission notice shall be included in
-+- # all copies or substantial portions of the Software.
-+- #
-+- # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+- # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+- # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+- # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+- # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+- # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+- #
-+- # Except as contained in this notice, the name of the X Consortium shall not
-+- # be used in advertising or otherwise to promote the sale, use or other deal-
-+- # ings in this Software without prior written authorization from the X Consor-
-+- # tium.
-+- #
-+- #
-+- # FSF changes to this file are in the public domain.
-+  #
-+  # Calling this script install-sh is preferred over install.sh, to prevent
-+  # `make' implicit rules from creating a file called install from it
-+  # when there is no Makefile.
-+  #
-+  # This script is compatible with the BSD install script, but was written
-+- # from scratch.  It can only install one file at a time, a restriction
-+- # shared with many OS's install programs.
-+  
-+  # set DOITPROG to echo to test this script
-+  
-+  # Don't use :- since 4.3BSD and earlier shells don't like it.
-+  doit="${DOITPROG-}"
-+  
-+  # put in absolute paths if you don't have them in your path; or use env. vars.
-+  
-+  mvprog="${MVPROG-mv}"
-+--- 1,23 ----
-+  #!/bin/sh
-++ #
-+  # install - install a program, script, or datafile
-++ # This comes from X11R5.
-+  #
-+  # Calling this script install-sh is preferred over install.sh, to prevent
-+  # `make' implicit rules from creating a file called install from it
-+  # when there is no Makefile.
-+  #
-+  # This script is compatible with the BSD install script, but was written
-++ # from scratch.
-++ #
-++ 
-+  
-+  # set DOITPROG to echo to test this script
-+  
-+  # Don't use :- since 4.3BSD and earlier shells don't like it.
-+  doit="${DOITPROG-}"
-+  
-++ 
-+  # put in absolute paths if you don't have them in your path; or use env. vars.
-+  
-+  mvprog="${MVPROG-mv}"
-diff -urNad cyrus-imapd-2.2.13~/lib/Makefile.in cyrus-imapd-2.2.13/lib/Makefile.in
---- cyrus-imapd-2.2.13~/lib/Makefile.in	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/lib/Makefile.in	2006-10-10 13:08:04.000000000 +0000
-@@ -87,7 +87,7 @@
- 	$(srcdir)/lsort.h $(srcdir)/stristr.h \
- 	$(srcdir)/util.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h $(srcdir)/imapurl.h \
- 	$(srcdir)/cyrusdb.h $(srcdir)/iptostring.h $(srcdir)/rfc822date.h \
--	$(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h
-+	$(srcdir)/libcyr_cfg.h
- 
- LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
- 	libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
-@@ -95,7 +95,7 @@
- 	chartable.o imapurl.o nonblock_ at WITH_NONBLOCK@.o lock_ at WITH_LOCK@.o \
- 	gmtoff_ at WITH_GMTOFF@.o map_ at WITH_MAP@.o $(ACL) $(AUTH) \
- 	@LIBOBJS@ @CYRUSDB_OBJS@ \
--	iptostring.o xstrlcpy.o xstrlcat.o xmalloc.o wildmat.o byteorder64.o
-+	iptostring.o xstrlcpy.o xstrlcat.o xmalloc.o wildmat.o
- 
- LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h \
- 	$(srcdir)/strhash.o $(srcdir)/libconfig.h \
-diff -urNad cyrus-imapd-2.2.13~/lib/byteorder64.c cyrus-imapd-2.2.13/lib/byteorder64.c
---- cyrus-imapd-2.2.13~/lib/byteorder64.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/lib/byteorder64.c	1970-01-01 00:00:00.000000000 +0000
-@@ -1,95 +0,0 @@
--/* byteorder64.c -- convert 64-bit values between host and network byte order
-- * 
-- * Copyright (c) 2004 Carnegie Mellon University.  All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions
-- * are met:
-- *
-- * 1. Redistributions of source code must retain the above copyright
-- *    notice, this list of conditions and the following disclaimer. 
-- *
-- * 2. Redistributions in binary form must reproduce the above copyright
-- *    notice, this list of conditions and the following disclaimer in
-- *    the documentation and/or other materials provided with the
-- *    distribution.
-- *
-- * 3. The name "Carnegie Mellon University" must not be used to
-- *    endorse or promote products derived from this software without
-- *    prior written permission. For permission or any other legal
-- *    details, please contact  
-- *      Office of Technology Transfer
-- *      Carnegie Mellon University
-- *      5000 Forbes Avenue
-- *      Pittsburgh, PA  15213-3890
-- *      (412) 268-4387, fax: (412) 268-7395
-- *      tech-transfer at andrew.cmu.edu
-- *
-- * 4. Redistributions of any form whatsoever must retain the following
-- *    acknowledgment:
-- *    "This product includes software developed by Computing Services
-- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-- *
-- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- *
-- * $Id: byteorder64.c,v 1.1.2.1 2004/08/09 18:51:21 ken3 Exp $
-- */
--
--#include <config.h>
--
--#if defined(HAVE_LONG_LONG_INT) && !defined(WORDS_BIGENDIAN)
--
--#include <netinet/in.h>
--
--/* Structure used to swap the bytes in a 64-bit unsigned long long. */
--union byteswap_64_u {
--    unsigned long long a;
--    uint32_t b[2];
--};
--
--/* Function to byteswap 64bit unsigned integers on
-- * little endian machines to big endian network order. 
-- * On big endian machines this will be a null macro.
-- * The macro htonll() is defined in byteorder64.h,
-- * and if needed refers to _htonll() here.
-- */
--unsigned long long _htonll(unsigned long long x)
--{
--    union byteswap_64_u u1;
--    union byteswap_64_u u2;
--
--    u1.a = x;
--
--    u2.b[0] = htonl(u1.b[1]);
--    u2.b[1] = htonl(u1.b[0]);
--
--    return u2.a;
--}
--
--
--/* Function to byteswap big endian 64bit unsigned integers
-- * back to little endian host order on little endian machines. 
-- * As above, on big endian machines this will be a null macro.
-- * The macro ntohll() is defined in byteorder64.h, and if needed,
-- * refers to _ntohll() here.
-- */
--unsigned long long _ntohll(unsigned long long x)
--{
--    union byteswap_64_u u1;
--    union byteswap_64_u u2;
--
--    u1.a = x;
--
--    u2.b[1] = ntohl(u1.b[0]);
--    u2.b[0] = ntohl(u1.b[1]);
--
--    return u2.a;
--}
--
--#endif /* defined(HAVE_LONG_LONG_INT) && !defined(WORDS_BIGENDIAN) */
-diff -urNad cyrus-imapd-2.2.13~/lib/byteorder64.h cyrus-imapd-2.2.13/lib/byteorder64.h
---- cyrus-imapd-2.2.13~/lib/byteorder64.h	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/lib/byteorder64.h	1970-01-01 00:00:00.000000000 +0000
-@@ -1,65 +0,0 @@
--/* byteorder64.h -- convert 64-bit values between host and network byte order
-- *
-- * Copyright (c) 2004 Carnegie Mellon University.  All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions
-- * are met:
-- *
-- * 1. Redistributions of source code must retain the above copyright
-- *    notice, this list of conditions and the following disclaimer. 
-- *
-- * 2. Redistributions in binary form must reproduce the above copyright
-- *    notice, this list of conditions and the following disclaimer in
-- *    the documentation and/or other materials provided with the
-- *    distribution.
-- *
-- * 3. The name "Carnegie Mellon University" must not be used to
-- *    endorse or promote products derived from this software without
-- *    prior written permission. For permission or any other legal
-- *    details, please contact  
-- *      Office of Technology Transfer
-- *      Carnegie Mellon University
-- *      5000 Forbes Avenue
-- *      Pittsburgh, PA  15213-3890
-- *      (412) 268-4387, fax: (412) 268-7395
-- *      tech-transfer at andrew.cmu.edu
-- *
-- * 4. Redistributions of any form whatsoever must retain the following
-- *    acknowledgment:
-- *    "This product includes software developed by Computing Services
-- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
-- *
-- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
-- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- *
-- * $Id: byteorder64.h,v 1.1.2.2 2004/08/16 11:44:34 ken3 Exp $
-- */
--
--#ifndef _BYTEORDER64_H
--#define _BYTEORDER64_H
--
--#include <config.h>
--
--#ifdef HAVE_LONG_LONG_INT
--
--/* 64-bit host/network byte-order swap macros */
--#ifdef WORDS_BIGENDIAN
--#define htonll(x) (x)
--#define ntohll(x) (x)
--#else
--#define htonll(x) _htonll(x)
--#define ntohll(x) _ntohll(x)
--
--/* little-endian 64-bit host/network byte-order swap functions */
--extern unsigned long long _htonll(unsigned long long);
--extern unsigned long long _ntohll(unsigned long long);
--
--#endif /* WORDS_BIGENDIAN */
--#endif /* HAVE_LONG_LONG_INT */
--#endif /* _BYTEORDER64_H */
-diff -urNad cyrus-imapd-2.2.13~/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
---- cyrus-imapd-2.2.13~/lib/imapoptions	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/lib/imapoptions	2006-10-10 13:08:04.000000000 +0000
-@@ -69,10 +69,7 @@
- \fB/etc/imapd.conf\fR file, and show each option's default value.
- Some options have no default value, these are listed with
- ``<no default>''.  Some options default to the empty string, these
--are listed with ``<none>''. It is also possible to override options by
--specifying them as <service_id>_<optionname>. One example is ``lmtp_admins'',
--which overrides ``admins'' just for the lmtp service. The <service_id> is the
--one you specified in the \fB/etc/cyrus.conf\fR file.
-+are listed with ``<none>''.
- */
- 
- # OPTIONS
-@@ -125,17 +122,7 @@
-   enabled when absolutely necessary. */
- 
- { "allowplaintext", 1, SWITCH }
--/* Allow the use of cleartext passwords on the wire.
--.PP
--  To disallow the use of plaintext passwords for authentication, you can
--  set ``allowplaintext: no'' in imapd.conf. This will still allow PLAIN
--  under TLS, but IMAP LOGIN commands will now fail.
--.PP
--  If you only list plaintext authentication mechanisms in ``sasl_mech_list''
--  and set ``allowplaintext: no'', only users on encrypted sessions (TLS or
--  SSL) will be able to authenticate. On the other hand, if you list no
--  plaintext authentication options in ``sasl_mech_list'',
--  ``allowplaintext: yes'' would have no effect. */
-+/* Allow the use of cleartext passwords on the wire. */
-    
- { "allowusermoves", 0, SWITCH }
- /* Allow moving user accounts (with associated meta-data) via RENAME
-diff -urNad cyrus-imapd-2.2.13~/lib/prot.c cyrus-imapd-2.2.13/lib/prot.c
---- cyrus-imapd-2.2.13~/lib/prot.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/lib/prot.c	2006-10-10 13:08:04.000000000 +0000
-@@ -871,11 +871,6 @@
-     char buf[30];
-     va_start(pvar, fmt);
- 
--#ifdef HAVE_LONG_LONG_INT
--    long long int ll;
--    unsigned long long int ull;
--#endif
--
-     assert(s->write);
- 
-     while ((percent = strchr(fmt, '%')) != 0) {
-@@ -899,27 +894,6 @@
- 		prot_write(s, buf, strlen(buf));
- 		break;
- 
--#ifdef HAVE_LONG_LONG_INT
--            case 'l':
--	        switch (*++percent) {
--		case 'd':
--		    ll = va_arg(pvar, long long int);
--		    snprintf(buf, sizeof(buf), "%lld", ll);
--		    prot_write(s, buf, strlen(buf));
--		    break;
--
--		case 'u':
--		    ull = va_arg(pvar, unsigned long long int);
--		    snprintf(buf, sizeof(buf), "%llu", ull);
--		    prot_write(s, buf, strlen(buf));
--		    break;
--
--	        default:
--		    abort();
--		}
--		break;
--#endif
--
- 	    default:
- 		abort();
- 	    }
-diff -urNad cyrus-imapd-2.2.13~/lib/util.h cyrus-imapd-2.2.13/lib/util.h
---- cyrus-imapd-2.2.13~/lib/util.h	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/lib/util.h	2006-10-10 13:08:04.000000000 +0000
-@@ -107,10 +107,4 @@
-  */
- extern int cyrus_mkdir(const char *path, mode_t mode);
- 
--/* Some systems have very inefficient implementations of isdigit,
-- * and we use it in a lot of inner loops
-- */
--
--#define cyrus_isdigit(x) ((x) >= '0' && (x) <= '9')
--
- #endif /* INCLUDED_UTIL_H */
 diff -urNad cyrus-imapd-2.2.13~/mkinstalldirs cyrus-imapd-2.2.13/mkinstalldirs
---- cyrus-imapd-2.2.13~/mkinstalldirs	2006-10-10 13:08:02.000000000 +0000
-+++ cyrus-imapd-2.2.13/mkinstalldirs	2006-10-10 13:08:10.000000000 +0000
+--- cyrus-imapd-2.2.13~/mkinstalldirs	2006-10-10 13:24:48.000000000 +0000
++++ cyrus-imapd-2.2.13/mkinstalldirs	2006-10-10 13:24:55.000000000 +0000
 @@ -1,7 +1,7 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -70866,785 +25435,3 @@
    done
  done
  
-diff -urNad cyrus-imapd-2.2.13~/perl/imap/IMAP/Admin.pm cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm
---- cyrus-imapd-2.2.13~/perl/imap/IMAP/Admin.pm	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm	2006-10-10 13:08:04.000000000 +0000
-@@ -784,21 +784,19 @@
- 		 "news2mail" => "/vendor/cmu/cyrus-imapd/news2mail",
- 		 "expire" => "/vendor/cmu/cyrus-imapd/expire",
- 		 "sieve" => "/vendor/cmu/cyrus-imapd/sieve",
--		 "squat" => "/vendor/cmu/cyrus-imapd/squat",
-- 		 "folder-type" => "/vendor/kolab/folder-type",
-- 		 "h-share-uid" => "/vendor/kolab/h-share-uid" );
-+		 "squat" => "/vendor/cmu/cyrus-imapd/squat" );
- 
-   if(!$self->{support_annotatemore}) {
-     $self->{error} = "Remote does not support ANNOTATEMORE.";
-     return undef;
-   }
- 
--  if(exists($values{$entry})) {
--    $entry = $values{$entry};
--  } else {
--    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
-+  if(!exists($values{$entry})) {
-+    $self->{error} = "Unknown parameter $entry";
-   }
- 
-+  $entry = $values{$entry};
-+
-   my ($rc, $msg);
- 
-   $value = undef if($value eq "none");
-diff -urNad cyrus-imapd-2.2.13~/perl/imap/IMAP/Shell.pm cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm
---- cyrus-imapd-2.2.13~/perl/imap/IMAP/Shell.pm	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm	2006-10-10 13:08:04.000000000 +0000
-@@ -126,7 +126,7 @@
- 		  [\&_sc_info, '[mailbox]',
- 		   'display mailbox/server metadata'],
- 		mboxcfg =>
--		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value',
-+		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|sieve|squat] value',
- 		   'configure mailbox'],
- 		mboxconfig => 'mboxcfg',
- 		reconstruct =>
-@@ -437,7 +437,7 @@
- # programs, as opposed to things expected from within a program.)
- sub shell {
-   my ($server, $port, $authz, $auth, $systemrc, $userrc, $dorc, $mech, $pw) =
--    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/etc/cyradmrc.pl',
-+    ('', 143, undef, $ENV{USER} || $ENV{LOGNAME}, '/usr/local/etc/cyradmrc.pl',
-      "$ENV{HOME}/.cyradmrc.pl", 1, undef, undef);
-   GetOptions('user|u=s' => \$auth,
- 	     'authz|z=s' => \$authz,
-@@ -467,7 +467,7 @@
- 			  -rock => \$cyradm});
-     $cyradm->authenticate(-authz => $authz, -user => $auth,
- 			  -mechanism => $mech, -password => $pw)
--      or die "cyradm: cannot authenticate to server" . (defined($mech)?" with $mech":"") . " as $auth\n";
-+      or die "cyradm: cannot authenticate to server with $mech as $auth\n";
-   }
-   my $fstk = [*STDIN, *STDOUT, *STDERR];
-   if ($dorc && $systemrc ne '' && -f $systemrc) {
-@@ -1400,7 +1400,7 @@
-   while (defined ($opt = shift(@argv))) {
-     last if $opt eq '--';
-     if ($opt =~ /^-/) {
--      die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
-+      die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n";
-     }
-     else {
-       push(@nargv, $opt);
-@@ -1409,7 +1409,7 @@
-   }
-   push(@nargv, @argv);
-   if (@nargv < 2) {
--    die "usage: mboxconfig mailbox [comment|news2mail|expire|squat|/<explicit annotation>] value\n";
-+    die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n";
-   }
-   if (!$cyrref || !$$cyrref) {
-     die "mboxconfig: no connection to server\n";
-diff -urNad cyrus-imapd-2.2.13~/perl/imap/examples/auditmbox.pl cyrus-imapd-2.2.13/perl/imap/examples/auditmbox.pl
---- cyrus-imapd-2.2.13~/perl/imap/examples/auditmbox.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/perl/imap/examples/auditmbox.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#! /usr/bin/perl -w
- # 
- # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
- #
-diff -urNad cyrus-imapd-2.2.13~/perl/imap/examples/imapcollate.pl cyrus-imapd-2.2.13/perl/imap/examples/imapcollate.pl
---- cyrus-imapd-2.2.13~/perl/imap/examples/imapcollate.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/perl/imap/examples/imapcollate.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#! /usr/bin/perl -w
- # 
- # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
- #
-diff -urNad cyrus-imapd-2.2.13~/perl/imap/examples/imapdu.pl cyrus-imapd-2.2.13/perl/imap/examples/imapdu.pl
---- cyrus-imapd-2.2.13~/perl/imap/examples/imapdu.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/perl/imap/examples/imapdu.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#! /usr/local/bin/perl -w
- #
- # $Id: imapdu.pl,v 1.8 2001/11/30 19:30:45 leg Exp $
- # 
-diff -urNad cyrus-imapd-2.2.13~/perl/imap/examples/test-imsp.pl cyrus-imapd-2.2.13/perl/imap/examples/test-imsp.pl
---- cyrus-imapd-2.2.13~/perl/imap/examples/test-imsp.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/perl/imap/examples/test-imsp.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/local/bin/perl -w
- 
- # test-imsp.pl
- #
-diff -urNad cyrus-imapd-2.2.13~/perl/sieve/lib/request.c cyrus-imapd-2.2.13/perl/sieve/lib/request.c
---- cyrus-imapd-2.2.13~/perl/sieve/lib/request.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/perl/sieve/lib/request.c	2006-10-10 13:08:04.000000000 +0000
-@@ -560,6 +560,7 @@
- 	      char **refer_to, char **errstrp)
- {
-   int res;
-+  mystring_t *str=NULL;
-   mystring_t *errstr=NULL;
-   lexstate_t state;
-   int ret = 0;
-diff -urNad cyrus-imapd-2.2.13~/perl/sieve/scripts/installsieve.pl cyrus-imapd-2.2.13/perl/sieve/scripts/installsieve.pl
---- cyrus-imapd-2.2.13~/perl/sieve/scripts/installsieve.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/perl/sieve/scripts/installsieve.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,6 @@
--#!/usr/bin/perl -w
-+#! /bin/sh
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
- # 
- # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
- #
-diff -urNad cyrus-imapd-2.2.13~/perl/sieve/scripts/sieveshell.pl cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl
---- cyrus-imapd-2.2.13~/perl/sieve/scripts/sieveshell.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,6 @@
--#!/usr/bin/perl -w
-+#! /bin/sh
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
- # 
- # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
- #
-@@ -60,9 +62,7 @@
- my $username = $ENV{USER};
- my $authname = $ENV{USER};
- my $realm = "";
--my $password;
- my $ex = "";
--my $exfile = "";
- my $help = 0;
- my $man = 0;
- my $ret;
-@@ -70,9 +70,7 @@
- GetOptions("a|authname:s" => \$authname,
-     "u|username:s" => \$username,
-     "r|realm:s" => \$realm,
--    "p|password:s" => \$password,
-     "e|exec:s" => \$ex,
--    "f|execfile:s" => \$exfile,
-     "help|?" => \$help,
-     man => \$man) or pod2usage(2);
- pod2usage(1) if $help;
-@@ -87,24 +85,20 @@
- my $filehandle;
- my $interactive;
- 
--if (! $exfile eq "") {
--    open(FILEH,"<$exfile") || die "unable to open file: $?";
--    $filehandle = *FILEH;
-+if (! $ex eq "") {
-+    $filehandle = tempfile();
-+
-+    if (!$filehandle) { die "unable to open tmp file: $?"; }
-+
-+    print $filehandle $ex;
-+    seek $filehandle, 0, 0; # rewind file
-     $interactive = 0;
- } else {
--    if (! $ex eq "") {
--	$filehandle = tempfile();
-+    $filehandle = *STDIN;
-+    $interactive = 1;
-+}
- 
--	if (!$filehandle) { die "unable to open tmp file: $?"; }
- 
--	print $filehandle $ex;
--	seek $filehandle, 0, 0; # rewind file
--	$interactive = 0;
--    } else {
--	$filehandle = *STDIN;
--	$interactive = 1;
--    }
--}
- 
- sub list_cb {
- 
-@@ -129,8 +123,6 @@
-       return $authname;
-   } elsif (($type eq "realm") && (defined $realm)) {
-       return $realm;
--  } elsif (($type eq "password") && (defined $password)) {
--      return $password;
-   }
- 
-   my $ostty;
-@@ -181,8 +173,6 @@
- 
- my $term = Term::ReadLine->new("sieveshell");
- 
--my $exitcode = 0;
--
- $term->ornaments(0);
- 
- while(defined($_  = ($interactive ? $term->readline('> ') : <$filehandle>))){
-@@ -209,9 +199,6 @@
- 	my $errstr = sieve_get_error($obj);
- 	$errstr = "unknown error" if(!defined($errstr));
- 	print "upload failed: $errstr\n"; 
--	$exitcode = 1;
--      } else {
--        $exitcode = 0;
-       }
-     } elsif (($words[0] eq "list") || 
- 	     ($words[0] eq "l") || 
-@@ -221,9 +208,6 @@
- 	    my $errstr = sieve_get_error($obj);
- 	    $errstr = "unknown error" if(!defined($errstr));
- 	    print "list failed: $errstr\n";
--	    $exitcode = 1;
--	} else {
--	    $exitcode = 0;
- 	}
-     } elsif (($words[0] eq "activate") || 
- 	     ($words[0] eq "a")) {
-@@ -236,9 +220,6 @@
- 	    my $errstr = sieve_get_error($obj);
- 	    $errstr = "unknown error" if(!defined($errstr));
- 	    print "activate failed: $errstr\n";
--	    $exitcode = 1;
--	} else {
--	    $exitcode = 0;
- 	}
-     } elsif (($words[0] eq "deactivate") || 
- 	     ($words[0] eq "da")) {
-@@ -251,9 +232,6 @@
- 	    my $errstr = sieve_get_error($obj);
- 	    $errstr = "unknown error" if(!defined($errstr));
- 	    print "deactivate failed: $errstr\n";
--	    $exitcode = 1;
--	} else {
--	    $exitcode = 0;
- 	}
-     } elsif (($words[0] eq "delete") || 
- 	     ($words[0] eq "d")) {    
-@@ -266,9 +244,6 @@
- 	    my $errstr = sieve_get_error($obj);
- 	    $errstr = "unknown error" if(!defined($errstr));
- 	    print "delete failed: $errstr\n"; 
--	    $exitcode = 1;
--	} else {
--	    $exitcode = 0;
- 	}
-     } elsif (($words[0] eq "get") || 
- 	     ($words[0] eq "g")) {
-@@ -282,32 +257,25 @@
- 	    my $errstr = sieve_get_error($obj);
- 	    $errstr = "unknown error" if(!defined($errstr));
- 	    print "get failed: $errstr\n"; 
--	    $exitcode = 1;
- 	} else {
- 	    if ($words[2]) {
- 		open (OUTPUT,">$words[2]") || die "Unable to open $words[2]";
- 		print OUTPUT $str;
- 		close(OUTPUT);
--		$exitcode = 0;
- 	    } else {
- 		print $str;
--		$exitcode = 0;
- 	    }
- 	}
-     } elsif (($words[0] eq "quit") || ($words[0] eq "q")) {
-         sieve_logout($obj);
--	exit $exitcode;
-+	exit 0;
-     } elsif (($words[0] eq "help") || ($words[0] eq "?")) {
- 	show_help();
--	$exitcode = 0;
-     } else {
- 	print "Invalid command: $words[0]\n";
--	$exitcode = 1;
-     } 
- }
- 
--exit $exitcode;
--
- __END__
- 
- =head1 NAME
-@@ -317,8 +285,7 @@
- =head1 SYNOPSIS
- 
- sieveshell [B<--user>=I<user>] [B<--authname>=I<authname>] 
--[B<--realm>=I<realm>] [B<--password>=I<password>]
--[B<--exec>=I<script>] [B<--execfile>=I<file>] I<server>[B<:>I<port>]
-+[B<--realm>=I<realm>] [B<--exec>=I<script>] I<server>[B<:>I<port>]
- 
- sieveshell B<--help>
- 
-@@ -362,21 +329,11 @@
- 
- The realm to attempt authentication in.
- 
--=item B<-p> I<password>, B<--password>=I<password>
--
--The password to use when authenticating to server. Note that this
--parameter can be seen in the process list. B<Use with caution!>
--
- =item B<-e> I<script>, B<--exec>=I<script> 
- 
- Instead of working interactively, run commands from I<script>, and
- exit when done.
- 
--=item B<-f> I<file>, B<--execfile>=I<file>
--
--Instead of working interactively, run commands from file I<file> and
--exit when done.
--
- =back
- 
- =head1 REFERENCES
-diff -urNad cyrus-imapd-2.2.13~/sieve/script.c cyrus-imapd-2.2.13/sieve/script.c
---- cyrus-imapd-2.2.13~/sieve/script.c	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/sieve/script.c	2006-10-10 13:08:04.000000000 +0000
-@@ -37,7 +37,6 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <assert.h>
--#include <errno.h>
- 
- #include "xmalloc.h"
- 
-@@ -419,11 +418,7 @@
-     if (!fname || !ret) return SIEVE_FAIL;
-     
-     if (stat(fname, &sbuf) == -1) {
--	if (errno == ENOENT) {
--		syslog(LOG_DEBUG, "WARNING: sieve script %s doesn't exist: %m", fname);
--	} else {
--		syslog(LOG_DEBUG, "IOERROR: fstating sieve script %s: %m", fname);
--	}
-+	syslog(LOG_DEBUG, "IOERROR: fstating sieve script %s: %m", fname);
- 	return SIEVE_FAIL;
-     }
- 
-diff -urNad cyrus-imapd-2.2.13~/snmp/snmpgen cyrus-imapd-2.2.13/snmp/snmpgen
---- cyrus-imapd-2.2.13~/snmp/snmpgen	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/snmp/snmpgen	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/bin/sh
- # 
- # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
- #
-@@ -38,8 +38,25 @@
- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
- # $Id: snmpgen,v 1.18 2005/04/11 06:08:58 shadow Exp $
- 
-+if ($] !~ /^5\..*/) {
-+  # uh-oh. this isn't perl 5.
-+  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
-+    exec("$_/perl5", "-w", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
-+  }
-+  # we failed. bail.
-+  die "Your perl is too old; I need perl 5.\n";
-+}
-+
-+# load the real script. this is isolated in an 'eval' so perl4 won't
-+# choke on the perl5-isms.
-+eval join("\n", <DATA>);
-+if ($@) { die "$@"; }
-+
-+__END__
- require 5;
- 
- #Tim Martin
-diff -urNad cyrus-imapd-2.2.13~/tools/arbitronsort.pl cyrus-imapd-2.2.13/tools/arbitronsort.pl
---- cyrus-imapd-2.2.13~/tools/arbitronsort.pl	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/arbitronsort.pl	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/local/bin/perl
- 
- #
- # This script takes the output of arbitron (run without the -o option)
-diff -urNad cyrus-imapd-2.2.13~/tools/config2header cyrus-imapd-2.2.13/tools/config2header
---- cyrus-imapd-2.2.13~/tools/config2header	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/config2header	2006-10-10 13:08:04.000000000 +0000
-@@ -1,5 +1,4 @@
--#!/usr/bin/perl -w
--#
-+#!/bin/sh
- # $Id: config2header,v 1.12 2005/04/19 18:54:32 shadow Exp $
- #
- # Copyright (c) 2001 Carnegie Mellon University.  All rights reserved.
-@@ -40,6 +39,24 @@
- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
-+
-+if ($] !~ /^5\..*/) {
-+  # uh-oh. this isn't perl 5.
-+  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
-+    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
-+  }
-+  # we failed. bail.
-+  die "Your perl is too old; I need perl 5.\n";
-+}
-+
-+# load the real script. this is isolated in an 'eval' so perl4 won't
-+# choke on the perl5-isms.
-+eval join("\n", <DATA>);
-+if ($@) { die "$@"; }
-+
-+__END__
- require 5;
- 
- use strict;
-diff -urNad cyrus-imapd-2.2.13~/tools/config2man cyrus-imapd-2.2.13/tools/config2man
---- cyrus-imapd-2.2.13~/tools/config2man	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/config2man	2006-10-10 13:08:04.000000000 +0000
-@@ -1,5 +1,4 @@
--#!/usr/bin/perl -w
--#
-+#!/bin/sh
- # $Id: config2man,v 1.3 2003/12/09 18:33:52 ken3 Exp $
- #
- # Copyright (c) 2001 Carnegie Mellon University.  All rights reserved.
-@@ -40,6 +39,24 @@
- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
-+
-+if ($] !~ /^5\..*/) {
-+  # uh-oh. this isn't perl 5.
-+  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
-+    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
-+  }
-+  # we failed. bail.
-+  die "Your perl is too old; I need perl 5.\n";
-+}
-+
-+# load the real script. this is isolated in an 'eval' so perl4 won't
-+# choke on the perl5-isms.
-+eval join("\n", <DATA>);
-+if ($@) { die "$@"; }
-+
-+__END__
- require 5;
- 
- use strict;
-diff -urNad cyrus-imapd-2.2.13~/tools/dohash cyrus-imapd-2.2.13/tools/dohash
---- cyrus-imapd-2.2.13~/tools/dohash	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/dohash	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/bin/sh
- # 
- # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
- #
-@@ -38,10 +38,27 @@
- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
- # script to upgrade from versions of imapd previous to 1.6.2
- # make sure you run it as the cyrus user
- # $Id: dohash,v 1.11 2005/12/01 22:01:12 murch Exp $
- 
-+if ($] !~ /^5\..*/) {
-+  # uh-oh. this isn't perl 5.
-+  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
-+    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
-+  }
-+  # we failed. bail.
-+  die "Your perl is too old; I need perl 5.\n";
-+}
-+
-+# load the real script. this is isolated in an 'eval' so perl4 won't
-+# choke on the perl5-isms.
-+eval join("\n", <DATA>);
-+if ($@) { die "$@"; }
-+
-+__END__
- require 5;
- 
- $| = 1;
-diff -urNad cyrus-imapd-2.2.13~/tools/masssievec cyrus-imapd-2.2.13/tools/masssievec
---- cyrus-imapd-2.2.13~/tools/masssievec	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/masssievec	2006-10-10 13:08:04.000000000 +0000
-@@ -1,6 +1,4 @@
--#!/usr/bin/perl -w
--# 
--# Script for mass compilation of sieve scripts.
-+#!/bin/sh
- # 
- # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
- #
-@@ -40,11 +38,28 @@
- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
- #
- # Script for mass compilation of sieve scripts.
- #
- # $Id: masssievec,v 1.5 2005/12/01 22:01:12 murch Exp $
- 
-+if ($] !~ /^5\..*/) {
-+  # uh-oh. this isn't perl 5.
-+  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
-+    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
-+  }
-+  # we failed. bail.
-+  die "Your perl is too old; I need perl 5.\n";
-+}
-+
-+# load the real script. this is isolated in an 'eval' so perl4 won't
-+# choke on the perl5-isms.
-+eval join("\n", <DATA>);
-+if ($@) { die "$@"; }
-+
-+__END__
- require 5;
- 
- $| = 1;
-@@ -86,6 +101,7 @@
- 	    push @configs, $1;
- 	}
- 	if (/^sieveusehomedir:\s+(1|t|yes|on)/) {
-+	    $nosievedir = 1;
- 	    print "you are storing sieve scripts in user's home directories, this script cannot deal with that\n";
- 	    exit;
- 	}
-diff -urNad cyrus-imapd-2.2.13~/tools/mkimap cyrus-imapd-2.2.13/tools/mkimap
---- cyrus-imapd-2.2.13~/tools/mkimap	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/mkimap	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/bin/sh
- # 
- # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
- #
-@@ -38,8 +38,25 @@
- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
- # $Id: mkimap,v 1.17 2005/12/01 19:12:34 murch Exp $
- 
-+if ($] !~ /^5\..*/) {
-+  # uh-oh. this isn't perl 5.
-+  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
-+    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
-+  }
-+  # we failed. bail.
-+  die "Your perl is too old; I need perl 5.\n";
-+}
-+
-+# load the real script. this is isolated in an 'eval' so perl4 won't
-+# choke on the perl5-isms.
-+eval join("\n", <DATA>);
-+if ($@) { die "$@"; }
-+
-+__END__
- require 5;
- 
- sub read_conf {
-diff -urNad cyrus-imapd-2.2.13~/tools/mknewsgroups cyrus-imapd-2.2.13/tools/mknewsgroups
---- cyrus-imapd-2.2.13~/tools/mknewsgroups	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/mknewsgroups	2006-10-10 13:08:04.000000000 +0000
-@@ -1,8 +1,5 @@
--#!/usr/bin/perl -w
-+#!/bin/sh
- # 
--# Create newsgroups on imap server
--# Based on the make_fromactive.pl script by Tim Martin
--#
- # Copyright (c) 2003 Carnegie Mellon University.  All rights reserved.
- #
- # Redistribution and use in source and binary forms, with or without
-@@ -41,6 +38,29 @@
- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
-+#
-+# Create newsgroups on imap server
-+# Based on the make_fromactive.pl script by Tim Martin
-+#
-+# $Id: mknewsgroups,v 1.2 2003/10/22 18:03:47 rjs3 Exp $
-+
-+if ($] !~ /^5\..*/) {
-+  # uh-oh. this isn't perl 5.
-+  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
-+    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
-+  }
-+  # we failed. bail.
-+  die "Your perl is too old; I need perl 5.\n";
-+}
-+
-+# load the real script. this is isolated in an 'eval' so perl4 won't
-+# choke on the perl5-isms.
-+eval join("\n", <DATA>);
-+if ($@) { die "$@"; }
-+
-+__END__
- require 5;
- 
- use Getopt::Long;
-diff -urNad cyrus-imapd-2.2.13~/tools/rehash cyrus-imapd-2.2.13/tools/rehash
---- cyrus-imapd-2.2.13~/tools/rehash	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/rehash	2006-10-10 13:08:04.000000000 +0000
-@@ -1,8 +1,4 @@
--#!/usr/bin/perl
--# script to upgrade from simple hashing scheme to full hashing scheme
--# make sure you run it as the cyrus user
--# 
--# Written by Gary Mills <mills at cc.UManitoba.CA>
-+#!/bin/sh
- # 
- # Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
- #
-@@ -42,6 +38,8 @@
- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
- # script to upgrade from simple hashing scheme to full hashing scheme
- # make sure you run it as the cyrus user
- #
-@@ -49,6 +47,21 @@
- #
- # $Id: rehash,v 1.8 2005/12/01 22:01:12 murch Exp $
- 
-+if ($] !~ /^5\..*/) {
-+  # uh-oh. this isn't perl 5.
-+  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
-+    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
-+  }
-+  # we failed. bail.
-+  die "Your perl is too old; I need perl 5.\n";
-+}
-+
-+# load the real script. this is isolated in an 'eval' so perl4 won't
-+# choke on the perl5-isms.
-+eval join("\n", <DATA>);
-+if ($@) { die "$@"; }
-+
-+__END__
- require 5;
- 
- $| = 1;
-@@ -170,7 +183,7 @@
- $imapdconf = shift || "/etc/imapd.conf";
- 
- $yn = "y";
--$sievedir = "/var/spool/sieve";
-+$sievedir = "/usr/sieve";
- $nosievedir = 0;
- $hashispool = 0;
- $virtdomains = 0;
-@@ -181,7 +194,7 @@
-     read_conf($conf);
- }
- 
--if (! $confdir) { $confdir = "/var/lib/cyrus"; }
-+if (! $confdir) { $confdir = "/var/imap"; }
- 
- if ($interactive) {
-     print "upgrade $confdir? ";
-@@ -555,7 +568,6 @@
- 	      or die "couldn't rename .$i/$s/$t to $s/$t";
- 	  }
- 	  closedir MV;
--	  rmdir ".$i/$s" or die "could not remove .$i/$s"
- 	}
- 	closedir SUB;
- 	rmdir ".$i" or die "could not remove .$i";
-diff -urNad cyrus-imapd-2.2.13~/tools/translatesieve cyrus-imapd-2.2.13/tools/translatesieve
---- cyrus-imapd-2.2.13~/tools/translatesieve	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/translatesieve	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,6 @@
--#!/usr/bin/perl
-+#!/bin/sh
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
- # script to translate sieve scripts to use unixhierarchysep and/or altnamespace
- # make sure you run it as the cyrus user
- #!/usr/bin/perl
-@@ -43,6 +45,21 @@
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
- 
-+if ($] !~ /^5\..*/) {
-+  # uh-oh. this isn't perl 5.
-+  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
-+    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
-+  }
-+  # we failed. bail.
-+  die "Your perl is too old; I need perl 5.\n";
-+}
-+
-+# load the real script. this is isolated in an 'eval' so perl4 won't
-+# choke on the perl5-isms.
-+eval join("\n", <DATA>);
-+if ($@) { die "$@"; }
-+
-+__END__
- require 5;
- 
- $| = 1;
-diff -urNad cyrus-imapd-2.2.13~/tools/undohash cyrus-imapd-2.2.13/tools/undohash
---- cyrus-imapd-2.2.13~/tools/undohash	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/undohash	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/perl
- # script to downgrade from cyrus imapd 1.6.2+ to earlier.
- # do NOT run this script while imapd's are running
- # $Id: undohash,v 1.8 2005/12/01 22:01:13 murch Exp $
-diff -urNad cyrus-imapd-2.2.13~/tools/upgradesieve cyrus-imapd-2.2.13/tools/upgradesieve
---- cyrus-imapd-2.2.13~/tools/upgradesieve	2006-10-10 13:08:03.000000000 +0000
-+++ cyrus-imapd-2.2.13/tools/upgradesieve	2006-10-10 13:08:04.000000000 +0000
-@@ -1,4 +1,6 @@
--#!/usr/bin/perl -w
-+#!/bin/sh
-+exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-+#!perl -w
- # script to upgrade sievedir from imapd 1.6.13
- # make sure you run it as the cyrus user
- #!/usr/bin/perl
-@@ -43,6 +45,21 @@
- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #
- 
-+if ($] !~ /^5\..*/) {
-+  # uh-oh. this isn't perl 5.
-+  foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
-+    exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
-+  }
-+  # we failed. bail.
-+  die "Your perl is too old; I need perl 5.\n";
-+}
-+
-+# load the real script. this is isolated in an 'eval' so perl4 won't
-+# choke on the perl5-isms.
-+eval join("\n", <DATA>);
-+if ($@) { die "$@"; }
-+
-+__END__
- require 5;
- 
- $| = 1;




More information about the Pkg-Cyrus-imapd-Debian-devel mailing list