debian/{configure,control}: regenerated

1 files changed, 257 insertions, 583 deletions

diff --git a/debian/configure b/debian/configure
index e98b87a..453d69b 100644
--- a/debian/configure
+++ b/debian/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 8.14.4 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Sendmail 8.14.4.
+# Generated by GNU Autoconf 2.69 for Sendmail 8.14.4.
 #
 # Report bugs to <bug/reportbug or sendmail@packages.debian.org>.
 #
@@ -14,7 +14,7 @@
 #    Copyright (c) 1998-2010 Richard Nelson.	All Rights Reserved.
 #
 #    Sendmail 8.14.4
-#    Generated by Autoconf 2.67,  Automake _am_version
+#    Generated by Autoconf 2.69,  Automake _am_version
 #
 #    Debian configure script for building Sendmail
 # 	 Note: this file supports Sendmail 8.7.6 - 9.0.0
@@ -25,9 +25,7 @@
 #
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -111,6 +109,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -155,6 +154,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -188,7 +212,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -233,14 +258,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -343,6 +379,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -464,6 +508,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -498,16 +546,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -519,28 +567,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -691,6 +719,7 @@ CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -1253,7 +1282,7 @@ Try \`$0 --help' for more information"
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1304,8 +1333,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1575,9 +1602,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 Sendmail configure 8.14.4
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
@@ -1590,7 +1617,7 @@ cat <<EOF
    Copyright (c) 1998-2010 Richard Nelson.	All Rights Reserved.
 
    Sendmail 8.14.4
-   Generated by Autoconf 2.67,  Automake _am_version
+   Generated by Autoconf 2.69,  Automake _am_version
 
    Debian configure script for building Sendmail
 	 Note: this file supports Sendmail 8.7.6 - 9.0.0
@@ -1640,7 +1667,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1677,7 +1704,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1719,7 +1746,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1732,10 +1759,10 @@ fi
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1802,7 +1829,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1811,7 +1838,7 @@ eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1824,7 +1851,7 @@ ac_fn_c_check_header_compile ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1842,7 +1869,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -1873,7 +1900,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1887,7 +1914,7 @@ fi
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1900,7 +1927,7 @@ ac_fn_c_check_func ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1955,7 +1982,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 cat >config.log <<_ACEOF
@@ -1963,7 +1990,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by Sendmail $as_me 8.14.4, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2221,7 +2248,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2345,7 +2372,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
@@ -2361,7 +2388,7 @@ fi
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2379,7 +2406,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
@@ -2394,7 +2421,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2412,7 +2439,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
+if ${ac_cv_target+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
@@ -2427,7 +2454,7 @@ fi
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -2462,7 +2489,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2472,7 +2499,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2505,7 +2532,7 @@ $as_echo "$MKDIR_P" >&6; }
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2551,7 +2578,7 @@ am__api_version='1.11'
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2571,7 +2598,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2638,11 +2665,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2718,7 +2745,7 @@ if test "$cross_compiling" != no; then
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2730,7 +2757,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2758,7 +2785,7 @@ if test -z "$ac_cv_prog_STRIP"; then
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2770,7 +2797,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2820,7 +2847,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2832,7 +2859,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2917,11 +2944,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -2950,7 +2977,7 @@ fi
   MAINT=$MAINTAINER_MODE_TRUE
 
 
-ac_version="2.67";
+ac_version="2.69";
 am_version="_am_version";
 
 
@@ -3314,7 +3341,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3326,7 +3353,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3354,7 +3381,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3366,7 +3393,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3407,7 +3434,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3419,7 +3446,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3447,7 +3474,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3460,7 +3487,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3506,7 +3533,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3518,7 +3545,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3550,7 +3577,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3562,7 +3589,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3605,7 +3632,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3720,7 +3747,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3763,7 +3790,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3822,7 +3849,7 @@ $as_echo "$ac_try_echo"; } >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3833,7 +3860,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3874,7 +3901,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3884,7 +3911,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3921,7 +3948,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3999,7 +4026,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4008,8 +4035,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4145,6 +4171,7 @@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -4160,7 +4187,7 @@ depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4169,6 +4196,7 @@ else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4228,7 +4256,7 @@ else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -4295,7 +4323,7 @@ if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -4411,7 +4439,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4434,7 +4462,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4448,7 +4476,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4497,7 +4525,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4514,7 +4542,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4567,7 +4595,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4970,7 +4998,7 @@ done
 for ac_header in libmilter/mfapi.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
-if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then :
+if test "x$ac_cv_header_libmilter_mfapi_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBMILTER_MFAPI_H 1
 _ACEOF
@@ -4990,7 +5018,7 @@ $as_echo_n "checking libmilter version... " >&6; }
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5103,7 +5131,7 @@ if test $sm_enable_regex != no; then
 	for ac_header in regex.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default"
-if test "x$ac_cv_header_regex_h" = x""yes; then :
+if test "x$ac_cv_header_regex_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_REGEX_H 1
 _ACEOF
@@ -5118,7 +5146,7 @@ done
 
 	if test $ac_cv_header_regex_h = yes ; then
 		ac_fn_c_check_func "$LINENO" "regfree" "ac_cv_func_regfree"
-if test "x$ac_cv_func_regfree" = x""yes; then :
+if test "x$ac_cv_func_regfree" = xyes; then :
   :
 
 else
@@ -5191,7 +5219,7 @@ $as_echo "$as_me: WARNING: DB emulation of ndbm not sufficient, -lndbm ignored"
 	if test $sm_have_ndbm != no; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lndbm" >&5
 $as_echo_n "checking for main in -lndbm... " >&6; }
-if test "${ac_cv_lib_ndbm_main+set}" = set; then :
+if ${ac_cv_lib_ndbm_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5219,7 +5247,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ndbm_main" >&5
 $as_echo "$ac_cv_lib_ndbm_main" >&6; }
-if test "x$ac_cv_lib_ndbm_main" = x""yes; then :
+if test "x$ac_cv_lib_ndbm_main" = xyes; then :
   sm_have_ndmb=yes
 
 else
@@ -5425,287 +5453,7 @@ $as_echo "$as_me: WARNING: NEWDB version unknown, omitting support!" >&2;}
 		if test $sm_newdb_lib = db4; then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb" >&5
 $as_echo_n "checking for db_create in -ldb... " >&6; }
-if test "${ac_cv_lib_db_4_8_db_create+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char db_create ();
-int
-main ()
-{
-return db_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_db_4_8_db_create=yes
-else
-  ac_cv_lib_db_4_8_db_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_4_8_db_create" >&5
-$as_echo "$ac_cv_lib_db_4_8_db_create" >&6; }
-if test "x$ac_cv_lib_db_4_8_db_create" = x""yes; then :
-  sm_newdb_lib='db'
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb-4.7" >&5
-$as_echo_n "checking for db_create in -ldb-4.7... " >&6; }
-if test "${ac_cv_lib_db_4_7_db_create+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb-4.7  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char db_create ();
-int
-main ()
-{
-return db_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_db_4_7_db_create=yes
-else
-  ac_cv_lib_db_4_7_db_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_4_7_db_create" >&5
-$as_echo "$ac_cv_lib_db_4_7_db_create" >&6; }
-if test "x$ac_cv_lib_db_4_7_db_create" = x""yes; then :
-  sm_newdb_lib='db-4.7'
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb-4.6" >&5
-$as_echo_n "checking for db_create in -ldb-4.6... " >&6; }
-if test "${ac_cv_lib_db_4_6_db_create+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb-4.6  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char db_create ();
-int
-main ()
-{
-return db_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_db_4_6_db_create=yes
-else
-  ac_cv_lib_db_4_6_db_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_4_6_db_create" >&5
-$as_echo "$ac_cv_lib_db_4_6_db_create" >&6; }
-if test "x$ac_cv_lib_db_4_6_db_create" = x""yes; then :
-  sm_newdb_lib='db-4.6'
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb-4.5" >&5
-$as_echo_n "checking for db_create in -ldb-4.5... " >&6; }
-if test "${ac_cv_lib_db_4_5_db_create+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb-4.5  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char db_create ();
-int
-main ()
-{
-return db_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_db_4_5_db_create=yes
-else
-  ac_cv_lib_db_4_5_db_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_4_5_db_create" >&5
-$as_echo "$ac_cv_lib_db_4_5_db_create" >&6; }
-if test "x$ac_cv_lib_db_4_5_db_create" = x""yes; then :
-  sm_newdb_lib='db-4.5'
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb-4.4" >&5
-$as_echo_n "checking for db_create in -ldb-4.4... " >&6; }
-if test "${ac_cv_lib_db_4_4_db_create+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb-4.4  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char db_create ();
-int
-main ()
-{
-return db_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_db_4_4_db_create=yes
-else
-  ac_cv_lib_db_4_4_db_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_4_4_db_create" >&5
-$as_echo "$ac_cv_lib_db_4_4_db_create" >&6; }
-if test "x$ac_cv_lib_db_4_4_db_create" = x""yes; then :
-  sm_newdb_lib='db-4.4'
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb-4.3" >&5
-$as_echo_n "checking for db_create in -ldb-4.3... " >&6; }
-if test "${ac_cv_lib_db_4_3_db_create+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb-4.3  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char db_create ();
-int
-main ()
-{
-return db_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_db_4_3_db_create=yes
-else
-  ac_cv_lib_db_4_3_db_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_4_3_db_create" >&5
-$as_echo "$ac_cv_lib_db_4_3_db_create" >&6; }
-if test "x$ac_cv_lib_db_4_3_db_create" = x""yes; then :
-  sm_newdb_lib='db-4.3'
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create_4002 in -ldb-4.2" >&5
-$as_echo_n "checking for db_create_4002 in -ldb-4.2... " >&6; }
-if test "${ac_cv_lib_db_4_2_db_create_4002+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldb-4.2  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char db_create_4002 ();
-int
-main ()
-{
-return db_create_4002 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_db_4_2_db_create_4002=yes
-else
-  ac_cv_lib_db_4_2_db_create_4002=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_4_2_db_create_4002" >&5
-$as_echo "$ac_cv_lib_db_4_2_db_create_4002" >&6; }
-if test "x$ac_cv_lib_db_4_2_db_create_4002" = x""yes; then :
-  sm_newdb_lib='db-4.2'
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb" >&5
-$as_echo_n "checking for db_create in -ldb... " >&6; }
-if test "${ac_cv_lib_db_db_create+set}" = set; then :
+if ${ac_cv_lib_db_db_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5739,31 +5487,17 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_db_create" >&5
 $as_echo "$ac_cv_lib_db_db_create" >&6; }
-if test "x$ac_cv_lib_db_db_create" = x""yes; then :
+if test "x$ac_cv_lib_db_db_create" = xyes; then :
   sm_newdb_lib='db'
 else
 
 			sm_have_newdb=no
 fi
-
-fi
-
-fi
-
-fi
-
-fi
-
-fi
-
-fi
-
-fi
 		elif test $sm_newdb_lib = db3; then
 			as_ac_Lib=`$as_echo "ac_cv_lib_$sm_newdb_lib''_db_create" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -l$sm_newdb_lib" >&5
 $as_echo_n "checking for db_create in -l$sm_newdb_lib... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5804,7 +5538,7 @@ else
 
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb" >&5
 $as_echo_n "checking for db_create in -ldb... " >&6; }
-if test "${ac_cv_lib_db_db_create+set}" = set; then :
+if ${ac_cv_lib_db_db_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5838,7 +5572,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_db_create" >&5
 $as_echo "$ac_cv_lib_db_db_create" >&6; }
-if test "x$ac_cv_lib_db_db_create" = x""yes; then :
+if test "x$ac_cv_lib_db_db_create" = xyes; then :
   sm_newdb_lib='db'
 else
   sm_have_newdb=no
@@ -5849,7 +5583,7 @@ fi
 			as_ac_Lib=`$as_echo "ac_cv_lib_$sm_newdb_lib''_db_open" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_open in -l$sm_newdb_lib" >&5
 $as_echo_n "checking for db_open in -l$sm_newdb_lib... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5890,7 +5624,7 @@ else
 
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_open in -ldb" >&5
 $as_echo_n "checking for db_open in -ldb... " >&6; }
-if test "${ac_cv_lib_db_db_open+set}" = set; then :
+if ${ac_cv_lib_db_db_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5924,7 +5658,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_db_open" >&5
 $as_echo "$ac_cv_lib_db_db_open" >&6; }
-if test "x$ac_cv_lib_db_db_open" = x""yes; then :
+if test "x$ac_cv_lib_db_db_open" = xyes; then :
   sm_newdb_lib='db'
 else
   sm_have_newdb=no
@@ -5935,7 +5669,7 @@ fi
 			as_ac_Lib=`$as_echo "ac_cv_lib_$sm_newdb_lib''_dbopen" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbopen in -l$sm_newdb_lib" >&5
 $as_echo_n "checking for dbopen in -l$sm_newdb_lib... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -5976,7 +5710,7 @@ else
 
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbopen in -ldb" >&5
 $as_echo_n "checking for dbopen in -ldb... " >&6; }
-if test "${ac_cv_lib_db_dbopen+set}" = set; then :
+if ${ac_cv_lib_db_dbopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6010,7 +5744,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_dbopen" >&5
 $as_echo "$ac_cv_lib_db_dbopen" >&6; }
-if test "x$ac_cv_lib_db_dbopen" = x""yes; then :
+if test "x$ac_cv_lib_db_dbopen" = xyes; then :
   sm_newdb_lib='db'
 else
   sm_have_newdb=no
@@ -6018,46 +5752,6 @@ fi
 
 fi
 			fi;
-		if test $sm_newdb_lib = db; then
-			as_ac_Lib=`$as_echo "ac_cv_lib_$sm_newdb_lib''_dbopen" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbopen in -l$sm_newdb_lib" >&5
-$as_echo_n "checking for dbopen in -l$sm_newdb_lib... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$sm_newdb_lib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dbopen ();
-int
-main ()
-{
-return dbopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-			fi;
 		LIBS="$sm_old_libs";
 
 		if test $sm_have_newdb != yes; then
@@ -6113,7 +5807,7 @@ if test $sm_enable_nis != no; then
 	for ac_header in rpcsvc/ypclnt.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "rpcsvc/ypclnt.h" "ac_cv_header_rpcsvc_ypclnt_h" "$ac_includes_default"
-if test "x$ac_cv_header_rpcsvc_ypclnt_h" = x""yes; then :
+if test "x$ac_cv_header_rpcsvc_ypclnt_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_RPCSVC_YPCLNT_H 1
 _ACEOF
@@ -6129,7 +5823,7 @@ done
 	if test $sm_have_nis = yes; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl" >&5
 $as_echo_n "checking for main in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_main+set}" = set; then :
+if ${ac_cv_lib_nsl_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6157,7 +5851,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_main" >&5
 $as_echo "$ac_cv_lib_nsl_main" >&6; }
-if test "x$ac_cv_lib_nsl_main" = x""yes; then :
+if test "x$ac_cv_lib_nsl_main" = xyes; then :
   sm_have_nis=yes
 
 else
@@ -6193,7 +5887,7 @@ if test $sm_enable_nisplus != no; then
 	for ac_header in rpcsvc/nis.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "rpcsvc/nis.h" "ac_cv_header_rpcsvc_nis_h" "$ac_includes_default"
-if test "x$ac_cv_header_rpcsvc_nis_h" = x""yes; then :
+if test "x$ac_cv_header_rpcsvc_nis_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_RPCSVC_NIS_H 1
 _ACEOF
@@ -6210,7 +5904,7 @@ done
 	&& [ $sm_have_nis = no ]; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnsl" >&5
 $as_echo_n "checking for main in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_main+set}" = set; then :
+if ${ac_cv_lib_nsl_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6238,7 +5932,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_main" >&5
 $as_echo "$ac_cv_lib_nsl_main" >&6; }
-if test "x$ac_cv_lib_nsl_main" = x""yes; then :
+if test "x$ac_cv_lib_nsl_main" = xyes; then :
   sm_have_nis=yes
 
 else
@@ -6295,7 +5989,7 @@ done
 	if test $ac_cv_header_ldap_h = yes; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lldap" >&5
 $as_echo_n "checking for main in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_main+set}" = set; then :
+if ${ac_cv_lib_ldap_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6323,7 +6017,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_main" >&5
 $as_echo "$ac_cv_lib_ldap_main" >&6; }
-if test "x$ac_cv_lib_ldap_main" = x""yes; then :
+if test "x$ac_cv_lib_ldap_main" = xyes; then :
   sm_have_ldap=yes
 
 else
@@ -6333,7 +6027,7 @@ fi
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_init in -lldap" >&5
 $as_echo_n "checking for ldap_init in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_init+set}" = set; then :
+if ${ac_cv_lib_ldap_ldap_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6367,7 +6061,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_init" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_init" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_init" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_init" = xyes; then :
   sm_have_ldap_init=yes
 
 else
@@ -6377,7 +6071,7 @@ fi
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_memfree in -lldap" >&5
 $as_echo_n "checking for ldap_memfree in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_memfree+set}" = set; then :
+if ${ac_cv_lib_ldap_ldap_memfree+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6411,7 +6105,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_memfree" >&5
 $as_echo "$ac_cv_lib_ldap_ldap_memfree" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_memfree" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_memfree" = xyes; then :
   sm_have_ldap_memfree=yes
 
 else
@@ -6423,7 +6117,7 @@ fi
 		if test $sm_have_ldap = yes; then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -llber" >&5
 $as_echo_n "checking for main in -llber... " >&6; }
-if test "${ac_cv_lib_lber_main+set}" = set; then :
+if ${ac_cv_lib_lber_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6451,7 +6145,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_main" >&5
 $as_echo "$ac_cv_lib_lber_main" >&6; }
-if test "x$ac_cv_lib_lber_main" = x""yes; then :
+if test "x$ac_cv_lib_lber_main" = xyes; then :
   sm_have_ldap=yes
 
 else
@@ -6502,7 +6196,7 @@ $as_echo "$as_me: WARNING: Could not find OpenLDAP -lldap or -llber" >&2;}
 	&& [ $sm_have_ldap != yes ]; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lumich_ldap" >&5
 $as_echo_n "checking for main in -lumich_ldap... " >&6; }
-if test "${ac_cv_lib_umich_ldap_main+set}" = set; then :
+if ${ac_cv_lib_umich_ldap_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6530,7 +6224,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_umich_ldap_main" >&5
 $as_echo "$ac_cv_lib_umich_ldap_main" >&6; }
-if test "x$ac_cv_lib_umich_ldap_main" = x""yes; then :
+if test "x$ac_cv_lib_umich_ldap_main" = xyes; then :
   sm_have_ldap=yes
 
 else
@@ -6542,7 +6236,7 @@ fi
 		if test $sm_have_ldap = yes; then
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lumich_lber" >&5
 $as_echo_n "checking for main in -lumich_lber... " >&6; }
-if test "${ac_cv_lib_umich_lber_main+set}" = set; then :
+if ${ac_cv_lib_umich_lber_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6570,7 +6264,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_umich_lber_main" >&5
 $as_echo "$ac_cv_lib_umich_lber_main" >&6; }
-if test "x$ac_cv_lib_umich_lber_main" = x""yes; then :
+if test "x$ac_cv_lib_umich_lber_main" = xyes; then :
   sm_have_ldap=yes
 
 else
@@ -6676,7 +6370,7 @@ done
 	if test $ac_cv_header_resolv_h = yes; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_query in -lresolv" >&5
 $as_echo_n "checking for __res_query in -lresolv... " >&6; }
-if test "${ac_cv_lib_resolv___res_query+set}" = set; then :
+if ${ac_cv_lib_resolv___res_query+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6710,13 +6404,13 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_query" >&5
 $as_echo "$ac_cv_lib_resolv___res_query" >&6; }
-if test "x$ac_cv_lib_resolv___res_query" = x""yes; then :
+if test "x$ac_cv_lib_resolv___res_query" = xyes; then :
   sm_have_resolve=yes
 
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_query in -lresolv" >&5
 $as_echo_n "checking for res_query in -lresolv... " >&6; }
-if test "${ac_cv_lib_resolv_res_query+set}" = set; then :
+if ${ac_cv_lib_resolv_res_query+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6750,7 +6444,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_query" >&5
 $as_echo "$ac_cv_lib_resolv_res_query" >&6; }
-if test "x$ac_cv_lib_resolv_res_query" = x""yes; then :
+if test "x$ac_cv_lib_resolv_res_query" = xyes; then :
   sm_have_resolve=yes
 
 else
@@ -6773,7 +6467,7 @@ $as_echo "$as_me: WARNING: Could not find -lresolv" >&2;}
 	if test $ac_cv_header_bind_resolv_h = yes; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_query in -lbind" >&5
 $as_echo_n "checking for __res_query in -lbind... " >&6; }
-if test "${ac_cv_lib_bind___res_query+set}" = set; then :
+if ${ac_cv_lib_bind___res_query+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6807,7 +6501,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_query" >&5
 $as_echo "$ac_cv_lib_bind___res_query" >&6; }
-if test "x$ac_cv_lib_bind___res_query" = x""yes; then :
+if test "x$ac_cv_lib_bind___res_query" = xyes; then :
   sm_have_bind=yes
 
 else
@@ -6928,7 +6622,7 @@ if test $sm_enable_tcpd != no; then
 	for ac_header in tcpd.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "tcpd.h" "ac_cv_header_tcpd_h" "$ac_includes_default"
-if test "x$ac_cv_header_tcpd_h" = x""yes; then :
+if test "x$ac_cv_header_tcpd_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_TCPD_H 1
 _ACEOF
@@ -6974,7 +6668,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	if test $sm_have_tcpd = yes; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lwrap" >&5
 $as_echo_n "checking for main in -lwrap... " >&6; }
-if test "${ac_cv_lib_wrap_main+set}" = set; then :
+if ${ac_cv_lib_wrap_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7002,7 +6696,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wrap_main" >&5
 $as_echo "$ac_cv_lib_wrap_main" >&6; }
-if test "x$ac_cv_lib_wrap_main" = x""yes; then :
+if test "x$ac_cv_lib_wrap_main" = xyes; then :
   sm_have_tcpd=yes
 
 else
@@ -7039,7 +6733,7 @@ if test $sm_enable_ipv6 != no; then
 	for ac_header in netinet/ip6.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "netinet/ip6.h" "ac_cv_header_netinet_ip6_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_ip6_h" = x""yes; then :
+if test "x$ac_cv_header_netinet_ip6_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NETINET_IP6_H 1
 _ACEOF
@@ -7095,7 +6789,7 @@ rm -f conftest*
 		for ac_func in getaddrinfo
 do :
   ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
-if test "x$ac_cv_func_getaddrinfo" = x""yes; then :
+if test "x$ac_cv_func_getaddrinfo" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETADDRINFO 1
 _ACEOF
@@ -7140,7 +6834,7 @@ if test $sm_enable_maillock != no; then
 	for ac_header in maillock.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "maillock.h" "ac_cv_header_maillock_h" "$ac_includes_default"
-if test "x$ac_cv_header_maillock_h" = x""yes; then :
+if test "x$ac_cv_header_maillock_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MAILLOCK_H 1
 _ACEOF
@@ -7156,7 +6850,7 @@ done
 	if test $ac_cv_header_maillock_h = yes ; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -llockfile" >&5
 $as_echo_n "checking for main in -llockfile... " >&6; }
-if test "${ac_cv_lib_lockfile_main+set}" = set; then :
+if ${ac_cv_lib_lockfile_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7184,7 +6878,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lockfile_main" >&5
 $as_echo "$ac_cv_lib_lockfile_main" >&6; }
-if test "x$ac_cv_lib_lockfile_main" = x""yes; then :
+if test "x$ac_cv_lib_lockfile_main" = xyes; then :
   sm__have_maillock=yes
 
 else
@@ -7227,7 +6921,7 @@ if test $sm_enable_sfio != no; then
 	for ac_header in sfio/stdio.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sfio/stdio.h" "ac_cv_header_sfio_stdio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sfio_stdio_h" = x""yes; then :
+if test "x$ac_cv_header_sfio_stdio_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SFIO_STDIO_H 1
 _ACEOF
@@ -7244,7 +6938,7 @@ done
 	if test $ac_cv_header_sfio_stdio_h = yes ; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsfio" >&5
 $as_echo_n "checking for main in -lsfio... " >&6; }
-if test "${ac_cv_lib_sfio_main+set}" = set; then :
+if ${ac_cv_lib_sfio_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7272,7 +6966,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sfio_main" >&5
 $as_echo "$ac_cv_lib_sfio_main" >&6; }
-if test "x$ac_cv_lib_sfio_main" = x""yes; then :
+if test "x$ac_cv_lib_sfio_main" = xyes; then :
   sm_have_sfio=yes
 
 else
@@ -7386,7 +7080,7 @@ $as_echo "$as_me: WARNING: <8.12.4 & saslv$sm_auth_lib: trying saslv1" >&2;}
 	as_ac_Lib=`$as_echo "ac_cv_lib_$junk''_sasl_client_init" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -l$junk" >&5
 $as_echo_n "checking for sasl_client_init in -l$junk... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7482,7 +7176,7 @@ if test $sm_enable_tls != no; then
 	for ac_header in openssl/ssl.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then :
+if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_OPENSSL_SSL_H 1
 _ACEOF
@@ -7498,7 +7192,7 @@ done
 	if test $ac_cv_header_openssl_ssl_h = yes; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
 $as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then :
+if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7532,7 +7226,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
 $as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then :
+if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
   sm_have_tls=yes
 
 else
@@ -7643,26 +7337,18 @@ ac_config_files="$ac_config_files build/debian/control.m4"
 
 ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.dirs:./build/debian/libmilter.dirs.in"
 
-ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.links:./build/debian/libmilter.links.in"
-
 ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.lintian-overrides:./build/debian/libmilter.lintian-overrides.in"
 
-ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.postrm:./build/debian/libmilter.postrm.in"
-
 ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.preinst:./build/debian/libmilter.preinst.in"
 
 ac_config_files="$ac_config_files libmilter-dev.dirs:./build/debian/libmilter-dev.dirs.in"
 
 ac_config_files="$ac_config_files libmilter-dev.links:./build/debian/libmilter-dev.links.in"
 
-ac_config_files="$ac_config_files libmilter-dev.postrm:./build/debian/libmilter-dev.postrm.in"
-
 ac_config_files="$ac_config_files libmilter-dev.preinst:./build/debian/libmilter-dev.preinst.in"
 
 ac_config_files="$ac_config_files rmail.dirs:./build/debian/rmail.dirs.in"
 
-ac_config_files="$ac_config_files rmail.postrm:./build/debian/rmail.postrm.in"
-
 ac_config_files="$ac_config_files rmail.preinst:./build/debian/rmail.preinst.in"
 
 ac_config_files="$ac_config_files sendmail.dirs:./build/debian/sendmail.dirs.in"
@@ -7679,8 +7365,6 @@ ac_config_files="$ac_config_files sendmail-base.prerm:./build/debian/sendmail-ba
 
 ac_config_files="$ac_config_files sendmail-doc.dirs:./build/debian/sendmail-doc.dirs.in"
 
-ac_config_files="$ac_config_files sendmail-doc.postrm:./build/debian/sendmail-doc.postrm.in"
-
 ac_config_files="$ac_config_files sendmail-doc.preinst:./build/debian/sendmail-doc.preinst.in"
 
 ac_config_files="$ac_config_files sendmail-cf.dirs:./build/debian/sendmail-cf.dirs.in"
@@ -7707,8 +7391,6 @@ ac_config_files="$ac_config_files sendmail-bin.suid:./build/debian/sendmail-bin.
 
 ac_config_files="$ac_config_files sensible-mda.dirs:./build/debian/sensible-mda.dirs.in"
 
-ac_config_files="$ac_config_files sensible-mda.postrm:./build/debian/sensible-mda.postrm.in"
-
 ac_config_files="$ac_config_files sensible-mda.preinst:./build/debian/sensible-mda.preinst.in"
 
 ac_config_files="$ac_config_files cf/Makefile"
@@ -7853,10 +7535,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -7956,7 +7649,7 @@ if test -z "${SM_ENABLE_TLS_TRUE}" && test -z "${SM_ENABLE_TLS_FALSE}"; then
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -8057,6 +7750,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8252,16 +7946,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -8321,28 +8015,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -8364,7 +8046,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by Sendmail $as_me 8.14.4, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -8421,10 +8103,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 Sendmail config.status 8.14.4
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -8504,7 +8186,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -8549,16 +8231,12 @@ do
     "build/site.config.m4") CONFIG_FILES="$CONFIG_FILES build/site.config.m4" ;;
     "build/debian/control.m4") CONFIG_FILES="$CONFIG_FILES build/debian/control.m4" ;;
     "libmilter${sm_libmilter_version}.dirs") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.dirs:./build/debian/libmilter.dirs.in" ;;
-    "libmilter${sm_libmilter_version}.links") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.links:./build/debian/libmilter.links.in" ;;
     "libmilter${sm_libmilter_version}.lintian-overrides") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.lintian-overrides:./build/debian/libmilter.lintian-overrides.in" ;;
-    "libmilter${sm_libmilter_version}.postrm") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.postrm:./build/debian/libmilter.postrm.in" ;;
     "libmilter${sm_libmilter_version}.preinst") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.preinst:./build/debian/libmilter.preinst.in" ;;
     "libmilter-dev.dirs") CONFIG_FILES="$CONFIG_FILES libmilter-dev.dirs:./build/debian/libmilter-dev.dirs.in" ;;
     "libmilter-dev.links") CONFIG_FILES="$CONFIG_FILES libmilter-dev.links:./build/debian/libmilter-dev.links.in" ;;
-    "libmilter-dev.postrm") CONFIG_FILES="$CONFIG_FILES libmilter-dev.postrm:./build/debian/libmilter-dev.postrm.in" ;;
     "libmilter-dev.preinst") CONFIG_FILES="$CONFIG_FILES libmilter-dev.preinst:./build/debian/libmilter-dev.preinst.in" ;;
     "rmail.dirs") CONFIG_FILES="$CONFIG_FILES rmail.dirs:./build/debian/rmail.dirs.in" ;;
-    "rmail.postrm") CONFIG_FILES="$CONFIG_FILES rmail.postrm:./build/debian/rmail.postrm.in" ;;
     "rmail.preinst") CONFIG_FILES="$CONFIG_FILES rmail.preinst:./build/debian/rmail.preinst.in" ;;
     "sendmail.dirs") CONFIG_FILES="$CONFIG_FILES sendmail.dirs:./build/debian/sendmail.dirs.in" ;;
     "sendmail-base.dirs") CONFIG_FILES="$CONFIG_FILES sendmail-base.dirs:./build/debian/sendmail-base.dirs.in" ;;
@@ -8567,7 +8245,6 @@ do
     "sendmail-base.preinst") CONFIG_FILES="$CONFIG_FILES sendmail-base.preinst:./build/debian/sendmail-base.preinst.in" ;;
     "sendmail-base.prerm") CONFIG_FILES="$CONFIG_FILES sendmail-base.prerm:./build/debian/sendmail-base.prerm.in" ;;
     "sendmail-doc.dirs") CONFIG_FILES="$CONFIG_FILES sendmail-doc.dirs:./build/debian/sendmail-doc.dirs.in" ;;
-    "sendmail-doc.postrm") CONFIG_FILES="$CONFIG_FILES sendmail-doc.postrm:./build/debian/sendmail-doc.postrm.in" ;;
     "sendmail-doc.preinst") CONFIG_FILES="$CONFIG_FILES sendmail-doc.preinst:./build/debian/sendmail-doc.preinst.in" ;;
     "sendmail-cf.dirs") CONFIG_FILES="$CONFIG_FILES sendmail-cf.dirs:./build/debian/sendmail-cf.dirs.in" ;;
     "sendmail-cf.postrm") CONFIG_FILES="$CONFIG_FILES sendmail-cf.postrm:./build/debian/sendmail-cf.postrm.in" ;;
@@ -8581,7 +8258,6 @@ do
     "sendmail-bin.prerm") CONFIG_FILES="$CONFIG_FILES sendmail-bin.prerm:./build/debian/sendmail-bin.prerm.in" ;;
     "sendmail-bin.suid") CONFIG_FILES="$CONFIG_FILES sendmail-bin.suid:./build/debian/sendmail-bin.suid.in" ;;
     "sensible-mda.dirs") CONFIG_FILES="$CONFIG_FILES sensible-mda.dirs:./build/debian/sensible-mda.dirs.in" ;;
-    "sensible-mda.postrm") CONFIG_FILES="$CONFIG_FILES sensible-mda.postrm:./build/debian/sensible-mda.postrm.in" ;;
     "sensible-mda.preinst") CONFIG_FILES="$CONFIG_FILES sensible-mda.preinst:./build/debian/sensible-mda.preinst.in" ;;
     "cf/Makefile") CONFIG_FILES="$CONFIG_FILES cf/Makefile" ;;
     "cf/debian/autoconf.m4") CONFIG_FILES="$CONFIG_FILES cf/debian/autoconf.m4" ;;
@@ -8623,7 +8299,7 @@ do
     "sensible_mda/Makefile") CONFIG_FILES="$CONFIG_FILES sensible_mda/Makefile" ;;
     "sensible_mda/sensible-mda.c") CONFIG_FILES="$CONFIG_FILES sensible_mda/sensible-mda.c" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -8645,9 +8321,10 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -8655,12 +8332,13 @@ $debug ||
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -8682,7 +8360,7 @@ else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -8710,7 +8388,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -8758,7 +8436,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -8790,7 +8468,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -8830,7 +8508,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -8849,7 +8527,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -8858,7 +8536,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -8884,8 +8562,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -9021,21 +8699,22 @@ s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
@@ -9158,17 +8837,13 @@ $as_echo X"$file" |
 		echo 'creating ./control';
 		m4 ./build/debian/control.m4 > ./build/debian/control;
 		cp ./build/debian/control ./; ;;
-    "libmilter${sm_libmilter_version}.postrm":F) chmod a+x ./libmilter${sm_libmilter_version}.postrm ;;
     "libmilter${sm_libmilter_version}.preinst":F) chmod a+x ./libmilter${sm_libmilter_version}.preinst ;;
-    "libmilter-dev.postrm":F) chmod a+x ./libmilter-dev.postrm ;;
     "libmilter-dev.preinst":F) chmod a+x ./libmilter-dev.preinst ;;
-    "rmail.postrm":F) chmod a+x ./rmail.postrm ;;
     "rmail.preinst":F) chmod a+x ./rmail.preinst ;;
     "sendmail-base.postinst":F) chmod a+x ./sendmail-base.postinst ;;
     "sendmail-base.postrm":F) chmod a+x ./sendmail-base.postrm ;;
     "sendmail-base.preinst":F) chmod a+x ./sendmail-base.preinst ;;
     "sendmail-base.prerm":F) chmod a+x ./sendmail-base.prerm ;;
-    "sendmail-doc.postrm":F) chmod a+x ./sendmail-doc.postrm ;;
     "sendmail-doc.preinst":F) chmod a+x ./sendmail-doc.preinst ;;
     "sendmail-cf.postrm":F) chmod a+x ./sendmail-cf.postrm ;;
     "sendmail-cf.preinst":F) chmod a+x ./sendmail-cf.preinst ;;
@@ -9178,7 +8853,6 @@ $as_echo X"$file" |
     "sendmail-bin.postrm":F) chmod a+x ./sendmail-bin.postrm ;;
     "sendmail-bin.preinst":F) chmod a+x ./sendmail-bin.preinst ;;
     "sendmail-bin.prerm":F) chmod a+x ./sendmail-bin.prerm ;;
-    "sensible-mda.postrm":F) chmod a+x ./sensible-mda.postrm ;;
     "sensible-mda.preinst":F) chmod a+x ./sensible-mda.preinst ;;
     "cf/Makefile":F) chmod a+x ./cf/Makefile ;;
     "examples/Makefile":F) chmod a+x ./examples/Makefile ;;