Patch `configure' by hand for a much smaller patch.

Bogusness pointed out by:	asami

1 files changed, 6 insertions, 2014 deletions

diff --git a/mail/cyrus-imapd22/files/patch-bg b/mail/cyrus-imapd22/files/patch-bg
index b350a623e754..964814930475 100644
--- a/mail/cyrus-imapd22/files/patch-bg
+++ b/mail/cyrus-imapd22/files/patch-bg
@@ -1,2020 +1,12 @@
 --- configure.orig	Fri Dec  4 12:03:58 1998
-+++ configure	Sun Apr  9 12:16:26 2000
-@@ -1,7 +1,7 @@
- #! /bin/sh
++++ configure	Sat Apr 15 11:44:42 2000
+@@ -3348,6 +3348,9 @@
  
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.12 
-+# Generated automatically using autoconf version 2.13 
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -108,6 +108,7 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
- 
-@@ -391,7 +392,7 @@
-     verbose=yes ;;
- 
-   -version | --version | --versio | --versi | --vers)
--    echo "configure generated by autoconf version 2.12"
-+    echo "configure generated by autoconf version 2.13"
-     exit 0 ;;
- 
-   -with-* | --with-*)
-@@ -561,9 +562,11 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
-+ac_exeext=
-+ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -581,15 +584,16 @@
- # Extract the first word of "makedepend", so it can be a program name with args.
- set dummy makedepend; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:585: checking for $ac_word" >&5
-+echo "configure:588: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_MAKEDEPEND'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$MAKEDEPEND"; then
-   ac_cv_prog_MAKEDEPEND="$MAKEDEPEND" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_prog_MAKEDEPEND="makedepend"
-@@ -657,15 +661,16 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:661: checking for $ac_word" >&5
-+echo "configure:665: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_prog_CC="gcc"
-@@ -686,16 +691,17 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:690: checking for $ac_word" >&5
-+echo "configure:695: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-   ac_prog_rejected=no
--  for ac_dir in $PATH; do
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-@@ -730,25 +736,61 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+  if test -z "$CC"; then
-+    case "`uname -s`" in
-+    *win32* | *WIN32*)
-+      # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:746: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$CC"; then
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CC="cl"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+  echo "$ac_t""$CC" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+    esac
-+  fi
-   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:738: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:778: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
--cat > conftest.$ac_ext <<EOF
--#line 748 "configure"
-+cat > conftest.$ac_ext << EOF
-+
-+#line 789 "configure"
- #include "confdefs.h"
-+
- main(){return(0);}
- EOF
--if { (eval echo configure:752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -762,18 +804,24 @@
-   ac_cv_prog_cc_works=no
- fi
- rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
- 
- echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
- if test $ac_cv_prog_cc_works = no; then
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:820: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:777: checking whether we are using GNU C" >&5
-+echo "configure:825: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -782,7 +830,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -793,11 +841,15 @@
- 
- if test $ac_cv_prog_gcc = yes; then
-   GCC=yes
--  ac_test_CFLAGS="${CFLAGS+set}"
--  ac_save_CFLAGS="$CFLAGS"
--  CFLAGS=
--  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:801: checking whether ${CC-cc} accepts -g" >&5
-+else
-+  GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:853: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -812,30 +864,35 @@
- fi
- 
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
--  if test "$ac_test_CFLAGS" = set; then
--    CFLAGS="$ac_save_CFLAGS"
--  elif test $ac_cv_prog_cc_g = yes; then
-+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="-O2"
-+    CFLAGS="-g"
-   fi
- else
--  GCC=
--  test "${CFLAGS+set}" = set || CFLAGS="-g"
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
- fi
- 
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:831: checking for $ac_word" >&5
-+echo "configure:887: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$RANLIB"; then
-   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_prog_RANLIB="ranlib"
-@@ -854,7 +911,7 @@
- fi
- 
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:858: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:915: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -906,28 +963,30 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# 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"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:914: checking for a BSD compatible install" >&5
-+echo "configure:972: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
--    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-   for ac_dir in $PATH; do
-     # Account for people who put trailing slashes in PATH elements.
-     case "$ac_dir/" in
-     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-     *)
-       # OSF1 and SCO ODT 3.0 have their own names for install.
--      for ac_prog in ginstall installbsd scoinst install; do
-+      # Don't use installbsd from OSF since it installs stuff as root
-+      # by default.
-+      for ac_prog in ginstall scoinst install; do
-         if test -f $ac_dir/$ac_prog; then
- 	  if test $ac_prog = install &&
-             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
--	    # OSF/1 installbsd also uses dspmsg, but is usable.
- 	    :
- 	  else
- 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -957,10 +1016,12 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- 
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:964: checking how to run the C preprocessor" >&5
-+echo "configure:1025: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -975,14 +1036,14 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 979 "configure"
-+#line 1040 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
- else
-@@ -992,14 +1053,31 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 996 "configure"
-+#line 1057 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -nologo -E"
-+  cat > conftest.$ac_ext <<EOF
-+#line 1074 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
- else
-@@ -1012,6 +1090,8 @@
- rm -f conftest*
- fi
- rm -f conftest*
-+fi
-+rm -f conftest*
-   ac_cv_prog_CPP="$CPP"
- fi
-   CPP="$ac_cv_prog_CPP"
-@@ -1021,9 +1101,9 @@
- echo "$ac_t""$CPP" 1>&6
- 
- echo $ac_n "checking for AIX""... $ac_c" 1>&6
--echo "configure:1025: checking for AIX" >&5
-+echo "configure:1105: checking for AIX" >&5
- cat > conftest.$ac_ext <<EOF
--#line 1027 "configure"
-+#line 1107 "configure"
- #include "confdefs.h"
- #ifdef _AIX
-   yes
-@@ -1045,7 +1125,7 @@
- 
- 
- echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
--echo "configure:1049: checking for POSIXized ISC" >&5
-+echo "configure:1129: checking for POSIXized ISC" >&5
- if test -d /etc/conf/kconfig.d &&
-   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
-@@ -1070,15 +1150,16 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1074: checking for $ac_word" >&5
-+echo "configure:1154: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$AWK"; then
-   ac_cv_prog_AWK="$AWK" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_prog_AWK="$ac_prog"
-@@ -1099,12 +1180,12 @@
- done
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:1103: checking for working const" >&5
-+echo "configure:1184: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1108 "configure"
-+#line 1189 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -1153,7 +1234,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -1174,7 +1255,7 @@
- fi
- 
- echo $ac_n "checking for long file names""... $ac_c" 1>&6
--echo "configure:1178: checking for long file names" >&5
-+echo "configure:1259: checking for long file names" >&5
- if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1223,7 +1304,7 @@
- 
- 
-   echo $ac_n "checking for runpath switch""... $ac_c" 1>&6
--echo "configure:1227: checking for runpath switch" >&5
-+echo "configure:1308: checking for runpath switch" >&5
- if eval "test \"`echo '$''{'andrew_runpath_switch'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1232,14 +1313,14 @@
-     SAVE_LDFLAGS="${LDFLAGS}"
-     LDFLAGS="-R /usr/lib"
-     cat > conftest.$ac_ext <<EOF
--#line 1236 "configure"
-+#line 1317 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   andrew_runpath_switch="-R"
- else
-@@ -1249,14 +1330,14 @@
-   
-   	LDFLAGS="-Wl,-rpath,/usr/lib"
-     cat > conftest.$ac_ext <<EOF
--#line 1253 "configure"
-+#line 1334 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   andrew_runpath_switch="-Wl,-rpath,"
- else
-@@ -1288,18 +1369,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1292: checking for $ac_hdr" >&5
-+echo "configure:1373: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1297 "configure"
-+#line 1378 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=yes"
-@@ -1327,12 +1408,12 @@
- for ac_func in memmove strcasecmp ftruncate strerror
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1331: checking for $ac_func" >&5
-+echo "configure:1412: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1336 "configure"
-+#line 1417 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1355,7 +1436,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1376,7 +1457,7 @@
-  
- else
-   echo "$ac_t""no" 1>&6
--LIBOBJS="$LIBOBJS ${ac_func}.o"
-+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
- fi
- done
- 
-@@ -1386,12 +1467,12 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
--echo "configure:1390: checking for $ac_hdr that defines DIR" >&5
-+echo "configure:1471: checking for $ac_hdr that defines DIR" >&5
- if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1395 "configure"
-+#line 1476 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -1399,7 +1480,7 @@
- DIR *dirp = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:1403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "ac_cv_header_dirent_$ac_safe=yes"
- else
-@@ -1424,7 +1505,7 @@
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
- echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
--echo "configure:1428: checking for opendir in -ldir" >&5
-+echo "configure:1509: checking for opendir in -ldir" >&5
- ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1432,7 +1513,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldir  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1436 "configure"
-+#line 1517 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1443,7 +1524,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:1447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1465,7 +1546,7 @@
- 
- else
- echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:1469: checking for opendir in -lx" >&5
-+echo "configure:1550: checking for opendir in -lx" >&5
- ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1473,7 +1554,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lx  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1477 "configure"
-+#line 1558 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1484,7 +1565,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:1488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1513,12 +1594,12 @@
- 
- 
- echo $ac_n "checking for vprintf""... $ac_c" 1>&6
--echo "configure:1517: checking for vprintf" >&5
-+echo "configure:1598: checking for vprintf" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1522 "configure"
-+#line 1603 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char vprintf(); below.  */
-@@ -1541,7 +1622,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_vprintf=yes"
- else
-@@ -1565,12 +1646,12 @@
- 
- if test "$ac_cv_func_vprintf" != yes; then
- echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
--echo "configure:1569: checking for _doprnt" >&5
-+echo "configure:1650: checking for _doprnt" >&5
- if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1574 "configure"
-+#line 1655 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char _doprnt(); below.  */
-@@ -1593,7 +1674,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func__doprnt=yes"
- else
-@@ -1619,12 +1700,12 @@
- 
- 
- echo $ac_n "checking for strerror""... $ac_c" 1>&6
--echo "configure:1623: checking for strerror" >&5
-+echo "configure:1704: checking for strerror" >&5
- if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1628 "configure"
-+#line 1709 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char strerror(); below.  */
-@@ -1647,7 +1728,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_strerror=yes"
- else
-@@ -1676,12 +1757,12 @@
- 
- spt_type=""
- echo $ac_n "checking for setproctitle""... $ac_c" 1>&6
--echo "configure:1680: checking for setproctitle" >&5
-+echo "configure:1761: checking for setproctitle" >&5
- if eval "test \"`echo '$''{'ac_cv_func_setproctitle'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1685 "configure"
-+#line 1766 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char setproctitle(); below.  */
-@@ -1704,7 +1785,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_setproctitle=yes"
- else
-@@ -1725,7 +1806,7 @@
- 
- if test "$spt_type" = ""; then
- 		echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6
--echo "configure:1729: checking for setproctitle in -lutil" >&5
-+echo "configure:1810: checking for setproctitle in -lutil" >&5
- ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1733,7 +1814,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lutil  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1737 "configure"
-+#line 1818 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -1744,7 +1825,7 @@
- setproctitle()
- ; return 0; }
- EOF
--if { (eval echo configure:1748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1769,18 +1850,18 @@
- if test "$spt_type" = ""; then
- 	ac_safe=`echo "sys/pstat.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for sys/pstat.h""... $ac_c" 1>&6
--echo "configure:1773: checking for sys/pstat.h" >&5
-+echo "configure:1854: checking for sys/pstat.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1778 "configure"
-+#line 1859 "configure"
- #include "confdefs.h"
- #include <sys/pstat.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=yes"
-@@ -1804,18 +1885,18 @@
- if test "$spt_type" = ""; then
- 	ac_safe=`echo "sys/sysnews.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for sys/sysnews.h""... $ac_c" 1>&6
--echo "configure:1808: checking for sys/sysnews.h" >&5
-+echo "configure:1889: checking for sys/sysnews.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1813 "configure"
-+#line 1894 "configure"
- #include "confdefs.h"
- #include <sys/sysnews.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=yes"
-@@ -1838,12 +1919,12 @@
- fi
- if test "$spt_type" = ""; then
- 	echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6
--echo "configure:1842: checking for PS_STRINGS" >&5
-+echo "configure:1923: checking for PS_STRINGS" >&5
- 	if eval "test \"`echo '$''{'cyrus_cv_sys_psstrings'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1847 "configure"
-+#line 1928 "configure"
- #include "confdefs.h"
- 
- #include <machine/vmparam.h>
-@@ -1853,8 +1934,8 @@
- #endif
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   cyrus_cv_sys_psstrings=yes
-@@ -1875,12 +1956,12 @@
  fi
- if test "$spt_type" = ""; then
- 	echo $ac_n "checking for SCO""... $ac_c" 1>&6
--echo "configure:1879: checking for SCO" >&5
-+echo "configure:1960: checking for SCO" >&5
- 	if eval "test \"`echo '$''{'cyrus_cv_sys_sco'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1884 "configure"
-+#line 1965 "configure"
- #include "confdefs.h"
  
- #ifndef _SCO_unix_
-@@ -1888,8 +1969,8 @@
- #endif
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   cyrus_cv_sys_sco=yes
-@@ -1910,12 +1991,12 @@
- fi
- if test "$spt_type" = ""; then
- 	echo $ac_n "checking for setproctitle usability""... $ac_c" 1>&6
--echo "configure:1914: checking for setproctitle usability" >&5
-+echo "configure:1995: checking for setproctitle usability" >&5
- 	if eval "test \"`echo '$''{'cyrus_cv_sys_setproctitle'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1919 "configure"
-+#line 2000 "configure"
- #include "confdefs.h"
- 
- #if defined(DGUX) || defined(_SEQUENT_) || defined(apollo)
-@@ -1923,8 +2004,8 @@
- #endif
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:2008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   cyrus_cv_sys_setproctitle=yes
-@@ -1951,12 +2032,12 @@
- fi
- 
- echo $ac_n "checking nonblocking method""... $ac_c" 1>&6
--echo "configure:1955: checking nonblocking method" >&5
-+echo "configure:2036: checking nonblocking method" >&5
- if eval "test \"`echo '$''{'cyrus_cv_sys_nonblock'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1960 "configure"
-+#line 2041 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/file.h>
-@@ -1968,7 +2049,7 @@
- fcntl(0, F_GETFL, 0)&FNDELAY
- ; return 0; }
- EOF
--if { (eval echo configure:1972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cyrus_cv_sys_nonblock=fcntl
- else
-@@ -1985,12 +2066,12 @@
- echo "$ac_t""$WITH_NONBLOCK" 1>&6
- 
- echo $ac_n "checking timezone GMT offset method""... $ac_c" 1>&6
--echo "configure:1989: checking timezone GMT offset method" >&5
-+echo "configure:2070: checking timezone GMT offset method" >&5
- if eval "test \"`echo '$''{'cyrus_cv_struct_sys_gmtoff'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1994 "configure"
-+#line 2075 "configure"
- #include "confdefs.h"
- 
- #include <time.h>
-@@ -2000,7 +2081,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cyrus_cv_struct_sys_gmtoff=tm
- else
-@@ -2016,7 +2097,7 @@
- 
- echo "$ac_t""$WITH_GMTOFF" 1>&6
- echo $ac_n "checking for shared mmap""... $ac_c" 1>&6
--echo "configure:2020: checking for shared mmap" >&5
-+echo "configure:2101: checking for shared mmap" >&5
- if eval "test \"`echo '$''{'cyrus_cv_func_mmap_shared'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2024,7 +2105,7 @@
-   cyrus_cv_func_mmap_shared=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2028 "configure"
-+#line 2109 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -2052,7 +2133,7 @@
- exit(0);}
- 
- EOF
--if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   cyrus_cv_func_mmap_shared=yes
- else
-@@ -2071,7 +2152,7 @@
- 	WITH_MAP="shared"
- else
- echo $ac_n "checking for stupid shared mmap""... $ac_c" 1>&6
--echo "configure:2075: checking for stupid shared mmap" >&5
-+echo "configure:2156: checking for stupid shared mmap" >&5
- if eval "test \"`echo '$''{'cyrus_cv_func_mmap_stupidshared'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2079,7 +2160,7 @@
-   cyrus_cv_func_mmap_stupidshared=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2083 "configure"
-+#line 2164 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -2108,7 +2189,7 @@
- exit(0);}
- 
- EOF
--if { (eval echo configure:2112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   cyrus_cv_func_mmap_stupidshared=yes
- else
-@@ -2127,7 +2208,7 @@
- 	WITH_MAP="stupidshared"
- else
- 	echo $ac_n "checking for non-shared mmap""... $ac_c" 1>&6
--echo "configure:2131: checking for non-shared mmap" >&5
-+echo "configure:2212: checking for non-shared mmap" >&5
- 	if eval "test \"`echo '$''{'cyrus_cv_func_mmap_private'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2135,7 +2216,7 @@
-   cyrus_cv_func_mmap_private=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2139 "configure"
-+#line 2220 "configure"
- #include "confdefs.h"
- 
- /* Verify the OS supports the memory mapping semantics needed by map_private
-@@ -2236,7 +2317,7 @@
- }
- 
- EOF
--if { (eval echo configure:2240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   cyrus_cv_func_mmap_private=yes
- else
-@@ -2271,12 +2352,12 @@
-   WITH_LOCK="$withval"
- else
-   echo $ac_n "checking for flock""... $ac_c" 1>&6
--echo "configure:2275: checking for flock" >&5
-+echo "configure:2356: checking for flock" >&5
- if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2280 "configure"
-+#line 2361 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char flock(); below.  */
-@@ -2299,7 +2380,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_flock=yes"
- else
-@@ -2329,12 +2410,12 @@
- else
-   
-   echo $ac_n "checking for sigvec""... $ac_c" 1>&6
--echo "configure:2333: checking for sigvec" >&5
-+echo "configure:2414: checking for sigvec" >&5
- if eval "test \"`echo '$''{'ac_cv_func_sigvec'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2338 "configure"
-+#line 2419 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char sigvec(); below.  */
-@@ -2357,7 +2438,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_sigvec=yes"
- else
-@@ -2378,7 +2459,7 @@
-   echo "$ac_t""no" 1>&6
- 
-     echo $ac_n "checking for sigvec in -lBSD""... $ac_c" 1>&6
--echo "configure:2382: checking for sigvec in -lBSD" >&5
-+echo "configure:2463: checking for sigvec in -lBSD" >&5
- ac_lib_var=`echo BSD'_'sigvec | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2386,7 +2467,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lBSD  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2390 "configure"
-+#line 2471 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2397,7 +2478,7 @@
- sigvec()
- ; return 0; }
- EOF
--if { (eval echo configure:2401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2419,7 +2500,7 @@
-         SAVE_LDFLAGS="$LDFLAGS"
-         LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
-     echo $ac_n "checking for sigvec in -lucb""... $ac_c" 1>&6
--echo "configure:2423: checking for sigvec in -lucb" >&5
-+echo "configure:2504: checking for sigvec in -lucb" >&5
- ac_lib_var=`echo ucb'_'sigvec | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2427,7 +2508,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lucb  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2431 "configure"
-+#line 2512 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2438,7 +2519,7 @@
- sigvec()
- ; return 0; }
- EOF
--if { (eval echo configure:2442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2482,7 +2563,7 @@
- 
- 
- echo $ac_n "checking for Kerberos""... $ac_c" 1>&6
--echo "configure:2486: checking for Kerberos" >&5
-+echo "configure:2567: checking for Kerberos" >&5
- if eval "test \"`echo '$''{'cyrus_cv_lib_kerberos'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2517,12 +2598,12 @@
- case "$WITH_LOGIN" in
-   unix|unix_*)
-     echo $ac_n "checking for crypt""... $ac_c" 1>&6
--echo "configure:2521: checking for crypt" >&5
-+echo "configure:2602: checking for crypt" >&5
- if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2526 "configure"
-+#line 2607 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char crypt(); below.  */
-@@ -2545,7 +2626,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_crypt=yes"
- else
-@@ -2563,7 +2644,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
--echo "configure:2567: checking for crypt in -lcrypt" >&5
-+echo "configure:2648: checking for crypt in -lcrypt" >&5
- ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2571,7 +2652,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcrypt  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2575 "configure"
-+#line 2656 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2582,7 +2663,7 @@
- crypt()
- ; return 0; }
- EOF
--if { (eval echo configure:2586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2615,7 +2696,7 @@
-   krb|krb_*)
-     login_progs=krbck
-     echo $ac_n "checking if Kerberos looks sane""... $ac_c" 1>&6
--echo "configure:2619: checking if Kerberos looks sane" >&5
-+echo "configure:2700: checking if Kerberos looks sane" >&5
-       if test \! -d /etc/kerberosIV -a -f /etc/srvtab \
-        -o -d /etc/kerberosIV -a -f /etc/kerberosIV/srvtab ; then
- 	echo "$ac_t""yes" 1>&6
-@@ -2647,12 +2728,12 @@
-   WITH_PWCHECK="$withval"
- else
-   echo $ac_n "checking for getspnam""... $ac_c" 1>&6
--echo "configure:2651: checking for getspnam" >&5
-+echo "configure:2732: checking for getspnam" >&5
- if eval "test \"`echo '$''{'ac_cv_func_getspnam'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2656 "configure"
-+#line 2737 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char getspnam(); below.  */
-@@ -2675,7 +2756,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_getspnam=yes"
- else
-@@ -2749,16 +2830,16 @@
- 		SAVE_LIBS="$LIBS"
- 		LIBS="$AFS_LIBS"
- 		echo $ac_n "checking if AFS libraries have pr_End""... $ac_c" 1>&6
--echo "configure:2753: checking if AFS libraries have pr_End" >&5
-+echo "configure:2834: checking if AFS libraries have pr_End" >&5
- 		cat > conftest.$ac_ext <<EOF
--#line 2755 "configure"
-+#line 2836 "configure"
- #include "confdefs.h"
- pr_End();
- int main() {
- pr_End()
- ; return 0; }
- EOF
--if { (eval echo configure:2762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   
- 								echo "$ac_t""yes" 1>&6
-@@ -2791,16 +2872,16 @@
- 		SAVE_LIBS="$LIBS"
- 		LIBS="${with_afs}/lib/liblwp.a"
- 		echo $ac_n "checking if AFS libraries need sigvec""... $ac_c" 1>&6
--echo "configure:2795: checking if AFS libraries need sigvec" >&5
-+echo "configure:2876: checking if AFS libraries need sigvec" >&5
- 						cat > conftest.$ac_ext <<EOF
--#line 2797 "configure"
-+#line 2878 "configure"
- #include "confdefs.h"
- IOMGR_Initialize();
- int main() {
- IOMGR_Initialize()
- ; return 0; }
- EOF
--if { (eval echo configure:2804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   
- 								echo "$ac_t""no" 1>&6
-@@ -2893,7 +2974,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2897: checking for $ac_word" >&5
-+echo "configure:2978: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2901,9 +2982,13 @@
-   /*)
-   ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
-   ;;
-+  ?:/*)			 
-+  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a dos path.
-+  ;;
-   *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do 
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_TCLSH="$ac_dir/$ac_word"
-@@ -2930,7 +3015,7 @@
-     # Do we know where to get a tclsh?
-     if test "${TCLSH}" != "unknown"; then
-       echo $ac_n "checking where Tcl says it lives""... $ac_c" 1>&6
--echo "configure:2934: checking where Tcl says it lives" >&5
-+echo "configure:3019: checking where Tcl says it lives" >&5
-       TclLibBase=`echo puts \\\$tcl_library | ${TCLSH} | sed -e 's,^/*$,,'`
-       echo "$ac_t""$TclLibBase" 1>&6
-     fi
-@@ -2950,7 +3035,7 @@
- 
-   else
-     echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
--echo "configure:2954: checking for tclConfig.sh" >&5
-+echo "configure:3039: checking for tclConfig.sh" >&5
-     # Check a list of places where the tclConfig.sh file might be.
-     for tcldir in "${TclLibBase}" \
-                   "${TclLibBase}/.." \
-@@ -2972,12 +3057,12 @@
-     fi
- 
-     echo $ac_n "checking with Tcl on how it says it should be compiled""... $ac_c" 1>&6
--echo "configure:2976: checking with Tcl on how it says it should be compiled" >&5
-+echo "configure:3061: checking with Tcl on how it says it should be compiled" >&5
-     . ${TclLibBase}/tclConfig.sh
-     echo "$ac_t""ok" 1>&6
-         
-                     echo $ac_n "checking where Tcl includes are""... $ac_c" 1>&6
--echo "configure:2981: checking where Tcl includes are" >&5
-+echo "configure:3066: checking where Tcl includes are" >&5
-     for tclinclude in "${TCL_PREFIX}/include/tcl${TCL_VERSION}" \
-                       "${TCL_PREFIX}/include/tcl" \
-                       "${TCL_PREFIX}/include" ; do
-@@ -2995,12 +3080,12 @@
- 
- 
- echo $ac_n "checking for dbopen""... $ac_c" 1>&6
--echo "configure:2999: checking for dbopen" >&5
-+echo "configure:3084: checking for dbopen" >&5
- if eval "test \"`echo '$''{'ac_cv_func_dbopen'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3004 "configure"
-+#line 3089 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dbopen(); below.  */
-@@ -3023,7 +3108,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_dbopen=yes"
- else
-@@ -3045,7 +3130,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
--echo "configure:3049: checking for dbopen in -ldb" >&5
-+echo "configure:3134: checking for dbopen in -ldb" >&5
- ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3053,7 +3138,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldb  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3057 "configure"
-+#line 3142 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3064,7 +3149,7 @@
- dbopen()
- ; return 0; }
- EOF
--if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3094,7 +3179,7 @@
- 
- if test -z "use_db"; then
-   echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
--echo "configure:3098: checking for dbm_open in -lndbm" >&5
-+echo "configure:3183: checking for dbm_open in -lndbm" >&5
- ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3102,7 +3187,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lndbm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3106 "configure"
-+#line 3191 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3113,7 +3198,7 @@
- dbm_open()
- ; return 0; }
- EOF
--if { (eval echo configure:3117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3141,7 +3226,7 @@
- fi
- 
-   echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
--echo "configure:3145: checking for dbm_open in -ldbm" >&5
-+echo "configure:3230: checking for dbm_open in -ldbm" >&5
- ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3149,7 +3234,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldbm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3153 "configure"
-+#line 3238 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3160,7 +3245,7 @@
- dbm_open()
- ; return 0; }
- EOF
--if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3197,7 +3282,7 @@
- 
- if test -z "${with_krb}" -o "${with_krb}" = yes; then
-   echo $ac_n "checking for location of Kerberos install""... $ac_c" 1>&6
--echo "configure:3201: checking for location of Kerberos install" >&5
-+echo "configure:3286: checking for location of Kerberos install" >&5
- if eval "test \"`echo '$''{'cyrus_krblocation'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3254,12 +3339,12 @@
- 
- 
-         echo $ac_n "checking for res_search""... $ac_c" 1>&6
--echo "configure:3258: checking for res_search" >&5
-+echo "configure:3343: checking for res_search" >&5
- if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3263 "configure"
-+#line 3348 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char res_search(); below.  */
-@@ -3282,7 +3367,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_res_search=yes"
- else
-@@ -3300,7 +3385,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
--echo "configure:3304: checking for res_search in -lresolv" >&5
-+echo "configure:3389: checking for res_search in -lresolv" >&5
- ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3308,7 +3393,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lresolv  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3312 "configure"
-+#line 3397 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3319,7 +3404,7 @@
- res_search()
- ; return 0; }
- EOF
--if { (eval echo configure:3323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3348,14 +3433,61 @@
- 
- fi
- 
-+        echo $ac_n "checking for init_error_table in -lcom_err""... $ac_c" 1>&6
-+echo "configure:3438: checking for init_error_table in -lcom_err" >&5
-+ac_lib_var=`echo com_err'_'init_error_table | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lcom_err  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 3446 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char init_error_table();
-+
-+int main() {
-+init_error_table()
-+; return 0; }
-+EOF
-+if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_lib=HAVE_LIB`echo com_err | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_lib 1
-+EOF
-+
-+  LIBS="-lcom_err $LIBS"
-+
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
++# Kerberos IV on FreeBSD depends on libcom_err.
++LIBS="-lcom_err $LIBS" 
++echo '#define HAVE_LIBCOM_ERR 1' >> confdefs.h
  
          echo $ac_n "checking for crypt""... $ac_c" 1>&6
--echo "configure:3354: checking for crypt" >&5
-+echo "configure:3486: checking for crypt" >&5
- if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3359 "configure"
-+#line 3491 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char crypt(); below.  */
-@@ -3378,7 +3510,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_crypt=yes"
- else
-@@ -3396,7 +3528,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
--echo "configure:3400: checking for crypt in -lcrypt" >&5
-+echo "configure:3532: checking for crypt in -lcrypt" >&5
- ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3404,7 +3536,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcrypt  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3408 "configure"
-+#line 3540 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3415,7 +3547,7 @@
- crypt()
- ; return 0; }
- EOF
--if { (eval echo configure:3419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3446,7 +3578,7 @@
- 
- 
-     echo $ac_n "checking for des_ecb_encrypt in -ldes""... $ac_c" 1>&6
--echo "configure:3450: checking for des_ecb_encrypt in -ldes" >&5
-+echo "configure:3582: checking for des_ecb_encrypt in -ldes" >&5
- ac_lib_var=`echo des'_'des_ecb_encrypt | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3454,7 +3586,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldes  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3458 "configure"
-+#line 3590 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3465,7 +3597,7 @@
- des_ecb_encrypt()
- ; return 0; }
- EOF
--if { (eval echo configure:3469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3488,7 +3620,7 @@
- 
-       
-             echo $ac_n "checking for krb_realmofhost in -lkrb4""... $ac_c" 1>&6
--echo "configure:3492: checking for krb_realmofhost in -lkrb4" >&5
-+echo "configure:3624: checking for krb_realmofhost in -lkrb4" >&5
- ac_lib_var=`echo krb4'_'krb_realmofhost | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3496,7 +3628,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lkrb4  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3500 "configure"
-+#line 3632 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3507,7 +3639,7 @@
- krb_realmofhost()
- ; return 0; }
- EOF
--if { (eval echo configure:3511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3533,7 +3665,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for krb_realmofhost in -lkrb""... $ac_c" 1>&6
--echo "configure:3537: checking for krb_realmofhost in -lkrb" >&5
-+echo "configure:3669: checking for krb_realmofhost in -lkrb" >&5
- ac_lib_var=`echo krb'_'krb_realmofhost | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3541,7 +3673,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lkrb  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3545 "configure"
-+#line 3677 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3552,7 +3684,7 @@
- krb_realmofhost()
- ; return 0; }
- EOF
--if { (eval echo configure:3556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3584,7 +3716,7 @@
- 
- 
-     echo $ac_n "checking for Kerberos includes""... $ac_c" 1>&6
--echo "configure:3588: checking for Kerberos includes" >&5
-+echo "configure:3720: checking for Kerberos includes" >&5
- if eval "test \"`echo '$''{'cyrus_krbinclude'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3609,12 +3741,12 @@
-     CPPFLAGS="${CPPFLAGS} -I${cyrus_krbinclude}"
- 
-     echo $ac_n "checking for basename""... $ac_c" 1>&6
--echo "configure:3613: checking for basename" >&5
-+echo "configure:3745: checking for basename" >&5
- if eval "test \"`echo '$''{'ac_cv_func_basename'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3618 "configure"
-+#line 3750 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char basename(); below.  */
-@@ -3637,7 +3769,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_basename=yes"
- else
-@@ -3655,7 +3787,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for basename in -liberty""... $ac_c" 1>&6
--echo "configure:3659: checking for basename in -liberty" >&5
-+echo "configure:3791: checking for basename in -liberty" >&5
- ac_lib_var=`echo iberty'_'basename | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3663,7 +3795,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-liberty  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3667 "configure"
-+#line 3799 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3674,7 +3806,7 @@
- basename()
- ; return 0; }
- EOF
--if { (eval echo configure:3678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3730,7 +3862,7 @@
- case "$with_zephyr" in
- 	no) true;;
- 	""|yes) echo $ac_n "checking for ZInitialize in -lzephyr""... $ac_c" 1>&6
--echo "configure:3734: checking for ZInitialize in -lzephyr" >&5
-+echo "configure:3866: checking for ZInitialize in -lzephyr" >&5
- ac_lib_var=`echo zephyr'_'ZInitialize | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3738,7 +3870,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lzephyr  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3742 "configure"
-+#line 3874 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3749,7 +3881,7 @@
- ZInitialize()
- ; return 0; }
- EOF
--if { (eval echo configure:3753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3801,7 +3933,7 @@
- if test -z "$with_com_err"; then
- 	# no value supplied
- 	echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6
--echo "configure:3805: checking for com_err in -lcom_err" >&5
-+echo "configure:3937: checking for com_err in -lcom_err" >&5
- ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3809,7 +3941,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcom_err  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3813 "configure"
-+#line 3945 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3820,7 +3952,7 @@
- com_err()
- ; return 0; }
- EOF
--if { (eval echo configure:3824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3843,7 +3975,7 @@
- 		# Extract the first word of "compile_et", so it can be a program name with args.
- set dummy compile_et; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3847: checking for $ac_word" >&5
-+echo "configure:3979: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_COMPILE_ET'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3851,9 +3983,13 @@
-   /*)
-   ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
-   ;;
-+  ?:/*)			 
-+  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a dos path.
-+  ;;
-   *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do 
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_COMPILE_ET="$ac_dir/$ac_word"
-@@ -3881,7 +4017,7 @@
- 		# 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3885: checking for $ac_word" >&5
-+echo "configure:4021: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_COMPILE_ET'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3889,9 +4025,13 @@
-   /*)
-   ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a path.
-   ;;
-+  ?:/*)			 
-+  ac_cv_path_COMPILE_ET="$COMPILE_ET" # Let the user override the test with a dos path.
-+  ;;
-   *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do 
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_COMPILE_ET="$ac_dir/$ac_word"
-@@ -3995,12 +4135,12 @@
- 		
- 
- echo $ac_n "checking for modern syslog""... $ac_c" 1>&6
--echo "configure:3999: checking for modern syslog" >&5
-+echo "configure:4139: checking for modern syslog" >&5
- if eval "test \"`echo '$''{'cyrus_cv_lib_syslog'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4004 "configure"
-+#line 4144 "configure"
- #include "confdefs.h"
- #include <syslog.h>
- #ifndef LOG_LOCAL6
-@@ -4008,8 +4148,8 @@
- #endif
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:4152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   cyrus_cv_lib_syslog=yes
-@@ -4045,12 +4185,12 @@
- for ac_func in getdtablesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4049: checking for $ac_func" >&5
-+echo "configure:4189: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4054 "configure"
-+#line 4194 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -4073,7 +4213,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -4094,7 +4234,7 @@
-  
- else
-   echo "$ac_t""no" 1>&6
--LIBOBJS="$LIBOBJS ${ac_func}.o"
-+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
- fi
- done
- 
-@@ -4142,12 +4282,12 @@
- 
- 
- echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:4146: checking for gethostbyname" >&5
-+echo "configure:4286: checking for gethostbyname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4151 "configure"
-+#line 4291 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostbyname(); below.  */
-@@ -4170,7 +4310,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_gethostbyname=yes"
- else
-@@ -4191,7 +4331,7 @@
- 
- if test $ac_cv_func_gethostbyname = no; then
-   echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:4195: checking for gethostbyname in -lnsl" >&5
-+echo "configure:4335: checking for gethostbyname in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4199,7 +4339,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4203 "configure"
-+#line 4343 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4210,7 +4350,7 @@
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:4214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4232,12 +4372,12 @@
- 
- fi
- echo $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:4236: checking for connect" >&5
-+echo "configure:4376: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4241 "configure"
-+#line 4381 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect(); below.  */
-@@ -4260,7 +4400,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_connect=yes"
- else
-@@ -4281,7 +4421,7 @@
- 
- if test $ac_cv_func_connect = no; then
-   echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:4285: checking for connect in -lsocket" >&5
-+echo "configure:4425: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4289,7 +4429,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket $EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4293 "configure"
-+#line 4433 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4300,7 +4440,7 @@
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:4304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4346,7 +4486,7 @@
- # 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.
- (set) 2>&1 |
--  case `(ac_space=' '; set) 2>&1` in
-+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-   *ac_space=\ *)
-     # `set' does not quote correctly, so add quotes (double-quote substitution
-     # turns \\\\ into \\, and sed turns \\ into \).
-@@ -4425,7 +4565,7 @@
-     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
--    echo "$CONFIG_STATUS generated by autoconf version 2.12"
-+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-     exit 0 ;;
-   -help | --help | --hel | --he | --h)
-     echo "\$ac_cs_usage"; exit 0 ;;
-@@ -4445,9 +4585,11 @@
-  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-@@ -4474,6 +4616,7 @@
- s%@RANLIB@%$RANLIB%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@CPP@%$CPP%g
- s%@AWK@%$AWK%g
+ echo "configure:3354: checking for crypt" >&5