[SVN] r629 - in /branches/sarge-2.2.13/debian: changelog patches/00list patches/80-kbsd-no-psstrings.dpatch patches/99-update-autoconf.dpatch

debian at incase.de debian at incase.de
Mon Sep 25 18:50:41 UTC 2006


Author: sven
Date: Mon Sep 25 20:50:39 2006
New Revision: 629

URL: https://mail.incase.de/viewcvs?rev=629&root=cyrus22&view=rev
Log:
Merge r 626-628 from trunk

Added:
    branches/sarge-2.2.13/debian/patches/80-kbsd-no-psstrings.dpatch
      - copied unchanged from r627, trunk/cyrus-imapd-2.2.13/debian/patches/80-kbsd-no-psstrings.dpatch
Modified:
    branches/sarge-2.2.13/debian/changelog
    branches/sarge-2.2.13/debian/patches/00list
    branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch

Modified: branches/sarge-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/changelog?rev=629&root=cyrus22&r1=628&r2=629&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/changelog (original)
+++ branches/sarge-2.2.13/debian/changelog Mon Sep 25 20:50:39 2006
@@ -1,4 +1,3 @@
-<<<<<<< .working
 cyrus-imapd-2.2 (2.2.13-8~bpo1) sarge-backports; urgency=low
 
   * backport to sarge 
@@ -13,6 +12,10 @@
   * Updated dutch translation (thanks to Kurt De Bree, Closes: #384870)
   * Updated logcheck rules a bit more, thanks to Ross Boylan (Closes: #384265)
   * Add spanish debconf translation thanks to César Gómez Martín.
+  * Add patch to fix FTBFS on GNU/kFreeBSD thanks to Petr Salinger.
+    (Closes: #388242)
+  * Run autoconf to generate update configure script after above patch was
+    applied to configure.in
 
   [ Henrique de Moraes Holschuh ]
   * Update pt_BR debconf translation
@@ -22,7 +25,7 @@
   * Fix mistake in init script, ! check_status instead of !check_status.
     Thanks to Farzad FARID
 
- -- Sven Mueller <sven at debian.org>  Tue, 19 Sep 2006 15:12:22 +0200
+ -- Sven Mueller <sven at debian.org>  Mon, 25 Sep 2006 20:47:41 +0200
 
 cyrus-imapd-2.2 (2.2.13-7) unstable; urgency=low
 

Modified: branches/sarge-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/00list?rev=629&root=cyrus22&r1=628&r2=629&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/00list (original)
+++ branches/sarge-2.2.13/debian/patches/00list Mon Sep 25 20:50:39 2006
@@ -51,4 +51,5 @@
 72-faster-isdigit.dpatch
 75-update-imapd.conf-documentation.dpatch
 77-change-missing-sieve-notice.dpatch
+80-kbsd-no-psstrings.dpatch
 99-update-autoconf.dpatch

Modified: branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch?rev=629&root=cyrus22&r1=628&r2=629&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch (original)
+++ branches/sarge-2.2.13/debian/patches/99-update-autoconf.dpatch Mon Sep 25 20:50:39 2006
@@ -6,19 +6,19 @@
 ## DP: (64bit-quota and potentially DRAC)
 
 @DPATCH@
-diff -urNad cyrus-imapd-2.2.13/aclocal.m4 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/aclocal.m4
---- cyrus-imapd-2.2.13/aclocal.m4	2006-04-22 15:13:25.000000000 +0200
-+++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/aclocal.m4	2006-05-19 15:21:21.043759469 +0200
+diff -urNad cyrus-imapd-2.2.13/aclocal.m4 /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/aclocal.m4
+--- cyrus-imapd-2.2.13/aclocal.m4	2006-09-14 22:40:11.000000000 +0200
++++ /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/aclocal.m4	2006-09-25 20:31:30.800148412 +0200
 @@ -1,4 +1,4 @@
 -# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 +# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
  # 2005  Free Software Foundation, Inc.
-diff -urNad cyrus-imapd-2.2.13/autom4te.cache/output.0 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.0
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/output.0 /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/autom4te.cache/output.0
 --- cyrus-imapd-2.2.13/autom4te.cache/output.0	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.0	2006-05-19 15:21:21.104753736 +0200
-@@ -0,0 +1,18639 @@
++++ /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/autom4te.cache/output.0	2006-09-25 20:40:34.575162207 +0200
+@@ -0,0 +1,18756 @@
 +@%:@! /bin/sh
 +@%:@ Guess values for system-dependent variables and create Makefiles.
 +@%:@ Generated by GNU Autoconf 2.59.
@@ -2970,14 +2970,13 @@
 +rm -f conftest*
 +
 +
-+
-+        echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
-+echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
-+if test "${ac_cv_lib_cposix_strerror+set}" = set; then
++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_check_lib_save_LIBS=$LIBS
-+LIBS="-lcposix  $LIBS"
++  ac_func_search_save_LIBS=$LIBS
++ac_cv_search_strerror=no
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -3021,24 +3020,79 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  ac_cv_lib_cposix_strerror=yes
++  ac_cv_search_strerror="none required"
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
-+ac_cv_lib_cposix_strerror=no
 +fi
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-+echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
-+if test $ac_cv_lib_cposix_strerror = yes; then
-+  LIBS="$LIBS -lcposix"
-+fi
-+
++if test "$ac_cv_search_strerror" = no; then
++  for ac_lib in cposix; do
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strerror ();
++int
++main ()
++{
++strerror ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_search_strerror="-l$ac_lib"
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++  done
++fi
++LIBS=$ac_func_search_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
++echo "${ECHO_T}$ac_cv_search_strerror" >&6
++if test "$ac_cv_search_strerror" != no; then
++  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
 +  
++fi
 +
 +for ac_prog in gawk mawk nawk awk
 +do
@@ -10512,54 +10566,51 @@
 +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
++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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++void *p = PS_STRINGS;
++
++_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); } >/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'
++  { (eval 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
 +  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
++cyrus_cv_sys_psstrings=no
++fi
++rm -f 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
 +fi
 +if test "$spt_type" = ""; then
@@ -12726,9 +12777,6 @@
 +  WITH_IDLE="poll"
 +fi; 
 +
-+if test "$WITH_IDLE" = "idled"; then
-+  IMAP_PROGS="$IMAP_PROGS idled"
-+fi
 +
 +ENABLE_NNTP=no
 +# Check whether --enable-nntp or --disable-nntp was given.
@@ -14406,6 +14454,75 @@
 +  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 gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char krb5int_getspecific ();
++int
++main ()
++{
++krb5int_getspecific ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_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 conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_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
@@ -14413,7 +14530,7 @@
 +  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 ${LIB_SOCKET} $LIBS"
++LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET} $LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -14728,8 +14845,8 @@
 +  fi
 +
 +  if test "$gss_impl" = "mit"; then
-+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-+    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
++    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"
@@ -18658,9 +18775,9 @@
 +  $ac_cs_success || { (exit 1); exit 1; }
 +fi
 +
-diff -urNad cyrus-imapd-2.2.13/autom4te.cache/output.1 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.1
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/output.1 /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/autom4te.cache/output.1
 --- cyrus-imapd-2.2.13/autom4te.cache/output.1	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/output.1	2006-05-19 15:21:21.133751010 +0200
++++ /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/autom4te.cache/output.1	2006-09-25 20:31:30.860142696 +0200
 @@ -0,0 +1,18693 @@
 +@%:@! /bin/sh
 +@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -37355,10 +37472,10 @@
 +  $ac_cs_success || { (exit 1); exit 1; }
 +fi
 +
-diff -urNad cyrus-imapd-2.2.13/autom4te.cache/requests /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/requests
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/requests /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/autom4te.cache/requests
 --- cyrus-imapd-2.2.13/autom4te.cache/requests	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/requests	2006-05-19 15:21:36.435312657 +0200
-@@ -0,0 +1,293 @@
++++ /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/autom4te.cache/requests	2006-09-25 20:40:36.718956957 +0200
+@@ -0,0 +1,116 @@
 +# This file was generated by Autom4te Sat Jan  8 16:59:54 PST 2005.
 +# It contains the lists of macros which have been traced.
 +# It can be safely removed.
@@ -37366,183 +37483,6 @@
 + at request = (
 +             bless( [
 +                      '0',
-+                      1,
-+                      [
-+                        '/usr/share/autoconf'
-+                      ],
-+                      [
-+                        '/usr/share/autoconf/autoconf/autoconf.m4f',
-+                        '/usr/share/aclocal/isc-posix.m4',
-+                        '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_C_VOLATILE' => 1,
-+                        'AC_TYPE_OFF_T' => 1,
-+                        'CMU_DB_LIB_WHERE' => 1,
-+                        'AC_FUNC_CLOSEDIR_VOID' => 1,
-+                        'AC_REPLACE_FNMATCH' => 1,
-+                        'AC_DEFUN' => 1,
-+                        'AC_PROG_LIBTOOL' => 1,
-+                        'AC_FUNC_STAT' => 1,
-+                        'AC_FUNC_WAIT3' => 1,
-+                        'AC_FUNC_LSTAT' => 1,
-+                        'AC_STRUCT_TM' => 1,
-+                        'AM_AUTOMAKE_VERSION' => 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,
-+                        'CYRUS_BERKELEY_DB_CHK_LIB' => 1,
-+                        'AC_HEADER_MAJOR' => 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,
-+                        'AC_PROG_MAKE_SET' => 1,
-+                        'AC_CONFIG_AUX_DIR' => 1,
-+                        'sinclude' => 1,
-+                        'AC_FUNC_STRERROR_R' => 1,
-+                        'CMU_GUESS_RUNPATH_SWITCH' => 1,
-+                        'AC_DECL_SYS_SIGLIST' => 1,
-+                        'AC_FUNC_FORK' => 1,
-+                        'CMU_KRB_INC_WHERE1' => 1,
-+                        'CYRUS_BERKELEY_DB_OPTS' => 1,
-+                        'AU_DEFUN' => 1,
-+                        'AC_FUNC_VPRINTF' => 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,
-+                        'AC_CHECK_MEMBERS' => 1,
-+                        'AC_DEFUN_ONCE' => 1,
-+                        'AC_FUNC_UTIME_NULL' => 1,
-+                        'AC_FUNC_SELECT_ARGTYPES' => 1,
-+                        'CMU_AFS_WHERE' => 1,
-+                        'AC_FUNC_STRFTIME' => 1,
-+                        'AC_HEADER_STAT' => 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_CHECK_LIB' => 1,
-+                        'CMU_KRB_LIB_WHERE1' => 1,
-+                        'AC_FUNC_OBSTACK' => 1,
-+                        'CMU_TEST_INCPATH' => 1,
-+                        'AC_FUNC_MALLOC' => 1,
-+                        'CMU_ADD_LIBPATH' => 1,
-+                        'AC_FUNC_GETGROUPS' => 1,
-+                        'AC_FUNC_GETLOADAVG' => 1,
-+                        'AC_FUNC_FSEEKO' => 1,
-+                        'SASL_GSSAPI_CHK' => 1,
-+                        'CMU_CHECK_HEADER_NOCACHE' => 1,
-+                        'AM_PROG_CC_C_O' => 1,
-+                        'CYRUS_BERKELEY_DB_CHK' => 1,
-+                        'AC_FUNC_MKTIME' => 1,
-+                        'AM_CONDITIONAL' => 1,
-+                        'AC_HEADER_SYS_WAIT' => 1,
-+                        'AC_FUNC_MEMCMP' => 1,
-+                        'AC_PROG_LN_S' => 1,
-+                        'm4_include' => 1,
-+                        'AC_HEADER_DIRENT' => 1,
-+                        'CMU_KRB_RD_REQ_PROTO' => 1,
-+                        'm4_pattern_forbid' => 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,
-+                        '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,
-+                        'CMU_TEST_LIBPATH' => 1,
-+                        'CMU_AFS_INC_WHERE1' => 1,
-+                        'AC_FUNC_ERROR_AT_LINE' => 1,
-+                        'CMU_LIBSSL_INC_WHERE' => 1,
-+                        'AC_FUNC_MBRTOWC' => 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_FUNC_CHOWN' => 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,
-+                        'CMU_KRB_SENDAUTH_PROTO' => 1,
-+                        'CMU_KRB_LIB_WHERE' => 1,
-+                        'AC_CONFIG_LINKS' => 1,
-+                        'AM_MAINTAINER_MODE' => 1,
-+                        'CMU_SASL2' => 1,
-+                        'AC_PROG_CPP' => 1,
-+                        'CMU_DB_INC_WHERE1' => 1,
-+                        'AC_TYPE_PID_T' => 1,
-+                        'AC_PROG_LEX' => 1,
-+                        'AC_C_CONST' => 1,
-+                        'CMU_LIBWRAP' => 1,
-+                        'AC_FUNC_SETVBUF_REVERSED' => 1,
-+                        'AC_PROG_INSTALL' => 1,
-+                        'CMU_SASL2_CHECKAPOP_REQUIRED' => 1,
-+                        'CMU_C_FPIC' => 1,
-+                        'CMU_KRB4' => 1,
-+                        'AH_OUTPUT' => 1,
-+                        'AC_ISC_POSIX' => 1,
-+                        'AC_CANONICAL_SYSTEM' => 1,
-+                        'AC_CONFIG_HEADERS' => 1,
-+                        'CMU_NEEDS_AFS' => 1,
-+                        'AC_CHECK_FUNCS' => 1
-+                      }
-+                    ], 'Autom4te::Request' ),
-+             bless( [
-+                      '1',
 +                      1,
 +                      [
 +                        '/usr/share/autoconf'
@@ -37593,8 +37533,8 @@
 +                        '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_FORK' => 1,
 +                        'AC_FUNC_VPRINTF' => 1,
 +                        'AC_FUNC_STRCOLL' => 1,
 +                        'AC_PROG_YACC' => 1,
@@ -37630,8 +37570,8 @@
 +                        'AC_FUNC_SETVBUF_REVERSED' => 1,
 +                        'AC_PROG_INSTALL' => 1,
 +                        'AM_GNU_GETTEXT' => 1,
++                        'AC_FUNC_OBSTACK' => 1,
 +                        'AC_CHECK_LIB' => 1,
-+                        'AC_FUNC_OBSTACK' => 1,
 +                        'AC_FUNC_MALLOC' => 1,
 +                        'AC_FUNC_GETGROUPS' => 1,
 +                        'AC_FUNC_GETLOADAVG' => 1,
@@ -37652,1725 +37592,20 @@
 +                    ], 'Autom4te::Request' )
 +           );
 +
-diff -urNad cyrus-imapd-2.2.13/autom4te.cache/traces.0 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.0
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/traces.0 /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/autom4te.cache/traces.0
 --- cyrus-imapd-2.2.13/autom4te.cache/traces.0	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.0	2006-05-19 15:21:21.140750352 +0200
-@@ -0,0 +1,2900 @@
-+m4trace:/usr/share/aclocal/isc-posix.m4:24: -1- AC_DEFUN([AC_ISC_POSIX], [
-+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-+  
-+])
-+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:264: -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
-+    gss_failed=0
-+    AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
-+                 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${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"
-+    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
-+  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:271: -1- AC_DEFUN([SASL_SET_GSSAPI_LIBS], [SASL_GSSAPI_LIBS_SET="yes"
-+])
-+m4trace:cmulocal/sasl2.m4:400: -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:410: -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:441: -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:458: -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:469: -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
-+
-+])
++++ /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/autom4te.cache/traces.0	2006-09-25 20:40:34.575162207 +0200
+@@ -0,0 +1,1150 @@
++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_])
@@ -39493,7 +37728,6 @@
 +m4trace:configure.in:98: -1- AC_SUBST([CPP])
 +m4trace:configure.in:98: -1- AC_SUBST([EGREP])
 +m4trace:configure.in:98: -1- AC_DEFINE_TRACE_LITERAL([_ALL_SOURCE])
-+m4trace:configure.in:99: -1- AC_CHECK_LIB([cposix], [strerror], [LIBS="$LIBS -lcposix"])
 +m4trace:configure.in:100: -1- AC_PROG_AWK
 +m4trace:configure.in:100: -1- AC_SUBST([AWK])
 +m4trace:configure.in:101: -1- AC_C_CONST
@@ -39543,7 +37777,6 @@
 +m4trace:configure.in:116: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* 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])
-+m4trace:configure.in:119: -1- CMU_C___ATTRIBUTE__
 +m4trace:configure.in:119: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
 +autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
@@ -39552,7 +37785,6 @@
 +m4trace:configure.in:119: -1- AC_DEFINE_TRACE_LITERAL([HAVE___ATTRIBUTE__])
 +m4trace:configure.in:119: -1- AH_OUTPUT([HAVE___ATTRIBUTE__], [/* define if your compiler has __attribute__ */
 +#undef HAVE___ATTRIBUTE__])
-+m4trace:configure.in:120: -1- CMU_C_FPIC
 +m4trace:configure.in:120: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
 +autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
@@ -39561,7 +37793,6 @@
 +m4trace:configure.in:122: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
 +m4trace:configure.in:122: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of a `long\', as computed by sizeof. */
 +#undef SIZEOF_LONG])
-+m4trace:configure.in:125: -1- CMU_GUESS_RUNPATH_SWITCH
 +m4trace:configure.in:127: -1- AC_CHECK_HEADERS([unistd.h sys/select.h sys/param.h stdarg.h])
 +m4trace:configure.in:127: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
 +#undef HAVE_UNISTD_H])
@@ -39602,7 +37833,6 @@
 +#undef HAVE_SYS_DIR_H])
 +m4trace:configure.in:130: -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:133: -1- CMU_SOCKETS
 +m4trace:configure.in:133: -2- AC_CHECK_LIB([nsl], [gethostbyname], [LIB_SOCKET="-lnsl $LIB_SOCKET"])
 +m4trace:configure.in:133: -2- AC_CHECK_LIB([socket], [connect], [LIB_SOCKET="-lsocket $LIB_SOCKET"])
 +m4trace:configure.in:133: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
@@ -39615,9 +37845,6 @@
 +m4trace:configure.in:133: -1- AH_OUTPUT([HAVE_DNS_LOOKUP], [/* Define to 1 if you have the `dns_lookup\' function. */
 +#undef HAVE_DNS_LOOKUP])
 +m4trace:configure.in:133: -1- AC_SUBST([LIB_SOCKET])
-+m4trace:configure.in:140: -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:140: -1- AC_CHECK_LIB([socket], [getaddrinfo], [dnl
 +    LIBS="$LIBS -lsocket"
 +    ac_cv_lib_inet6_getaddrinfo=no
@@ -39658,11 +37885,6 @@
 +m4trace:configure.in:140: -2- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
 +m4trace:configure.in:140: -2- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
 +#undef HAVE_GETADDRINFO])
-+m4trace:configure.in:140: -1- IPv6_CHECK_FUNC([gai_strerror], [
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETADDRINFO 
-+_ACEOF
-+], [cyrus_cv_getaddrinfo=no])
 +m4trace:configure.in:140: -1- AC_CHECK_LIB([socket], [gai_strerror], [dnl
 +    LIBS="$LIBS -lsocket"
 +    ac_cv_lib_inet6_gai_strerror=no
@@ -39703,11 +37925,6 @@
 +m4trace:configure.in:148: -2- AC_DEFINE_TRACE_LITERAL([HAVE_GETNAMEINFO])
 +m4trace:configure.in:148: -2- AH_OUTPUT([HAVE_GETNAMEINFO], [/* Do we have a getnameinfo? */
 +#undef HAVE_GETNAMEINFO])
-+m4trace:configure.in:149: -1- IPv6_CHECK_FUNC([getnameinfo], [
-+cat >>confdefs.h <<\_ACEOF
-+@%:@define HAVE_GETNAMEINFO 
-+_ACEOF
-+], [cyrus_cv_getnameinfo=no])
 +m4trace:configure.in:149: -1- AC_CHECK_LIB([socket], [getnameinfo], [dnl
 +    LIBS="$LIBS -lsocket"
 +    ac_cv_lib_inet6_getnameinfo=no
@@ -39745,7 +37962,6 @@
 +m4trace:configure.in:149: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETADDRINFO])
 +m4trace:configure.in:149: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Do we have a getaddrinfo? */
 +#undef HAVE_GETADDRINFO])
-+m4trace:configure.in:155: -1- IPv6_CHECK_SS_FAMILY([])
 +m4trace:configure.in:155: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
 +autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
@@ -39754,7 +37970,6 @@
 +m4trace:configure.in:155: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SS_FAMILY])
 +m4trace:configure.in:155: -2- AH_OUTPUT([HAVE_SS_FAMILY], [/* Is there an ss_family in sockaddr_storage? */
 +#undef HAVE_SS_FAMILY])
-+m4trace:configure.in:156: -1- IPv6_CHECK_SA_LEN([])
 +m4trace:configure.in:156: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
 +autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
@@ -39806,11 +38021,6 @@
 +m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DOPRNT])
 +m4trace:configure.in:171: -1- AH_OUTPUT([HAVE_DOPRNT], [/* Define to 1 if you don\'t have `vprintf\' but do have `_doprnt.\' */
 +#undef HAVE_DOPRNT])
-+m4trace:configure.in:204: -1- CYRUS_BERKELEY_DB_CHK([])
-+m4trace:configure.in:204: -1- CYRUS_BERKELEY_DB_OPTS
-+m4trace:configure.in:204: -1- CYRUS_BERKELEY_DB_CHK_LIB([])
-+m4trace:configure.in:204: -1- CMU_ADD_LIBPATH_TO([$with_bdb_lib], [LDFLAGS])
-+m4trace:configure.in:204: -1- CMU_ADD_LIBPATH_TO([$with_bdb_lib], [BDB_LIBADD])
 +m4trace:configure.in:204: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
 +cmulocal/berkdb.m4:235: CYRUS_BERKELEY_DB_CHK_LIB is expanded from...
@@ -39826,7 +38036,6 @@
 +m4trace:configure.in:208: -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:208: the top level])
-+m4trace:configure.in:212: -1- CMU_ADD_LIBPATH([$with_bdb_lib])
 +m4trace:configure.in:217: -1- AC_SUBST([BDB_INC])
 +m4trace:configure.in:218: -1- AC_SUBST([BDB_LIB])
 +m4trace:configure.in:224: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BDB])
@@ -39899,51 +38108,48 @@
 +#undef HAVE_RLIM_T])
 +m4trace:configure.in:290: -1- AC_CHECK_LIB([util], [setproctitle], [spt_type=SPT_BUILTIN
 +			LIBS="${LIBS} -lutil"])
-+m4trace:configure.in:305: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++m4trace:configure.in:315: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
-+configure.in:305: the top level])
-+m4trace:configure.in:316: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++configure.in:315: the top level])
++m4trace:configure.in:326: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
-+configure.in:316: the top level])
-+m4trace:configure.in:327: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
-+You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
-+configure.in:327: the top level])
-+m4trace:configure.in:334: -1- AC_DEFINE_TRACE_LITERAL([SPT_TYPE])
-+m4trace:configure.in:334: -1- AH_OUTPUT([SPT_TYPE], [/* Do we already have setproctitle? */
++configure.in:326: the top level])
++m4trace:configure.in:333: -1- AC_DEFINE_TRACE_LITERAL([SPT_TYPE])
++m4trace:configure.in:333: -1- AH_OUTPUT([SPT_TYPE], [/* Do we already have setproctitle? */
 +#undef SPT_TYPE])
-+m4trace:configure.in:344: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++m4trace:configure.in:343: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
-+configure.in:344: the top level])
-+m4trace:configure.in:346: -1- AC_SUBST([WITH_NONBLOCK])
-+m4trace:configure.in:353: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++configure.in:343: the top level])
++m4trace:configure.in:345: -1- AC_SUBST([WITH_NONBLOCK])
++m4trace:configure.in:352: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
-+configure.in:353: the top level])
-+m4trace:configure.in:355: -1- AC_SUBST([WITH_GMTOFF])
-+m4trace:configure.in:383: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++configure.in:352: the top level])
++m4trace:configure.in:354: -1- AC_SUBST([WITH_GMTOFF])
++m4trace:configure.in:382: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
-+configure.in:383: the top level])
-+m4trace:configure.in:415: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++configure.in:382: the top level])
++m4trace:configure.in:414: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
-+configure.in:415: the top level])
-+m4trace:configure.in:426: -1- AC_SUBST([WITH_MAP])
-+m4trace:configure.in:435: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++configure.in:414: the top level])
++m4trace:configure.in:425: -1- AC_SUBST([WITH_MAP])
++m4trace:configure.in:434: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
 +You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
 +autoconf/functions.m4:74: AC_CHECK_FUNC is expanded from...
 +autoconf/functions.m4:74: AC_CHECK_FUNC is expanded from...
 +autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
-+configure.in:435: the top level])
-+m4trace:configure.in:437: -1- AC_SUBST([WITH_LOCK])
-+m4trace:configure.in:441: -2- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
-+m4trace:configure.in:441: -2- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
++configure.in:434: the top level])
++m4trace:configure.in:436: -1- AC_SUBST([WITH_LOCK])
++m4trace:configure.in:440: -2- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
++m4trace:configure.in:440: -2- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
 +#undef HAVE_FDATASYNC])
-+m4trace:configure.in:446: -1- AC_CHECK_LIB([rt], [fdatasync], [
++m4trace:configure.in:445: -1- AC_CHECK_LIB([rt], [fdatasync], [
 +	LIB_RT="-lrt"
 +	AC_DEFINE(HAVE_FDATASYNC,[],[Do we have fdatasync()?])
 +  ])
-+m4trace:configure.in:446: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
-+m4trace:configure.in:446: -1- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
++m4trace:configure.in:445: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FDATASYNC])
++m4trace:configure.in:445: -1- AH_OUTPUT([HAVE_FDATASYNC], [/* Do we have fdatasync()? */
 +#undef HAVE_FDATASYNC])
-+m4trace:configure.in:467: -1- AC_CHECK_LIB([BSD], [sigvec], [cyrus_sigveclib="-lBSD"], [
++m4trace:configure.in:466: -1- AC_CHECK_LIB([BSD], [sigvec], [cyrus_sigveclib="-lBSD"], [
 +    dnl not hp flavor
 +    SAVE_LDFLAGS="$LDFLAGS"
 +    dnl solaris flavor
@@ -39953,106 +38159,100 @@
 +      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"],
 +      [ cant_find_sigvec=yes ])
 +    LDFLAGS="$SAVE_LDFLAGS"])
-+m4trace:configure.in:467: -1- AC_CHECK_LIB([ucb], [sigvec], [
++m4trace:configure.in:466: -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:468: -1- AC_SUBST([cyrus_sigveclib])
-+m4trace:configure.in:482: -1- SASL_SET_GSSAPI_LIBS
-+m4trace:configure.in:482: -1- AC_DEFINE_TRACE_LITERAL([AFSPTS_USE_KRB5])
-+m4trace:configure.in:482: -1- AH_OUTPUT([AFSPTS_USE_KRB5], [/* Should the AFS PTS plugin use krb5? */
++m4trace:configure.in:467: -1- AC_SUBST([cyrus_sigveclib])
++m4trace:configure.in:481: -1- AC_DEFINE_TRACE_LITERAL([AFSPTS_USE_KRB5])
++m4trace:configure.in:481: -1- AH_OUTPUT([AFSPTS_USE_KRB5], [/* Should the AFS PTS plugin use krb5? */
 +#undef AFSPTS_USE_KRB5])
-+m4trace:configure.in:494: -1- CMU_ADD_LIBPATH_TO([/usr/ucblib], [AFS_LDFLAGS])
-+m4trace:configure.in:515: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++m4trace:configure.in:514: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
 +autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
-+configure.in:515: the top level])
-+m4trace:configure.in:521: -1- AC_SUBST([AFS_LIBS])
-+m4trace:configure.in:522: -1- AC_SUBST([AFS_LDFLAGS])
-+m4trace:configure.in:523: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
-+m4trace:configure.in:523: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
++configure.in:514: the top level])
++m4trace:configure.in:520: -1- AC_SUBST([AFS_LIBS])
++m4trace:configure.in:521: -1- AC_SUBST([AFS_LDFLAGS])
++m4trace:configure.in:522: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
++m4trace:configure.in:522: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
 +#undef HAVE_AFSKRB])
-+m4trace:configure.in:527: -1- AC_SUBST([AFS_LIBS])
-+m4trace:configure.in:528: -1- AC_SUBST([AFS_LDFLAGS])
-+m4trace:configure.in:529: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
-+m4trace:configure.in:529: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
++m4trace:configure.in:526: -1- AC_SUBST([AFS_LIBS])
++m4trace:configure.in:527: -1- AC_SUBST([AFS_LDFLAGS])
++m4trace:configure.in:528: -1- AC_DEFINE_TRACE_LITERAL([HAVE_AFSKRB])
++m4trace:configure.in:528: -1- AH_OUTPUT([HAVE_AFSKRB], [/* Should we build afskrb pts module? */
 +#undef HAVE_AFSKRB])
-+m4trace:configure.in:557: -1- AC_CHECK_LIB([ldap], [ldap_initialize], [ AC_DEFINE(HAVE_LDAP,[],[Should we build ldap pts module?])
++m4trace:configure.in:556: -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:557: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDAP])
-+m4trace:configure.in:557: -1- AH_OUTPUT([HAVE_LDAP], [/* Should we build ldap pts module? */
++m4trace:configure.in:556: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LDAP])
++m4trace:configure.in:556: -1- AH_OUTPUT([HAVE_LDAP], [/* Should we build ldap pts module? */
 +#undef HAVE_LDAP])
-+m4trace:configure.in:557: -1- AC_SUBST([LDAP_CPPFLAGS])
-+m4trace:configure.in:557: -1- AC_SUBST([LDAP_LDFLAGS])
-+m4trace:configure.in:557: -1- AC_SUBST([LDAP_LIBS])
-+m4trace:configure.in:566: -1- AC_DEFINE_TRACE_LITERAL([WITH_PTS])
-+m4trace:configure.in:566: -1- AH_OUTPUT([WITH_PTS], [/* Build in PTS support? */
++m4trace:configure.in:556: -1- AC_SUBST([LDAP_CPPFLAGS])
++m4trace:configure.in:556: -1- AC_SUBST([LDAP_LDFLAGS])
++m4trace:configure.in:556: -1- AC_SUBST([LDAP_LIBS])
++m4trace:configure.in:565: -1- AC_DEFINE_TRACE_LITERAL([WITH_PTS])
++m4trace:configure.in:565: -1- AH_OUTPUT([WITH_PTS], [/* Build in PTS support? */
 +#undef WITH_PTS])
-+m4trace:configure.in:575: -1- AC_SUBST([SERVER_SUBDIRS])
-+m4trace:configure.in:593: -1- AC_CHECK_LIB([resolv], [res_search])
-+m4trace:configure.in:593: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
++m4trace:configure.in:574: -1- AC_SUBST([SERVER_SUBDIRS])
++m4trace:configure.in:592: -1- AC_CHECK_LIB([resolv], [res_search])
++m4trace:configure.in:592: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
 +#undef HAVE_LIBRESOLV])
-+m4trace:configure.in:593: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
-+m4trace:configure.in:610: -1- AC_CHECK_LIB([des], [des_ecb_encrypt], [if test "$with_statickrb" = "yes"; then
++m4trace:configure.in:592: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
++m4trace:configure.in:609: -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:630: -1- CMU_ADD_LIBPATH([${with_krb}/lib])
-+m4trace:configure.in:647: -3- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++m4trace:configure.in:646: -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:647: the top level])
-+m4trace:configure.in:648: -2- AC_CHECK_LIB([${KRBLIB}], [krb_mk_priv], [if test "$with_statickrb" = "yes"; then
++configure.in:646: the top level])
++m4trace:configure.in:647: -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:649: -2- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++m4trace:configure.in:648: -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:649: the top level])
-+m4trace:configure.in:651: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++configure.in:648: the top level])
++m4trace:configure.in:650: -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:651: the top level])
-+m4trace:configure.in:656: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB])
-+m4trace:configure.in:656: -1- AH_OUTPUT([HAVE_KRB], [/* Support for Kerberos? */
++configure.in:650: the top level])
++m4trace:configure.in:655: -1- AC_DEFINE_TRACE_LITERAL([HAVE_KRB])
++m4trace:configure.in:655: -1- AH_OUTPUT([HAVE_KRB], [/* Support for Kerberos? */
 +#undef HAVE_KRB])
-+m4trace:configure.in:661: -1- SASL_SET_GSSAPI_LIBS
-+m4trace:configure.in:680: -1- AC_CHECK_LIB([rsaref], [RSAPublicEncrypt], [LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes], [cmu_have_rsaref=no])
-+m4trace:configure.in:685: -1- AC_CHECK_LIB([crypto], [BIO_accept], [LIBS="-lcrypto $LIB_RSAREF ${LIBS}"], [with_openssl="no"], [$LIB_RSAREF])
-+m4trace:configure.in:687: -1- AC_CHECK_LIB([ssl], [SSL_CTX_new], [LIBS="-lssl ${LIBS}"], [with_openssl="no"], [-lcrypto $LIB_RSAREF])
-+m4trace:configure.in:694: -1- CMU_ADD_LIBPATH([${OPENSSL_LIBPATH}])
-+m4trace:configure.in:695: -1- CMU_ADD_LIBPATH_TO([${OPENSSL_LIBPATH}], [OPENSSL_LIB])
-+m4trace:configure.in:703: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSL])
-+m4trace:configure.in:703: -1- AH_OUTPUT([HAVE_SSL], [/* Build with SSL support? */
++m4trace:configure.in:679: -1- AC_CHECK_LIB([rsaref], [RSAPublicEncrypt], [LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes], [cmu_have_rsaref=no])
++m4trace:configure.in:684: -1- AC_CHECK_LIB([crypto], [BIO_accept], [LIBS="-lcrypto $LIB_RSAREF ${LIBS}"], [with_openssl="no"], [$LIB_RSAREF])
++m4trace:configure.in:686: -1- AC_CHECK_LIB([ssl], [SSL_CTX_new], [LIBS="-lssl ${LIBS}"], [with_openssl="no"], [-lcrypto $LIB_RSAREF])
++m4trace:configure.in:702: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSL])
++m4trace:configure.in:702: -1- AH_OUTPUT([HAVE_SSL], [/* Build with SSL support? */
 +#undef HAVE_SSL])
-+m4trace:configure.in:706: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_ENABLE_OLD_DES_SUPPORT])
-+m4trace:configure.in:706: -1- AH_OUTPUT([OPENSSL_ENABLE_OLD_DES_SUPPORT], [/* Configure OpenSSL to provide legacy des apis */
++m4trace:configure.in:705: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_ENABLE_OLD_DES_SUPPORT])
++m4trace:configure.in:705: -1- AH_OUTPUT([OPENSSL_ENABLE_OLD_DES_SUPPORT], [/* Configure OpenSSL to provide legacy des apis */
 +#undef OPENSSL_ENABLE_OLD_DES_SUPPORT])
-+m4trace:configure.in:707: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_DES_LIBDES_COMPATIBILITY])
-+m4trace:configure.in:707: -1- AH_OUTPUT([OPENSSL_DES_LIBDES_COMPATIBILITY], [/* Configure OpenSSL to provide krb4-compatible legacy des apis */
++m4trace:configure.in:706: -1- AC_DEFINE_TRACE_LITERAL([OPENSSL_DES_LIBDES_COMPATIBILITY])
++m4trace:configure.in:706: -1- AH_OUTPUT([OPENSSL_DES_LIBDES_COMPATIBILITY], [/* Configure OpenSSL to provide krb4-compatible legacy des apis */
 +#undef OPENSSL_DES_LIBDES_COMPATIBILITY])
-+m4trace:configure.in:710: -1- AC_SUBST([OPENSSL_INC])
-+m4trace:configure.in:711: -1- AC_SUBST([OPENSSL_LIB])
-+m4trace:configure.in:722: -1- AC_DEFINE_TRACE_LITERAL([EGD_SOCKET])
-+m4trace:configure.in:722: -1- AH_OUTPUT([EGD_SOCKET], [/* Alternative to /dev/urandom? */
++m4trace:configure.in:709: -1- AC_SUBST([OPENSSL_INC])
++m4trace:configure.in:710: -1- AC_SUBST([OPENSSL_LIB])
++m4trace:configure.in:721: -1- AC_DEFINE_TRACE_LITERAL([EGD_SOCKET])
++m4trace:configure.in:721: -1- AH_OUTPUT([EGD_SOCKET], [/* Alternative to /dev/urandom? */
 +#undef EGD_SOCKET])
-+m4trace:configure.in:742: -1- AC_CHECK_LIB([zephyr], [ZInitialize], [ZEPHYR_LIBS="-lzephyr"], [with_zephyr="no"], [])
-+m4trace:configure.in:750: -1- AC_SUBST([ZEPHYR_LIBS])
-+m4trace:configure.in:751: -1- AC_SUBST([ZEPHYR_CPPFLAGS])
-+m4trace:configure.in:753: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ZEPHYR])
-+m4trace:configure.in:753: -1- AH_OUTPUT([HAVE_ZEPHYR], [/* Build with Zephyr support? */
++m4trace:configure.in:741: -1- AC_CHECK_LIB([zephyr], [ZInitialize], [ZEPHYR_LIBS="-lzephyr"], [with_zephyr="no"], [])
++m4trace:configure.in:749: -1- AC_SUBST([ZEPHYR_LIBS])
++m4trace:configure.in:750: -1- AC_SUBST([ZEPHYR_CPPFLAGS])
++m4trace:configure.in:752: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ZEPHYR])
++m4trace:configure.in:752: -1- AH_OUTPUT([HAVE_ZEPHYR], [/* Build with Zephyr support? */
 +#undef HAVE_ZEPHYR])
-+m4trace:configure.in:763: -1- AC_DEFINE_TRACE_LITERAL([MASTER_PIDFILE])
-+m4trace:configure.in:763: -1- AH_OUTPUT([MASTER_PIDFILE], [/* Name of the pidfile for master */
++m4trace:configure.in:762: -1- AC_DEFINE_TRACE_LITERAL([MASTER_PIDFILE])
++m4trace:configure.in:762: -1- AH_OUTPUT([MASTER_PIDFILE], [/* Name of the pidfile for master */
 +#undef MASTER_PIDFILE])
-+m4trace:configure.in:771: -1- AC_SUBST([WITH_IDLE])
-+m4trace:configure.in:796: -1- AC_SUBST([IMAP_PROGS])
-+m4trace:configure.in:828: -1- AC_CHECK_LIB([com_err], [com_err], [
++m4trace:configure.in:770: -1- AC_SUBST([WITH_IDLE])
++m4trace:configure.in:792: -1- AC_SUBST([IMAP_PROGS])
++m4trace:configure.in:824: -1- AC_CHECK_LIB([com_err], [com_err], [
 +		# com_err is already in library path
 +		# guess we're okay
 +		# can use system com_err
@@ -40073,292 +38273,282 @@
 +		with_com_err=yes
 +	fi
 +	])
-+m4trace:configure.in:828: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ET_COM_ERR_H])
-+m4trace:configure.in:828: -1- AH_OUTPUT([HAVE_ET_COM_ERR_H], [/* We need et/com_err.h */
++m4trace:configure.in:824: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ET_COM_ERR_H])
++m4trace:configure.in:824: -1- AH_OUTPUT([HAVE_ET_COM_ERR_H], [/* We need et/com_err.h */
 +#undef HAVE_ET_COM_ERR_H])
-+m4trace:configure.in:828: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++m4trace:configure.in:824: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
 +You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
 +autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
 +autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
 +autoconf/libs.m4:134: AC_CHECK_LIB is expanded from...
-+configure.in:828: the top level])
-+m4trace:configure.in:828: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
-+m4trace:configure.in:828: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
-+m4trace:configure.in:828: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
-+m4trace:configure.in:869: -1- AC_SUBST([COMPILE_ET])
-+m4trace:configure.in:870: -1- AC_SUBST([COM_ERR_LIBS])
-+m4trace:configure.in:871: -1- AC_SUBST([COM_ERR_LDFLAGS])
-+m4trace:configure.in:872: -1- AC_SUBST([COM_ERR_CPPFLAGS])
-+m4trace:configure.in:878: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++configure.in:824: the top level])
++m4trace:configure.in:824: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
++m4trace:configure.in:824: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
++m4trace:configure.in:824: -1- AC_SUBST([COMPILE_ET], [$ac_cv_path_COMPILE_ET])
++m4trace:configure.in:865: -1- AC_SUBST([COMPILE_ET])
++m4trace:configure.in:866: -1- AC_SUBST([COM_ERR_LIBS])
++m4trace:configure.in:867: -1- AC_SUBST([COM_ERR_LDFLAGS])
++m4trace:configure.in:868: -1- AC_SUBST([COM_ERR_CPPFLAGS])
++m4trace:configure.in:874: -2- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
-+configure.in:878: the top level])
-+m4trace:configure.in:893: -1- AC_DEFINE_TRACE_LITERAL([SYSLOG_FACILITY])
-+m4trace:configure.in:893: -1- AH_OUTPUT([SYSLOG_FACILITY], [/* Syslog facility to use. */
++configure.in:874: the top level])
++m4trace:configure.in:889: -1- AC_DEFINE_TRACE_LITERAL([SYSLOG_FACILITY])
++m4trace:configure.in:889: -1- AH_OUTPUT([SYSLOG_FACILITY], [/* Syslog facility to use. */
 +#undef SYSLOG_FACILITY])
-+m4trace:configure.in:897: -1- AC_LIBSOURCE([getdtablesize.c])
-+m4trace:configure.in:897: -1- AC_CHECK_FUNCS([getdtablesize], [], [_AC_LIBOBJ($ac_func)])
-+m4trace:configure.in:897: -1- AH_OUTPUT([HAVE_GETDTABLESIZE], [/* Define to 1 if you have the `getdtablesize\' function. */
++m4trace:configure.in:893: -1- AC_LIBSOURCE([getdtablesize.c])
++m4trace:configure.in:893: -1- AC_CHECK_FUNCS([getdtablesize], [], [_AC_LIBOBJ($ac_func)])
++m4trace:configure.in:893: -1- AH_OUTPUT([HAVE_GETDTABLESIZE], [/* Define to 1 if you have the `getdtablesize\' function. */
 +#undef HAVE_GETDTABLESIZE])
-+m4trace:configure.in:897: -1- AC_SUBST([LIB@&t at OBJS])
-+m4trace:configure.in:910: -2- AC_DEFINE_TRACE_LITERAL([OLD_SIEVE_SERVICE_NAME])
-+m4trace:configure.in:910: -2- AH_OUTPUT([OLD_SIEVE_SERVICE_NAME], [/* Use "imap" as sieve service name? */
++m4trace:configure.in:893: -1- AC_SUBST([LIB@&t at OBJS])
++m4trace:configure.in:906: -2- AC_DEFINE_TRACE_LITERAL([OLD_SIEVE_SERVICE_NAME])
++m4trace:configure.in:906: -2- AH_OUTPUT([OLD_SIEVE_SERVICE_NAME], [/* Use "imap" as sieve service name? */
 +#undef OLD_SIEVE_SERVICE_NAME])
-+m4trace:configure.in:919: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_LISTEXT])
-+m4trace:configure.in:919: -2- AH_OUTPUT([ENABLE_LISTEXT], [/* Enable the LISTEXT extension? */
++m4trace:configure.in:915: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_LISTEXT])
++m4trace:configure.in:915: -2- AH_OUTPUT([ENABLE_LISTEXT], [/* Enable the LISTEXT extension? */
 +#undef ENABLE_LISTEXT])
-+m4trace:configure.in:926: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_X_NETSCAPE_HACK])
-+m4trace:configure.in:926: -2- AH_OUTPUT([ENABLE_X_NETSCAPE_HACK], [/* Enable Netscape Menu Option Hack? */
++m4trace:configure.in:922: -2- AC_DEFINE_TRACE_LITERAL([ENABLE_X_NETSCAPE_HACK])
++m4trace:configure.in:922: -2- AH_OUTPUT([ENABLE_X_NETSCAPE_HACK], [/* Enable Netscape Menu Option Hack? */
 +#undef ENABLE_X_NETSCAPE_HACK])
-+m4trace:configure.in:929: -1- AC_CHECK_LIB([dl], [dlopen])
-+m4trace:configure.in:929: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
++m4trace:configure.in:925: -1- AC_CHECK_LIB([dl], [dlopen])
++m4trace:configure.in:925: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
 +#undef HAVE_LIBDL])
-+m4trace:configure.in:929: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
-+m4trace:configure.in:930: -1- CMU_SASL2_REQUIRE_VER([2], [1], [7])
-+m4trace:configure.in:930: -1- CMU_SASL2_REQUIRED
-+m4trace:configure.in:930: -1- CMU_SASL2
-+m4trace:configure.in:930: -1- SASL_GSSAPI_CHK
-+m4trace:configure.in:930: -1- SASL2_CRYPT_CHK
-+m4trace:configure.in:930: -1- AC_CHECK_LIB([crypt], [crypt], [LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes], [cmu_have_crypt=no])
-+m4trace:configure.in:930: -1- AC_SUBST([LIB_CRYPT])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++m4trace:configure.in:925: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
++m4trace:configure.in:926: -1- AC_CHECK_LIB([crypt], [crypt], [LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes], [cmu_have_crypt=no])
++m4trace:configure.in:926: -1- AC_SUBST([LIB_CRYPT])
++m4trace:configure.in:926: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
 +autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
-+cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
-+configure.in:930: SASL_GSSAPI_CHK is required by...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
++configure.in:926: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
 +autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
-+cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
-+configure.in:930: SASL_GSSAPI_CHK is required by...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
++configure.in:926: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -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:264: SASL_GSSAPI_CHK is expanded from...
-+configure.in:930: SASL_GSSAPI_CHK is required by...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
++configure.in:926: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -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:264: SASL_GSSAPI_CHK is expanded from...
-+configure.in:930: SASL_GSSAPI_CHK is required by...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSSAPI_H])
-+m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSSAPI_H], [/* Define if you have the gssapi.h header file */
++cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
++configure.in:926: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSSAPI_H])
++m4trace:configure.in:926: -1- AH_OUTPUT([HAVE_GSSAPI_H], [/* Define if you have the gssapi.h header file */
 +#undef HAVE_GSSAPI_H])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++m4trace:configure.in:926: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
 +You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
 +autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
 +autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
-+cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
-+configure.in:930: SASL_GSSAPI_CHK is required by...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- AC_CHECK_LIB([resolv], [res_search])
-+m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
++cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
++configure.in:926: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- AC_CHECK_LIB([resolv], [res_search])
++m4trace:configure.in:926: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
 +#undef HAVE_LIBRESOLV])
-+m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
-+m4trace:configure.in:930: -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:930: -1- AC_CHECK_LIB([gssapi_krb5], [gss_unwrap], [gss_impl="mit"], [gss_failed=1], [${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET}])
-+m4trace:configure.in:930: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe03"], [unset ac_cv_lib_gss_csf_gss_acq_user;
++m4trace:configure.in:926: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
++m4trace:configure.in:926: -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:926: -1- AC_CHECK_LIB([krb5support], [krb5int_getspecific], [K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a], [], [${LIB_SOCKET}])
++m4trace:configure.in:926: -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:926: -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:930: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe"], [gss_failed=1], [$GSSAPIBASE_LIBS -lgss])
-+m4trace:configure.in:930: -1- AC_CHECK_LIB([gss], [gss_unwrap], [gss_impl="seam"], [gss_failed=1], [-lgss])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++m4trace:configure.in:926: -1- AC_CHECK_LIB([gss], [csf_gss_acq_user], [gss_impl="cybersafe"], [gss_failed=1], [$GSSAPIBASE_LIBS -lgss])
++m4trace:configure.in:926: -1- AC_CHECK_LIB([gss], [gss_unwrap], [gss_impl="seam"], [gss_failed=1], [-lgss])
++m4trace:configure.in:926: -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:264: SASL_GSSAPI_CHK is expanded from...
-+configure.in:930: SASL_GSSAPI_CHK is required by...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
++configure.in:926: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -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:264: SASL_GSSAPI_CHK is expanded from...
-+configure.in:930: SASL_GSSAPI_CHK is required by...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
++cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
++configure.in:926: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:926: -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:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++m4trace:configure.in:926: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
 +You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
 +autoconf/general.m4:2129: AC_EGREP_CPP is expanded from...
-+cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
-+configure.in:930: SASL_GSSAPI_CHK is required by...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
++cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
++configure.in:926: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:926: -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:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
-+m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_HOSTBASED_SERVICE], [/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
++m4trace:configure.in:926: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_HOSTBASED_SERVICE])
++m4trace:configure.in:926: -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:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
++m4trace:configure.in:926: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:926: -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:930: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
++m4trace:configure.in:926: -1- _m4_warn([obsolete], [The macro `AC_WARN' is obsolete.
 +You should run autoupdate.], [autoconf/oldnames.m4:54: AC_WARN is expanded from...
 +autoconf/general.m4:2129: AC_EGREP_CPP is expanded from...
-+cmulocal/sasl2.m4:264: SASL_GSSAPI_CHK is expanded from...
-+configure.in:930: SASL_GSSAPI_CHK is required by...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
++cmulocal/sasl2.m4:267: SASL_GSSAPI_CHK is expanded from...
++configure.in:926: SASL_GSSAPI_CHK is required by...
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:926: -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:930: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
-+m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSS_C_NT_USER_NAME], [/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
++m4trace:configure.in:926: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GSS_C_NT_USER_NAME])
++m4trace:configure.in:926: -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:930: -1- AC_CHECK_LIB([resolv], [res_search], [GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"])
-+m4trace:configure.in:930: -1- AC_CHECK_FUNCS([gsskrb5_register_acceptor_identity])
-+m4trace:configure.in:930: -1- AH_OUTPUT([HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY], [/* Define to 1 if you have the `gsskrb5_register_acceptor_identity\' function.
++m4trace:configure.in:926: -1- AC_CHECK_LIB([resolv], [res_search], [GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"])
++m4trace:configure.in:926: -1- AC_CHECK_FUNCS([gsskrb5_register_acceptor_identity])
++m4trace:configure.in:926: -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:930: -1- AC_SUBST([GSSAPI_LIBS])
-+m4trace:configure.in:930: -1- AC_SUBST([GSSAPIBASE_LIBS])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++m4trace:configure.in:926: -1- AC_SUBST([GSSAPI_LIBS])
++m4trace:configure.in:926: -1- AC_SUBST([GSSAPIBASE_LIBS])
++m4trace:configure.in:926: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
 +autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
 +autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
 +You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
 +autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
 +autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
-+cmulocal/sasl2.m4:400: CMU_SASL2 is expanded from...
-+configure.in:930: CMU_SASL2 is required by...
-+cmulocal/sasl2.m4:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- CMU_ADD_LIBPATH_TO([$ac_cv_sasl_where_lib], [LIB_DYN_SASL])
-+m4trace:configure.in:930: -1- AC_CHECK_LIB([sasl2], [prop_get], [ac_cv_found_sasl=yes], [ac_cv_found_sasl=no])
-+m4trace:configure.in:930: -1- CMU_ADD_LIBPATH_TO([$ac_cv_sasl_where_lib], [DYNLIB_SASL])
-+m4trace:configure.in:930: -1- AC_SUBST([LIB_DYN_SASL])
-+m4trace:configure.in:930: -1- AC_SUBST([DYNSASLFLAGS])
-+m4trace:configure.in:930: -1- AC_SUBST([LIB_SASL])
-+m4trace:configure.in:930: -1- AC_SUBST([SASLFLAGS])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++cmulocal/sasl2.m4:403: CMU_SASL2 is expanded from...
++configure.in:926: CMU_SASL2 is required by...
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- AC_CHECK_LIB([sasl2], [prop_get], [ac_cv_found_sasl=yes], [ac_cv_found_sasl=no])
++m4trace:configure.in:926: -1- AC_SUBST([LIB_DYN_SASL])
++m4trace:configure.in:926: -1- AC_SUBST([DYNSASLFLAGS])
++m4trace:configure.in:926: -1- AC_SUBST([LIB_SASL])
++m4trace:configure.in:926: -1- AC_SUBST([SASLFLAGS])
++m4trace:configure.in:926: -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:410: CMU_SASL2_REQUIRED is expanded from...
-+configure.in:930: CMU_SASL2_REQUIRED is required by...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++cmulocal/sasl2.m4:413: CMU_SASL2_REQUIRED is expanded from...
++configure.in:926: CMU_SASL2_REQUIRED is required by...
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:930: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:926: -1- _m4_warn([obsolete], [The macro `AC_ERROR' is obsolete.
 +You should run autoupdate.], [autoconf/oldnames.m4:55: AC_ERROR is expanded from...
 +autoconf/general.m4:2087: _AC_PREPROC_IFELSE is expanded from...
 +autoconf/general.m4:2097: AC_PREPROC_IFELSE is expanded from...
 +autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
-+cmulocal/sasl2.m4:441: CMU_SASL2_REQUIRE_VER is expanded from...
-+configure.in:930: the top level])
-+m4trace:configure.in:931: -1- CMU_SASL2_CHECKAPOP_REQUIRED
-+m4trace:configure.in:931: -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:931: -1- AC_DEFINE_TRACE_LITERAL([HAVE_APOP])
-+m4trace:configure.in:931: -1- AH_OUTPUT([HAVE_APOP], [/* Does SASL support APOP? */
++cmulocal/sasl2.m4:444: CMU_SASL2_REQUIRE_VER is expanded from...
++configure.in:926: the top level])
++m4trace:configure.in:927: -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:927: -1- AC_DEFINE_TRACE_LITERAL([HAVE_APOP])
++m4trace:configure.in:927: -1- AH_OUTPUT([HAVE_APOP], [/* Does SASL support APOP? */
 +#undef HAVE_APOP])
-+m4trace:configure.in:944: -1- AC_SUBST([PERL])
-+m4trace:configure.in:960: -1- AC_SUBST([PERL_CCCDLFLAGS])
-+m4trace:configure.in:978: -2- AC_CHECK_LIB([md], [MD5Init], [LIBS="${LIBS} -lmd"], [MD5OBJ="md5.o"])
-+m4trace:configure.in:978: -1- _m4_warn([obsolete], [The macro `AC_FUNC_CHECK' is obsolete.
++m4trace:configure.in:940: -1- AC_SUBST([PERL])
++m4trace:configure.in:956: -1- AC_SUBST([PERL_CCCDLFLAGS])
++m4trace:configure.in:974: -2- AC_CHECK_LIB([md], [MD5Init], [LIBS="${LIBS} -lmd"], [MD5OBJ="md5.o"])
++m4trace:configure.in:974: -1- _m4_warn([obsolete], [The macro `AC_FUNC_CHECK' is obsolete.
 +You should run autoupdate.], [autoconf/functions.m4:111: AC_FUNC_CHECK is expanded from...
-+configure.in:978: the top level])
-+m4trace:configure.in:979: -1- AC_SUBST([MD5OBJ])
-+m4trace:configure.in:984: -1- AC_SUBST([SNMP_SUBDIRS])
-+m4trace:configure.in:986: -1- CMU_LIBWRAP
-+m4trace:configure.in:986: -1- CMU_FIND_LIB_SUBDIR
-+m4trace:configure.in:986: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++configure.in:974: the top level])
++m4trace:configure.in:975: -1- AC_SUBST([MD5OBJ])
++m4trace:configure.in:980: -1- AC_SUBST([SNMP_SUBDIRS])
++m4trace:configure.in:982: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
 +You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
 +cmulocal/common.m4:61: CMU_FIND_LIB_SUBDIR is expanded from...
-+configure.in:986: CMU_FIND_LIB_SUBDIR is required by...
++configure.in:982: CMU_FIND_LIB_SUBDIR is required by...
 +cmulocal/libwrap.m4:30: CMU_LIBWRAP is expanded from...
-+configure.in:986: the top level])
-+m4trace:configure.in:986: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
-+m4trace:configure.in:986: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of a `long\', as computed by sizeof. */
++configure.in:982: the top level])
++m4trace:configure.in:982: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_LONG])
++m4trace:configure.in:982: -1- AH_OUTPUT([SIZEOF_LONG], [/* The size of a `long\', as computed by sizeof. */
 +#undef SIZEOF_LONG])
-+m4trace:configure.in:986: -1- AC_SUBST([CMU_LIB_SUBDIR], [$ac_cv_cmu_lib_subdir])
-+m4trace:configure.in:986: -1- AC_CHECK_LIB([wrap], [request_init], [
++m4trace:configure.in:982: -1- AC_SUBST([CMU_LIB_SUBDIR], [$ac_cv_cmu_lib_subdir])
++m4trace:configure.in:982: -1- AC_CHECK_LIB([wrap], [request_init], [
 +		 AC_CHECK_HEADER(tcpd.h,, with_libwrap=no)], [with_libwrap=no], [${LIB_SOCKET}])
-+m4trace:configure.in:986: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWRAP])
-+m4trace:configure.in:986: -1- AH_OUTPUT([HAVE_LIBWRAP], [/* Do we have TCP wrappers? */
++m4trace:configure.in:982: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBWRAP])
++m4trace:configure.in:982: -1- AH_OUTPUT([HAVE_LIBWRAP], [/* Do we have TCP wrappers? */
 +#undef HAVE_LIBWRAP])
-+m4trace:configure.in:986: -1- AC_CHECK_LIB([nsl], [yp_get_default_domain], [LIB_WRAP="${LIB_WRAP} -lnsl"])
-+m4trace:configure.in:986: -1- AC_SUBST([LIB_WRAP])
-+m4trace:configure.in:987: -1- CMU_UCDSNMP
-+m4trace:configure.in:987: -1- AC_SUBST([SNMP_CONFIG], [$ac_cv_path_SNMP_CONFIG])
-+m4trace:configure.in:987: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NETSNMP])
-+m4trace:configure.in:987: -1- AH_OUTPUT([HAVE_NETSNMP], [/* Do we have Net-SNMP support? */
++m4trace:configure.in:982: -1- AC_CHECK_LIB([nsl], [yp_get_default_domain], [LIB_WRAP="${LIB_WRAP} -lnsl"])
++m4trace:configure.in:982: -1- AC_SUBST([LIB_WRAP])
++m4trace:configure.in:983: -1- AC_SUBST([SNMP_CONFIG], [$ac_cv_path_SNMP_CONFIG])
++m4trace:configure.in:983: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NETSNMP])
++m4trace:configure.in:983: -1- AH_OUTPUT([HAVE_NETSNMP], [/* Do we have Net-SNMP support? */
 +#undef HAVE_NETSNMP])
-+m4trace:configure.in:987: -1- AC_SUBST([LIB_UCDSNMP])
-+m4trace:configure.in:987: -1- AC_CHECK_LIB([snmp], [sprint_objid], [
++m4trace:configure.in:983: -1- AC_SUBST([LIB_UCDSNMP])
++m4trace:configure.in:983: -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:987: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UCDSNMP])
-+m4trace:configure.in:987: -1- AH_OUTPUT([HAVE_UCDSNMP], [/* Do we have UCD-SNMP support? */
++m4trace:configure.in:983: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UCDSNMP])
++m4trace:configure.in:983: -1- AH_OUTPUT([HAVE_UCDSNMP], [/* Do we have UCD-SNMP support? */
 +#undef HAVE_UCDSNMP])
-+m4trace:configure.in:987: -1- AC_CHECK_LIB([rpm], [rpmdbOpen], [LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"], [], [-lpopt])
-+m4trace:configure.in:987: -1- AC_SUBST([LIB_UCDSNMP])
-+m4trace:configure.in:1022: -1- AC_SUBST([LIB_RT])
-+m4trace:configure.in:1023: -1- AC_SUBST([IMAP_COM_ERR_LIBS])
-+m4trace:configure.in:1024: -1- AC_SUBST([IMAP_LIBS])
-+m4trace:configure.in:1032: -1- AC_SUBST([PERL_SUBDIRS])
-+m4trace:configure.in:1033: -1- AC_SUBST([PERL_DEPSUBDIRS])
-+m4trace:configure.in:1034: -1- AC_SUBST([PERL])
-+m4trace:configure.in:1080: -1- AH_OUTPUT([00001], [
++m4trace:configure.in:983: -1- AC_CHECK_LIB([rpm], [rpmdbOpen], [LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"], [], [-lpopt])
++m4trace:configure.in:983: -1- AC_SUBST([LIB_UCDSNMP])
++m4trace:configure.in:1018: -1- AC_SUBST([LIB_RT])
++m4trace:configure.in:1019: -1- AC_SUBST([IMAP_COM_ERR_LIBS])
++m4trace:configure.in:1020: -1- AC_SUBST([IMAP_LIBS])
++m4trace:configure.in:1028: -1- AC_SUBST([PERL_SUBDIRS])
++m4trace:configure.in:1029: -1- AC_SUBST([PERL_DEPSUBDIRS])
++m4trace:configure.in:1030: -1- AC_SUBST([PERL])
++m4trace:configure.in:1076: -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.
@@ -40403,7 +38593,7 @@
 +#ifndef _CYRUS_IMAPD_CONFIG_H_
 +#define _CYRUS_IMAPD_CONFIG_H_
 +])
-+m4trace:configure.in:1229: -1- AH_OUTPUT([zzzz2], [
++m4trace:configure.in:1225: -1- AH_OUTPUT([zzzz2], [
 +/* time.h */
 +#if TIME_WITH_SYS_TIME
 +# include <sys/time.h>
@@ -40551,14 +38741,14 @@
 +
 +#endif /* _CYRUS_IMAPD_CONFIG_H_ */
 +])
-+m4trace:configure.in:1232: -1- AC_CONFIG_FILES([man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile])
-+m4trace:configure.in:1232: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
++m4trace:configure.in:1228: -1- AC_CONFIG_FILES([man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile])
++m4trace:configure.in:1228: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 +You should run autoupdate.], [])
-+m4trace:configure.in:1232: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
-+m4trace:configure.in:1232: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-diff -urNad cyrus-imapd-2.2.13/autom4te.cache/traces.1 /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.1
++m4trace:configure.in:1228: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
++m4trace:configure.in:1228: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+diff -urNad cyrus-imapd-2.2.13/autom4te.cache/traces.1 /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/autom4te.cache/traces.1
 --- cyrus-imapd-2.2.13/autom4te.cache/traces.1	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/autom4te.cache/traces.1	2006-05-19 15:21:21.143750070 +0200
++++ /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/autom4te.cache/traces.1	2006-09-25 20:31:30.867142029 +0200
 @@ -0,0 +1,1152 @@
 +m4trace:aclocal.m4:14: -1- m4_include([cmulocal/berkdb.m4])
 +m4trace:aclocal.m4:15: -1- m4_include([cmulocal/bsd_sockets.m4])
@@ -41712,9 +39902,9 @@
 +You should run autoupdate.], [])
 +m4trace:configure.in:1232: -1- AC_SUBST([LIB@&t at OBJS], [$ac_libobjs])
 +m4trace:configure.in:1232: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-diff -urNad cyrus-imapd-2.2.13/config.guess /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.guess
+diff -urNad cyrus-imapd-2.2.13/config.guess /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/config.guess
 --- cyrus-imapd-2.2.13/config.guess	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.guess	2006-05-19 15:21:36.444311811 +0200
++++ /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/config.guess	2006-09-25 20:40:46.454024887 +0200
 @@ -0,0 +1,1465 @@
 +#! /bin/sh
 +# Attempt to guess a canonical system name.
@@ -43181,9 +41371,9 @@
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
-diff -urNad cyrus-imapd-2.2.13/config.h.in /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.h.in
---- cyrus-imapd-2.2.13/config.h.in	2006-05-12 12:23:20.000000000 +0200
-+++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.h.in	2006-05-19 15:21:21.149749506 +0200
+diff -urNad cyrus-imapd-2.2.13/config.h.in /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/config.h.in
+--- cyrus-imapd-2.2.13/config.h.in	2006-09-14 22:40:11.000000000 +0200
++++ /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/config.h.in	2006-09-25 20:31:30.870141743 +0200
 @@ -153,8 +153,8 @@
  /* Do we have TCP wrappers? */
  #undef HAVE_LIBWRAP
@@ -43232,9 +41422,9 @@
  };
  
  #endif /* _CYRUS_IMAPD_CONFIG_H_ */
-diff -urNad cyrus-imapd-2.2.13/config.sub /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.sub
+diff -urNad cyrus-imapd-2.2.13/config.sub /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/config.sub
 --- cyrus-imapd-2.2.13/config.sub	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/config.sub	2006-05-19 15:21:36.442311999 +0200
++++ /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/config.sub	2006-09-25 20:40:50.574630355 +0200
 @@ -0,0 +1,1569 @@
 +#! /bin/sh
 +# Configuration validation subroutine script.
@@ -44805,9 +42995,9 @@
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
-diff -urNad cyrus-imapd-2.2.13/configure /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/configure
---- cyrus-imapd-2.2.13/configure	2006-05-12 12:23:20.000000000 +0200
-+++ /tmp/dpep.MdX5m2/cyrus-imapd-2.2.13/configure	2006-05-19 15:21:21.165748002 +0200
+diff -urNad cyrus-imapd-2.2.13/configure /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/configure
+--- cyrus-imapd-2.2.13/configure	2006-09-14 22:40:11.000000000 +0200
++++ /tmp/dpep.5ZWGyF/cyrus-imapd-2.2.13/configure	2006-09-25 20:40:36.717957053 +0200
 @@ -309,7 +309,7 @@
  # include <unistd.h>
  #endif"
@@ -46367,7 +44557,7 @@
 +{
 +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
 +test_array [0] = 0
- 
++
 +  ;
 +  return 0;
 +}
@@ -46412,6 +44602,46 @@
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++test_array [0] = 0
+ 
++  ;
++  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_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -46421,7 +44651,7 @@
  int
  main ()
  {
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
 +test_array [0] = 0
  
    ;
@@ -46456,46 +44686,6 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  andrew_runpath_switch="-Wl,-rpath,"
-+  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
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  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_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
@@ -46540,7 +44730,7 @@
 +{
 +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
 +test_array [0] = 0
-+
+ 
 +  ;
 +  return 0;
 +}
@@ -46570,7 +44760,7 @@
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
++
 +ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
 -echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
@@ -47236,7 +45426,87 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9920,8 +10739,7 @@
+@@ -9726,54 +10545,51 @@
+ 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
++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
++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 { (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); } >/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'
++  { (eval 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
+   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 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
++         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
+@@ -9920,8 +10736,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47246,7 +45516,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9981,8 +10799,7 @@
+@@ -9981,8 +10796,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47256,7 +45526,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10228,8 +11045,7 @@
+@@ -10228,8 +11042,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47266,7 +45536,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10322,8 +11138,7 @@
+@@ -10322,8 +11135,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47276,7 +45546,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10431,8 +11246,7 @@
+@@ -10431,8 +11243,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47286,7 +45556,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10502,8 +11316,7 @@
+@@ -10502,8 +11313,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47296,7 +45566,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10613,8 +11426,7 @@
+@@ -10613,8 +11423,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47306,7 +45576,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10682,8 +11494,7 @@
+@@ -10682,8 +11491,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47316,7 +45586,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10752,8 +11563,7 @@
+@@ -10752,8 +11560,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47326,7 +45596,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10882,8 +11692,7 @@
+@@ -10882,8 +11689,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47336,7 +45606,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10998,8 +11807,7 @@
+@@ -10998,8 +11804,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47346,7 +45616,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11128,8 +11936,7 @@
+@@ -11128,8 +11933,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47356,7 +45626,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11218,8 +12025,7 @@
+@@ -11218,8 +12022,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47366,7 +45636,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11328,8 +12134,7 @@
+@@ -11328,8 +12131,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47376,7 +45646,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11475,8 +12280,7 @@
+@@ -11475,8 +12277,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47386,7 +45656,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11589,8 +12393,7 @@
+@@ -11589,8 +12390,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47396,7 +45666,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11661,8 +12464,7 @@
+@@ -11661,8 +12461,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47406,7 +45676,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11731,8 +12533,7 @@
+@@ -11731,8 +12530,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47416,7 +45686,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11886,8 +12687,7 @@
+@@ -11886,8 +12684,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47426,7 +45696,17 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12029,8 +12829,7 @@
+@@ -11959,9 +12756,6 @@
+   WITH_IDLE="poll"
+ fi;
+ 
+-if test "$WITH_IDLE" = "idled"; then
+-  IMAP_PROGS="$IMAP_PROGS idled"
+-fi
+ 
+ ENABLE_NNTP=no
+ # Check whether --enable-nntp or --disable-nntp was given.
+@@ -12029,8 +12823,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47436,7 +45716,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12091,8 +12890,7 @@
+@@ -12091,8 +12884,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47446,7 +45726,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12235,8 +13033,7 @@
+@@ -12235,8 +13027,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47456,7 +45736,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12676,8 +13473,7 @@
+@@ -12676,8 +13467,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47466,7 +45746,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12839,8 +13635,7 @@
+@@ -12839,8 +13629,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47476,7 +45756,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12906,8 +13701,7 @@
+@@ -12906,8 +13695,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47486,7 +45766,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13008,8 +13802,7 @@
+@@ -13008,8 +13796,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47496,7 +45776,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13074,8 +13867,7 @@
+@@ -13074,8 +13861,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47506,7 +45786,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13208,8 +14000,7 @@
+@@ -13208,8 +13994,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47516,7 +45796,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13352,8 +14143,7 @@
+@@ -13352,8 +14137,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47526,7 +45806,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13523,8 +14313,7 @@
+@@ -13523,8 +14307,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47536,7 +45816,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13613,8 +14402,7 @@
+@@ -13613,8 +14396,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47546,7 +45826,92 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13690,8 +14478,7 @@
+@@ -13651,6 +14433,75 @@
+   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 gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char krb5int_getspecific ();
++int
++main ()
++{
++krb5int_getspecific ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_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 conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_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
+@@ -13658,7 +14509,7 @@
+   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 ${LIB_SOCKET} $LIBS"
++LIBS="-lgssapi_krb5 ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -13690,8 +14541,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47556,7 +45921,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13785,8 +14572,7 @@
+@@ -13785,8 +14635,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47566,7 +45931,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13853,8 +14639,7 @@
+@@ -13853,8 +14702,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47576,7 +45941,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13939,8 +14724,7 @@
+@@ -13939,8 +14787,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47586,7 +45951,18 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14198,8 +14982,7 @@
+@@ -13977,8 +14824,8 @@
+   fi
+ 
+   if test "$gss_impl" = "mit"; then
+-    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+-    GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
++    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"
+@@ -14198,8 +15045,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47596,7 +45972,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14303,8 +15086,7 @@
+@@ -14303,8 +15149,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47606,7 +45982,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14422,8 +15204,7 @@
+@@ -14422,8 +15267,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47616,7 +45992,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14560,8 +15341,7 @@
+@@ -14560,8 +15404,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47626,7 +46002,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14752,8 +15532,7 @@
+@@ -14752,8 +15595,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47636,7 +46012,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14890,8 +15669,7 @@
+@@ -14890,8 +15732,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47646,7 +46022,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15036,8 +15814,7 @@
+@@ -15036,8 +15877,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47656,7 +46032,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15227,8 +16004,7 @@
+@@ -15227,8 +16067,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47666,7 +46042,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15417,8 +16193,7 @@
+@@ -15417,8 +16256,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47676,7 +46052,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15483,8 +16258,7 @@
+@@ -15483,8 +16321,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47686,7 +46062,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15560,8 +16334,7 @@
+@@ -15560,8 +16397,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47696,7 +46072,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15623,8 +16396,7 @@
+@@ -15623,8 +16459,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47706,7 +46082,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15664,8 +16436,7 @@
+@@ -15664,8 +16499,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47716,7 +46092,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15721,8 +16492,7 @@
+@@ -15721,8 +16555,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47726,7 +46102,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15762,8 +16532,7 @@
+@@ -15762,8 +16595,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47736,7 +46112,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15827,8 +16596,7 @@
+@@ -15827,8 +16659,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47746,7 +46122,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15859,10 +16627,8 @@
+@@ -15859,10 +16690,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -47759,7 +46135,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -16021,8 +16787,7 @@
+@@ -16021,8 +16850,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47769,7 +46145,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16079,8 +16844,7 @@
+@@ -16079,8 +16907,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47779,7 +46155,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16249,8 +17013,7 @@
+@@ -16249,8 +17076,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47789,7 +46165,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16417,8 +17180,7 @@
+@@ -16417,8 +17243,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47799,7 +46175,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16475,8 +17237,7 @@
+@@ -16475,8 +17300,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47809,7 +46185,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16645,8 +17406,7 @@
+@@ -16645,8 +17469,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -47819,7 +46195,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -17357,6 +18117,7 @@
+@@ -17357,6 +18180,7 @@
  s, at host_cpu@,$host_cpu,;t t
  s, at host_vendor@,$host_vendor,;t t
  s, at host_os@,$host_os,;t t
@@ -47827,7 +46203,7 @@
  s, at MAKEDEPEND@,$MAKEDEPEND,;t t
  s, at cyrus_prefix@,$cyrus_prefix,;t t
  s, at service_path@,$service_path,;t t
-@@ -17604,11 +18365,6 @@
+@@ -17604,11 +18428,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -47839,7 +46215,7 @@
    # 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.  */
-@@ -17647,6 +18403,12 @@
+@@ -17647,6 +18466,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }




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